← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-09 20:49:50 UTC
  • mto: (5029.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5030.
  • Revision ID: v.ladeuil+lp@free.fr-20100209204950-p86omh9xnn0w124a
selftest -s bt.test_bzrdir passing

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
48
48
from bzrlib.tests import(
49
49
    http_server,
50
50
    http_utils,
 
51
    test_server,
51
52
    )
52
53
from bzrlib.tests.test_http import TestWithTransport_pycurl
53
54
from bzrlib.transport import get_transport
54
55
from bzrlib.transport.http._urllib import HttpTransport_urllib
55
 
from bzrlib.transport.memory import MemoryServer
56
56
from bzrlib.transport.nosmart import NoSmartTransportDecorator
57
57
from bzrlib.transport.readonly import ReadonlyTransportDecorator
58
58
from bzrlib.repofmt import knitrepo, weaverepo, pack_repo
354
354
 
355
355
    def test_create_branch_convenience_root(self):
356
356
        """Creating a branch at the root of a fs should work."""
357
 
        self.vfs_transport_factory = MemoryServer
 
357
        self.vfs_transport_factory = test_server.MemoryServer
358
358
        # outside a repo the default convenience output is a repo+branch_tree
359
359
        format = bzrdir.format_registry.make_bzrdir('knit')
360
360
        branch = bzrdir.BzrDir.create_branch_convenience(self.get_url(),
565
565
 
566
566
    def setUp(self):
567
567
        super(ChrootedTests, self).setUp()
568
 
        if not self.vfs_transport_factory == MemoryServer:
 
568
        if not self.vfs_transport_factory == test_server.MemoryServer:
569
569
            self.transport_readonly_server = http_server.HttpServer
570
570
 
571
571
    def local_branch_path(self, branch):
1049
1049
 
1050
1050
    def setUp(self):
1051
1051
        super(NonLocalTests, self).setUp()
1052
 
        self.vfs_transport_factory = MemoryServer
 
1052
        self.vfs_transport_factory = test_server.MemoryServer
1053
1053
 
1054
1054
    def test_create_branch_convenience(self):
1055
1055
        # outside a repo the default convenience output is a repo+branch_tree