← 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: Martin Pool
  • Date: 2010-02-25 06:17:27 UTC
  • mfrom: (5055 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5057.
  • Revision ID: mbp@sourcefrog.net-20100225061727-4sd9lt0qmdc6087t
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_push.py
1
 
# Copyright (C) 2004, 2005, 2007 Canonical Ltd
 
1
# Copyright (C) 2007-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
38
38
    server,
39
39
    repository as _mod_smart_repo,
40
40
    )
41
 
from bzrlib.tests import per_branch
42
 
from bzrlib.transport import local
 
41
from bzrlib.tests import (
 
42
    per_branch,
 
43
    test_server,
 
44
    )
43
45
 
44
46
 
45
47
class TestPush(per_branch.TestCaseWithBranch):
149
151
        try:
150
152
            tree = a_branch.bzrdir.create_workingtree()
151
153
        except errors.NotLocalUrl:
152
 
            if self.vfs_transport_factory is local.LocalURLServer:
 
154
            if self.vfs_transport_factory is test_server.LocalURLServer:
153
155
                # the branch is colocated on disk, we cannot create a checkout.
154
156
                # hopefully callers will expect this.
155
157
                local_controldir= bzrdir.BzrDir.open(
391
393
        super(EmptyPushSmartEffortTests, self).setUp()
392
394
        # Create a smart server that publishes whatever the backing VFS server
393
395
        # does.
394
 
        self.smart_server = server.SmartTCPServer_for_testing()
 
396
        self.smart_server = test_server.SmartTCPServer_for_testing()
395
397
        self.start_server(self.smart_server, self.get_server())
396
398
        # Make two empty branches, 'empty' and 'target'.
397
399
        self.empty_branch = self.make_branch('empty')