← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interbranch/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_interbranch/test_push.py
1
 
# Copyright (C) 2004, 2005, 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2009, 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
40
40
    TestCaseWithInterBranch,
41
41
    )
42
42
from bzrlib.transport import get_transport
43
 
from bzrlib.transport.local import LocalURLServer
 
43
from bzrlib.tests import test_server
44
44
 
45
45
 
46
46
# These tests are based on similar tests in 
155
155
        try:
156
156
            tree = a_branch.bzrdir.create_workingtree()
157
157
        except errors.NotLocalUrl:
158
 
            if self.vfs_transport_factory is LocalURLServer:
 
158
            if self.vfs_transport_factory is test_server.LocalURLServer:
159
159
                # the branch is colocated on disk, we cannot create a checkout.
160
160
                # hopefully callers will expect this.
161
161
                local_controldir = bzrdir.BzrDir.open(self.get_vfs_only_url('repo/tree'))