/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-11 02:16:42 UTC
  • mfrom: (5017.1.2 initialize)
  • Revision ID: pqm@pqm.ubuntu.com-20100211021642-eitum30b2e09oalf
(mbp) Add bzrlib.initialize

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
62
62
    )
63
63
from bzrlib.tests import (
64
64
    features,
 
65
    stub_sftp,
65
66
    test_lsprof,
66
 
    test_server,
67
67
    test_sftp_transport,
68
68
    TestUtil,
69
69
    )
70
70
from bzrlib.trace import note
71
 
from bzrlib.transport import memory
 
71
from bzrlib.transport.memory import MemoryServer, MemoryTransport
72
72
from bzrlib.version import _get_bzr_source_tree
73
73
 
74
74
 
622
622
 
623
623
    def test_get_readonly_url_none(self):
624
624
        from bzrlib.transport import get_transport
 
625
        from bzrlib.transport.memory import MemoryServer
625
626
        from bzrlib.transport.readonly import ReadonlyTransportDecorator
626
 
        self.vfs_transport_factory = memory.MemoryServer
 
627
        self.vfs_transport_factory = 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
 
642
        from bzrlib.transport.local import LocalURLServer
641
643
        from bzrlib.transport.http import HttpTransportBase
642
 
        self.transport_server = test_server.LocalURLServer
 
644
        self.transport_server = LocalURLServer
643
645
        self.transport_readonly_server = HttpServer
644
646
        # calling get_readonly_transport() gives us a HTTP server instance.
645
647
        url = self.get_readonly_url()
676
678
 
677
679
    def setUp(self):
678
680
        super(TestTestCaseTransports, self).setUp()
679
 
        self.vfs_transport_factory = memory.MemoryServer
 
681
        self.vfs_transport_factory = MemoryServer
680
682
 
681
683
    def test_make_bzrdir_preserves_transport(self):
682
684
        t = self.get_transport()
683
685
        result_bzrdir = self.make_bzrdir('subdir')
684
686
        self.assertIsInstance(result_bzrdir.transport,
685
 
                              memory.MemoryTransport)
 
687
                              MemoryTransport)
686
688
        # should not be on disk, should only be in memory
687
689
        self.failIfExists('subdir')
688
690
 
1468
1470
        # permitted.
1469
1471
        # Manually set one up (TestCase doesn't and shouldn't provide magic
1470
1472
        # machinery)
1471
 
        transport_server = memory.MemoryServer()
 
1473
        transport_server = MemoryServer()
1472
1474
        transport_server.start_server()
1473
1475
        self.addCleanup(transport_server.stop_server)
1474
1476
        t = transport.get_transport(transport_server.get_url())
1556
1558
            result.calls)
1557
1559
 
1558
1560
    def test_start_server_registers_url(self):
1559
 
        transport_server = memory.MemoryServer()
 
1561
        transport_server = MemoryServer()
1560
1562
        # A little strict, but unlikely to be changed soon.
1561
1563
        self.assertEqual([], self._bzr_selftest_roots)
1562
1564
        self.start_server(transport_server)
1803
1805
        # make_branch_and_tree has to use local branch and repositories
1804
1806
        # when the vfs transport and local disk are colocated, even if
1805
1807
        # a different transport is in use for url generation.
1806
 
        self.transport_server = test_server.FakeVFATServer
 
1808
        from bzrlib.transport.fakevfat import FakeVFATServer
 
1809
        self.transport_server = FakeVFATServer
1807
1810
        self.assertFalse(self.get_url('t1').startswith('file://'))
1808
1811
        tree = self.make_branch_and_tree('t1')
1809
1812
        base = tree.bzrdir.root_transport.base
1946
1949
 
1947
1950
    def test_transport_sftp(self):
1948
1951
        self.requireFeature(features.paramiko)
1949
 
        from bzrlib.tests import stub_sftp
1950
1952
        self.check_transport_set(stub_sftp.SFTPAbsoluteServer)
1951
1953
 
1952
1954
    def test_transport_memory(self):
1953
 
        self.check_transport_set(memory.MemoryServer)
 
1955
        self.check_transport_set(bzrlib.transport.memory.MemoryServer)
1954
1956
 
1955
1957
 
1956
1958
class TestSelftestWithIdList(tests.TestCaseInTempDir, SelfTestHelper):
2621
2623
        # Running bzr in blackbox mode, normal/expected/user errors should be
2622
2624
        # caught in the regular way and turned into an error message plus exit
2623
2625
        # code.
2624
 
        transport_server = memory.MemoryServer()
 
2626
        transport_server = MemoryServer()
2625
2627
        transport_server.start_server()
2626
2628
        self.addCleanup(transport_server.stop_server)
2627
2629
        url = transport_server.get_url()
2773
2775
        # Test that a plausible list of modules to doctest is returned
2774
2776
        # by _test_suite_modules_to_doctest.
2775
2777
        test_list = tests._test_suite_modules_to_doctest()
2776
 
        if __doc__ is None:
2777
 
            # When docstrings are stripped, there are no modules to doctest
2778
 
            self.assertEqual([], test_list)
2779
 
            return
2780
2778
        self.assertSubset([
2781
2779
            'bzrlib.timestamp',
2782
2780
            ],
2799
2797
        self.overrideAttr(tests, '_test_suite_testmod_names', testmod_names)
2800
2798
        def doctests():
2801
2799
            calls.append("modules_to_doctest")
2802
 
            if __doc__ is None:
2803
 
                return []
2804
2800
            return ['bzrlib.timestamp']
2805
2801
        self.overrideAttr(tests, '_test_suite_modules_to_doctest', doctests)
2806
2802
        expected_test_list = [
2809
2805
            ('bzrlib.tests.per_transport.TransportTests'
2810
2806
             '.test_abspath(LocalTransport,LocalURLServer)'),
2811
2807
            'bzrlib.tests.test_selftest.TestTestSuite.test_test_suite',
 
2808
            # modules_to_doctest
 
2809
            'bzrlib.timestamp.format_highres_date',
2812
2810
            # plugins can't be tested that way since selftest may be run with
2813
2811
            # --no-plugins
2814
2812
            ]
2815
 
        if __doc__ is not None:
2816
 
            expected_test_list.extend([
2817
 
                # modules_to_doctest
2818
 
                'bzrlib.timestamp.format_highres_date',
2819
 
                ])
2820
2813
        suite = tests.test_suite()
2821
2814
        self.assertEqual(set(["testmod_names", "modules_to_doctest"]),
2822
2815
            set(calls))