← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_push.py

  • Committer: John Arbash Meinel
  • Date: 2009-12-10 17:16:19 UTC
  • mfrom: (4884 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4889.
  • Revision ID: john@arbash-meinel.com-20091210171619-ehdcxjbl8afhq9g1
Bring in bzr.dev 4884

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_push.py
394
394
        # Create a smart server that publishes whatever the backing VFS server
395
395
        # does.
396
396
        self.smart_server = server.SmartTCPServer_for_testing()
397
 
        self.smart_server.setUp(self.get_server())
398
 
        self.addCleanup(self.smart_server.tearDown)
 
397
        self.start_server(self.smart_server, self.get_server())
399
398
        # Make two empty branches, 'empty' and 'target'.
400
399
        self.empty_branch = self.make_branch('empty')
401
400
        self.make_branch('target')
414
413
        target = Branch.open_from_transport(transport)
415
414
        self.empty_branch.push(target)
416
415
        self.assertEqual(
417
 
            ['BzrDir.open',
 
416
            ['BzrDir.open_2.1',
418
417
             'BzrDir.open_branchV2',
419
418
             'BzrDir.find_repositoryV3',
420
419
             'Branch.get_stacked_on_url',