← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_push.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_push.py
38
38
    script,
39
39
    test_foreign,
40
40
    )
 
41
from bzrlib.tests.matchers import ContainsNoVfsCalls
41
42
from bzrlib.transport import memory
42
43
 
43
44
 
270
271
        # become necessary for this use case. Please do not adjust this number
271
272
        # upwards without agreement from bzr's network support maintainers.
272
273
        self.assertLength(9, self.hpss_calls)
 
274
        self.assertLength(1, self.hpss_connections)
 
275
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
273
276
 
274
277
    def test_push_smart_stacked_streaming_acceptance(self):
275
278
        self.setup_smart_server_with_call_log()
286
289
        # become necessary for this use case. Please do not adjust this number
287
290
        # upwards without agreement from bzr's network support maintainers.
288
291
        self.assertLength(15, self.hpss_calls)
 
292
        self.assertLength(1, self.hpss_connections)
 
293
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
289
294
        remote = branch.Branch.open('public')
290
295
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
291
296
 
302
307
        # become necessary for this use case. Please do not adjust this number
303
308
        # upwards without agreement from bzr's network support maintainers.
304
309
        self.assertLength(11, self.hpss_calls)
 
310
        self.assertLength(1, self.hpss_connections)
 
311
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
305
312
 
306
313
    def test_push_smart_incremental_acceptance(self):
307
314
        self.setup_smart_server_with_call_log()
318
325
        # become necessary for this use case. Please do not adjust this number
319
326
        # upwards without agreement from bzr's network support maintainers.
320
327
        self.assertLength(11, self.hpss_calls)
 
328
        self.assertLength(1, self.hpss_connections)
 
329
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
321
330
 
322
331
    def test_push_smart_with_default_stacking_url_path_segment(self):
323
332
        # If the default stacked-on location is a path element then branches