← 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: Martin
  • Date: 2009-11-07 08:02:13 UTC
  • mfrom: (4789 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4809.
  • Revision ID: gzlist@googlemail.com-20091107080213-jad185091b3l69ih
Merge bzr.dev 4789 to resolve conflict from the disabling of plink auto-detection, and relocate NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
253
253
        # upwards without agreement from bzr's network support maintainers.
254
254
        self.assertLength(11, self.hpss_calls)
255
255
 
 
256
    def test_push_smart_incremental_acceptance(self):
 
257
        self.setup_smart_server_with_call_log()
 
258
        t = self.make_branch_and_tree('from')
 
259
        rev_id1 = t.commit(allow_pointless=True, message='first commit')
 
260
        rev_id2 = t.commit(allow_pointless=True, message='second commit')
 
261
        self.run_bzr(
 
262
            ['push', self.get_url('to-one'), '-r1'], working_dir='from')
 
263
        self.reset_smart_call_log()
 
264
        self.run_bzr(['push', self.get_url('to-one')], working_dir='from')
 
265
        # This figure represent the amount of work to perform this use case. It
 
266
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
267
        # being too low. If rpc_count increases, more network roundtrips have
 
268
        # become necessary for this use case. Please do not adjust this number
 
269
        # upwards without agreement from bzr's network support maintainers.
 
270
        self.assertLength(11, self.hpss_calls)
 
271
 
256
272
    def test_push_smart_with_default_stacking_url_path_segment(self):
257
273
        # If the default stacked-on location is a path element then branches
258
274
        # we push there over the smart server are stacked and their
576
592
    def setUp(self):
577
593
        tests.TestCaseWithTransport.setUp(self)
578
594
        self.memory_server = RedirectingMemoryServer()
579
 
        self.memory_server.setUp()
580
 
        self.addCleanup(self.memory_server.tearDown)
581
 
 
 
595
        self.start_server(self.memory_server)
582
596
        # Make the branch and tree that we'll be pushing.
583
597
        t = self.make_branch_and_tree('tree')
584
598
        self.build_tree(['tree/file'])
681
695
 
682
696
    def setUp(self):
683
697
        super(TestPushStrictWithChanges, self).setUp()
 
698
        # Apply the changes defined in load_tests: one of _uncommitted_changes,
 
699
        # _pending_merges or _out_of_sync_trees
684
700
        getattr(self, self._changes_type)()
685
701
 
686
702
    def _uncommitted_changes(self):