← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.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_selftest.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2005-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
62
62
    )
63
63
from bzrlib.tests import (
64
64
    features,
 
65
    stub_sftp,
65
66
    test_lsprof,
 
67
    test_server,
66
68
    test_sftp_transport,
67
69
    TestUtil,
68
70
    )
69
71
from bzrlib.trace import note
70
 
from bzrlib.transport.memory import MemoryServer, MemoryTransport
 
72
from bzrlib.transport import memory
71
73
from bzrlib.version import _get_bzr_source_tree
72
74
 
73
75
 
621
623
 
622
624
    def test_get_readonly_url_none(self):
623
625
        from bzrlib.transport import get_transport
624
 
        from bzrlib.transport.memory import MemoryServer
625
626
        from bzrlib.transport.readonly import ReadonlyTransportDecorator
626
 
        self.vfs_transport_factory = MemoryServer
 
627
        self.vfs_transport_factory = memory.MemoryServer
627
628
        self.transport_readonly_server = None
628
629
        # calling get_readonly_transport() constructs a decorator on the url
629
630
        # for the server
638
639
    def test_get_readonly_url_http(self):
639
640
        from bzrlib.tests.http_server import HttpServer
640
641
        from bzrlib.transport import get_transport
641
 
        from bzrlib.transport.local import LocalURLServer
642
642
        from bzrlib.transport.http import HttpTransportBase
643
 
        self.transport_server = LocalURLServer
 
643
        self.transport_server = test_server.LocalURLServer
644
644
        self.transport_readonly_server = HttpServer
645
645
        # calling get_readonly_transport() gives us a HTTP server instance.
646
646
        url = self.get_readonly_url()
677
677
 
678
678
    def setUp(self):
679
679
        super(TestTestCaseTransports, self).setUp()
680
 
        self.vfs_transport_factory = MemoryServer
 
680
        self.vfs_transport_factory = memory.MemoryServer
681
681
 
682
682
    def test_make_bzrdir_preserves_transport(self):
683
683
        t = self.get_transport()
684
684
        result_bzrdir = self.make_bzrdir('subdir')
685
685
        self.assertIsInstance(result_bzrdir.transport,
686
 
                              MemoryTransport)
 
686
                              memory.MemoryTransport)
687
687
        # should not be on disk, should only be in memory
688
688
        self.failIfExists('subdir')
689
689
 
1469
1469
        # permitted.
1470
1470
        # Manually set one up (TestCase doesn't and shouldn't provide magic
1471
1471
        # machinery)
1472
 
        transport_server = MemoryServer()
 
1472
        transport_server = memory.MemoryServer()
1473
1473
        transport_server.start_server()
1474
1474
        self.addCleanup(transport_server.stop_server)
1475
1475
        t = transport.get_transport(transport_server.get_url())
1557
1557
            result.calls)
1558
1558
 
1559
1559
    def test_start_server_registers_url(self):
1560
 
        transport_server = MemoryServer()
 
1560
        transport_server = memory.MemoryServer()
1561
1561
        # A little strict, but unlikely to be changed soon.
1562
1562
        self.assertEqual([], self._bzr_selftest_roots)
1563
1563
        self.start_server(transport_server)
1804
1804
        # make_branch_and_tree has to use local branch and repositories
1805
1805
        # when the vfs transport and local disk are colocated, even if
1806
1806
        # a different transport is in use for url generation.
1807
 
        from bzrlib.transport.fakevfat import FakeVFATServer
1808
 
        self.transport_server = FakeVFATServer
 
1807
        self.transport_server = test_server.FakeVFATServer
1809
1808
        self.assertFalse(self.get_url('t1').startswith('file://'))
1810
1809
        tree = self.make_branch_and_tree('t1')
1811
1810
        base = tree.bzrdir.root_transport.base
1948
1947
 
1949
1948
    def test_transport_sftp(self):
1950
1949
        self.requireFeature(features.paramiko)
1951
 
        self.check_transport_set(bzrlib.transport.sftp.SFTPAbsoluteServer)
 
1950
        self.check_transport_set(stub_sftp.SFTPAbsoluteServer)
1952
1951
 
1953
1952
    def test_transport_memory(self):
1954
 
        self.check_transport_set(bzrlib.transport.memory.MemoryServer)
 
1953
        self.check_transport_set(memory.MemoryServer)
1955
1954
 
1956
1955
 
1957
1956
class TestSelftestWithIdList(tests.TestCaseInTempDir, SelfTestHelper):
2622
2621
        # Running bzr in blackbox mode, normal/expected/user errors should be
2623
2622
        # caught in the regular way and turned into an error message plus exit
2624
2623
        # code.
2625
 
        transport_server = MemoryServer()
 
2624
        transport_server = memory.MemoryServer()
2626
2625
        transport_server.start_server()
2627
2626
        self.addCleanup(transport_server.stop_server)
2628
2627
        url = transport_server.get_url()