← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2011-12-14 12:15:44 UTC
  • mto: This revision was merged to the branch mainline in revision 6365.
  • Revision ID: jelmer@samba.org-20111214121544-v07cbvmi30re6q7w
s/NoVfsCalls/ContainsNoVfsCalls/.

Show diffs side-by-side

added added

removed removed

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