← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Packman
  • Date: 2012-01-05 10:44:12 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_annotate.py
326
326
        # being too low. If rpc_count increases, more network roundtrips have
327
327
        # become necessary for this use case. Please do not adjust this number
328
328
        # upwards without agreement from bzr's network support maintainers.
329
 
        self.assertLength(15, self.hpss_calls)
 
329
        self.assertLength(16, self.hpss_calls)
 
330
        self.assertLength(1, self.hpss_connections)
330
331
        self.expectFailure("annotate accesses inventories, which require VFS access",
331
332
            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)