← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2012-01-05 15:54:17 UTC
  • mfrom: (6428 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120105155417-zvjqr0v78zp332e0
Merge trunk resolving conflicts and fixing more test failures related to
more option being migrated which in turn reduce some hpss_calls.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_cat.py
240
240
        # become necessary for this use case. Please do not adjust this number
241
241
        # upwards without agreement from bzr's network support maintainers.
242
242
        self.assertLength(9, self.hpss_calls)
 
243
        self.assertLength(1, self.hpss_connections)
243
244
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)