← 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: 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/test_bzrdir.py
1
 
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006-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
50
50
    http_utils,
51
51
    )
52
52
from bzrlib.tests.test_http import TestWithTransport_pycurl
53
 
from bzrlib.transport import get_transport
 
53
from bzrlib.transport import (
 
54
    get_transport,
 
55
    memory,
 
56
    )
54
57
from bzrlib.transport.http._urllib import HttpTransport_urllib
55
 
from bzrlib.transport.memory import MemoryServer
56
58
from bzrlib.transport.nosmart import NoSmartTransportDecorator
57
59
from bzrlib.transport.readonly import ReadonlyTransportDecorator
58
60
from bzrlib.repofmt import knitrepo, weaverepo, pack_repo
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 = 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 == 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 = 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