← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 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,
66
65
    test_lsprof,
67
 
    test_server,
68
66
    test_sftp_transport,
69
67
    TestUtil,
70
68
    )
71
69
from bzrlib.trace import note
72
 
from bzrlib.transport import memory
 
70
from bzrlib.transport.memory import MemoryServer, MemoryTransport
73
71
from bzrlib.version import _get_bzr_source_tree
74
72
 
75
73
 
623
621
 
624
622
    def test_get_readonly_url_none(self):
625
623
        from bzrlib.transport import get_transport
 
624
        from bzrlib.transport.memory import MemoryServer
626
625
        from bzrlib.transport.readonly import ReadonlyTransportDecorator
627
 
        self.vfs_transport_factory = memory.MemoryServer
 
626
        self.vfs_transport_factory = MemoryServer
628
627
        self.transport_readonly_server = None
629
628
        # calling get_readonly_transport() constructs a decorator on the url
630
629
        # for the server
639
638
    def test_get_readonly_url_http(self):
640
639
        from bzrlib.tests.http_server import HttpServer
641
640
        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 = test_server.LocalURLServer
 
643
        self.transport_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 = memory.MemoryServer
 
680
        self.vfs_transport_factory = 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
 
                              memory.MemoryTransport)
 
686
                              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 = memory.MemoryServer()
 
1472
        transport_server = 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 = memory.MemoryServer()
 
1560
        transport_server = 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
 
        self.transport_server = test_server.FakeVFATServer
 
1807
        from bzrlib.transport.fakevfat import FakeVFATServer
 
1808
        self.transport_server = FakeVFATServer
1808
1809
        self.assertFalse(self.get_url('t1').startswith('file://'))
1809
1810
        tree = self.make_branch_and_tree('t1')
1810
1811
        base = tree.bzrdir.root_transport.base
1947
1948
 
1948
1949
    def test_transport_sftp(self):
1949
1950
        self.requireFeature(features.paramiko)
1950
 
        self.check_transport_set(stub_sftp.SFTPAbsoluteServer)
 
1951
        self.check_transport_set(bzrlib.transport.sftp.SFTPAbsoluteServer)
1951
1952
 
1952
1953
    def test_transport_memory(self):
1953
 
        self.check_transport_set(memory.MemoryServer)
 
1954
        self.check_transport_set(bzrlib.transport.memory.MemoryServer)
1954
1955
 
1955
1956
 
1956
1957
class TestSelftestWithIdList(tests.TestCaseInTempDir, SelfTestHelper):
2399
2400
 
2400
2401
 
2401
2402
simple_thunk_feature = tests._CompatabilityThunkFeature(
2402
 
    deprecated_in((2, 1, 0)),
2403
 
    'bzrlib.tests.test_selftest',
2404
 
    'simple_thunk_feature','UnicodeFilename',
2405
 
    replacement_module='bzrlib.tests'
2406
 
    )
 
2403
    'bzrlib.tests', 'UnicodeFilename',
 
2404
    'bzrlib.tests.test_selftest.simple_thunk_feature',
 
2405
    deprecated_in((2,1,0)))
2407
2406
 
2408
2407
class Test_CompatibilityFeature(tests.TestCase):
2409
2408
 
2414
2413
            simple_thunk_feature.available)
2415
2414
        self.assertEqual(tests.UnicodeFilename.available(), res)
2416
2415
 
2417
 
 
 
2416
        
2418
2417
class TestModuleAvailableFeature(tests.TestCase):
2419
2418
 
2420
2419
    def test_available_module(self):
2621
2620
        # Running bzr in blackbox mode, normal/expected/user errors should be
2622
2621
        # caught in the regular way and turned into an error message plus exit
2623
2622
        # code.
2624
 
        transport_server = memory.MemoryServer()
 
2623
        transport_server = MemoryServer()
2625
2624
        transport_server.start_server()
2626
2625
        self.addCleanup(transport_server.stop_server)
2627
2626
        url = transport_server.get_url()