← 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-11 09:21:45 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-20100211092145-drh33z43szccfswy
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry.

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,
52
51
    )
53
52
from bzrlib.tests.test_http import TestWithTransport_pycurl
54
 
from bzrlib.transport import get_transport
 
53
from bzrlib.transport import (
 
54
    get_transport,
 
55
    memory,
 
56
    )
55
57
from bzrlib.transport.http._urllib import HttpTransport_urllib
56
58
from bzrlib.transport.nosmart import NoSmartTransportDecorator
57
59
from bzrlib.transport.readonly import ReadonlyTransportDecorator
354
356
 
355
357
    def test_create_branch_convenience_root(self):
356
358
        """Creating a branch at the root of a fs should work."""
357
 
        self.vfs_transport_factory = test_server.MemoryServer
 
359
        self.vfs_transport_factory = memory.MemoryServer
358
360
        # outside a repo the default convenience output is a repo+branch_tree
359
361
        format = bzrdir.format_registry.make_bzrdir('knit')
360
362
        branch = bzrdir.BzrDir.create_branch_convenience(self.get_url(),
565
567
 
566
568
    def setUp(self):
567
569
        super(ChrootedTests, self).setUp()
568
 
        if not self.vfs_transport_factory == test_server.MemoryServer:
 
570
        if not self.vfs_transport_factory == memory.MemoryServer:
569
571
            self.transport_readonly_server = http_server.HttpServer
570
572
 
571
573
    def local_branch_path(self, branch):
1049
1051
 
1050
1052
    def setUp(self):
1051
1053
        super(NonLocalTests, self).setUp()
1052
 
        self.vfs_transport_factory = test_server.MemoryServer
 
1054
        self.vfs_transport_factory = memory.MemoryServer
1053
1055
 
1054
1056
    def test_create_branch_convenience(self):
1055
1057
        # outside a repo the default convenience output is a repo+branch_tree