~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_log.py

  • Committer: Patch Queue Manager
  • Date: 2011-12-14 12:53:59 UTC
  • mfrom: (6352.2.5 hpss-no-vfs)
  • Revision ID: pqm@pqm.ubuntu.com-20111214125359-l2d2nv046utd1vfz
(jelmer) Add ContainsNoVfsCalls matcher. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
    test_log,
32
32
    features,
33
33
    )
 
34
from bzrlib.tests.matchers import ContainsNoVfsCalls
34
35
 
35
36
 
36
37
class TestLog(tests.TestCaseWithTransport, test_log.TestLogMixin):
1069
1070
        # being too low. If rpc_count increases, more network roundtrips have
1070
1071
        # become necessary for this use case. Please do not adjust this number
1071
1072
        # upwards without agreement from bzr's network support maintainers.
 
1073
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
1072
1074
        self.assertLength(10, self.hpss_calls)
1073
1075
 
1074
1076
    def test_verbose_log(self):
1085
1087
        # become necessary for this use case. Please do not adjust this number
1086
1088
        # upwards without agreement from bzr's network support maintainers.
1087
1089
        self.assertLength(19, self.hpss_calls)
 
1090
        self.expectFailure("verbose log accesses inventories, which require VFS",
 
1091
            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)
1088
1092
 
1089
1093
    def test_per_file(self):
1090
1094
        self.setup_smart_server_with_call_log()
1100
1104
        # become necessary for this use case. Please do not adjust this number
1101
1105
        # upwards without agreement from bzr's network support maintainers.
1102
1106
        self.assertLength(21, self.hpss_calls)
 
1107
        self.expectFailure("per-file graph access requires VFS",
 
1108
            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)