← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
31
31
from bzrlib.tests import (
32
32
    KnownFailure,
33
33
    HardlinkFeature,
 
34
    test_server,
34
35
    )
35
36
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
36
37
from bzrlib.urlutils import local_path_to_url, strip_trailing_slash
308
309
 
309
310
    def test_branch_stacked_from_smart_server(self):
310
311
        # We can branch stacking on a smart server
311
 
        from bzrlib.smart.server import SmartTCPServer_for_testing
312
 
        self.transport_server = SmartTCPServer_for_testing
 
312
        self.transport_server = test_server.SmartTCPServer_for_testing
313
313
        trunk = self.make_branch('mainline', format='1.9')
314
314
        out, err = self.run_bzr(
315
315
            ['branch', '--stacked', self.get_url('mainline'), 'shallow'])