← 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: John Arbash Meinel
  • Date: 2009-10-21 21:27:19 UTC
  • mto: This revision was merged to the branch mainline in revision 4771.
  • Revision ID: john@arbash-meinel.com-20091021212719-05zh4t7oo5kaird3
More cleanups and clarifications.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
50
50
    http_utils,
51
51
    )
52
52
from bzrlib.tests.test_http import TestWithTransport_pycurl
53
 
from bzrlib.transport import (
54
 
    get_transport,
55
 
    memory,
56
 
    )
 
53
from bzrlib.transport import get_transport
57
54
from bzrlib.transport.http._urllib import HttpTransport_urllib
 
55
from bzrlib.transport.memory import MemoryServer
58
56
from bzrlib.transport.nosmart import NoSmartTransportDecorator
59
57
from bzrlib.transport.readonly import ReadonlyTransportDecorator
60
58
from bzrlib.repofmt import knitrepo, weaverepo, pack_repo
147
145
        new = topics.get_detail('current-formats')
148
146
        rest = topics.get_detail('other-formats')
149
147
        experimental, deprecated = rest.split('Deprecated formats')
150
 
        self.assertContainsRe(new, 'formats-help')
 
148
        self.assertContainsRe(new, 'bzr help formats')
151
149
        self.assertContainsRe(new,
152
150
                ':knit:\n    \(native\) \(default\) Format using knits\n')
153
151
        self.assertContainsRe(experimental,
356
354
 
357
355
    def test_create_branch_convenience_root(self):
358
356
        """Creating a branch at the root of a fs should work."""
359
 
        self.vfs_transport_factory = memory.MemoryServer
 
357
        self.vfs_transport_factory = MemoryServer
360
358
        # outside a repo the default convenience output is a repo+branch_tree
361
359
        format = bzrdir.format_registry.make_bzrdir('knit')
362
360
        branch = bzrdir.BzrDir.create_branch_convenience(self.get_url(),
567
565
 
568
566
    def setUp(self):
569
567
        super(ChrootedTests, self).setUp()
570
 
        if not self.vfs_transport_factory == memory.MemoryServer:
 
568
        if not self.vfs_transport_factory == MemoryServer:
571
569
            self.transport_readonly_server = http_server.HttpServer
572
570
 
573
571
    def local_branch_path(self, branch):
1051
1049
 
1052
1050
    def setUp(self):
1053
1051
        super(NonLocalTests, self).setUp()
1054
 
        self.vfs_transport_factory = memory.MemoryServer
 
1052
        self.vfs_transport_factory = MemoryServer
1055
1053
 
1056
1054
    def test_create_branch_convenience(self):
1057
1055
        # outside a repo the default convenience output is a repo+branch_tree