← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_reconcile.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_reconcile.py
22
22
    inventory,
23
23
    tests,
24
24
    )
 
25
from bzrlib.tests.matchers import ContainsNoVfsCalls
25
26
 
26
27
 
27
28
class TrivialTest(tests.TestCaseWithTransport):
86
87
        # become necessary for this use case. Please do not adjust this number
87
88
        # upwards without agreement from bzr's network support maintainers.
88
89
        self.assertLength(10, self.hpss_calls)
 
90
        self.assertLength(1, self.hpss_connections)
 
91
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)