/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: Vincent Ladeuil
  • Date: 2010-01-25 17:48:22 UTC
  • mto: (4987.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4988.
  • Revision ID: v.ladeuil+lp@free.fr-20100125174822-nce4l19sbwx83jvq
Deploying the new overrideAttr facility further reduces the complexity
and make the code clearer.

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
63
63
from bzrlib.tests import (
64
64
    features,
65
65
    test_lsprof,
66
 
    test_server,
67
66
    test_sftp_transport,
68
67
    TestUtil,
69
68
    )
70
69
from bzrlib.trace import note
71
 
from bzrlib.transport import memory
 
70
from bzrlib.transport.memory import MemoryServer, MemoryTransport
72
71
from bzrlib.version import _get_bzr_source_tree
73
72
 
74
73
 
622
621
 
623
622
    def test_get_readonly_url_none(self):
624
623
        from bzrlib.transport import get_transport
 
624
        from bzrlib.transport.memory import MemoryServer
625
625
        from bzrlib.transport.readonly import ReadonlyTransportDecorator
626
 
        self.vfs_transport_factory = memory.MemoryServer
 
626
        self.vfs_transport_factory = MemoryServer
627
627
        self.transport_readonly_server = None
628
628
        # calling get_readonly_transport() constructs a decorator on the url
629
629
        # for the server
638
638
    def test_get_readonly_url_http(self):
639
639
        from bzrlib.tests.http_server import HttpServer
640
640
        from bzrlib.transport import get_transport
 
641
        from bzrlib.transport.local import LocalURLServer
641
642
        from bzrlib.transport.http import HttpTransportBase
642
 
        self.transport_server = test_server.LocalURLServer
 
643
        self.transport_server = LocalURLServer
643
644
        self.transport_readonly_server = HttpServer
644
645
        # calling get_readonly_transport() gives us a HTTP server instance.
645
646
        url = self.get_readonly_url()
676
677
 
677
678
    def setUp(self):
678
679
        super(TestTestCaseTransports, self).setUp()
679
 
        self.vfs_transport_factory = memory.MemoryServer
 
680
        self.vfs_transport_factory = MemoryServer
680
681
 
681
682
    def test_make_bzrdir_preserves_transport(self):
682
683
        t = self.get_transport()
683
684
        result_bzrdir = self.make_bzrdir('subdir')
684
685
        self.assertIsInstance(result_bzrdir.transport,
685
 
                              memory.MemoryTransport)
 
686
                              MemoryTransport)
686
687
        # should not be on disk, should only be in memory
687
688
        self.failIfExists('subdir')
688
689
 
1468
1469
        # permitted.
1469
1470
        # Manually set one up (TestCase doesn't and shouldn't provide magic
1470
1471
        # machinery)
1471
 
        transport_server = memory.MemoryServer()
 
1472
        transport_server = MemoryServer()
1472
1473
        transport_server.start_server()
1473
1474
        self.addCleanup(transport_server.stop_server)
1474
1475
        t = transport.get_transport(transport_server.get_url())
1556
1557
            result.calls)
1557
1558
 
1558
1559
    def test_start_server_registers_url(self):
1559
 
        transport_server = memory.MemoryServer()
 
1560
        transport_server = MemoryServer()
1560
1561
        # A little strict, but unlikely to be changed soon.
1561
1562
        self.assertEqual([], self._bzr_selftest_roots)
1562
1563
        self.start_server(transport_server)
1803
1804
        # make_branch_and_tree has to use local branch and repositories
1804
1805
        # when the vfs transport and local disk are colocated, even if
1805
1806
        # a different transport is in use for url generation.
1806
 
        self.transport_server = test_server.FakeVFATServer
 
1807
        from bzrlib.transport.fakevfat import FakeVFATServer
 
1808
        self.transport_server = FakeVFATServer
1807
1809
        self.assertFalse(self.get_url('t1').startswith('file://'))
1808
1810
        tree = self.make_branch_and_tree('t1')
1809
1811
        base = tree.bzrdir.root_transport.base
1946
1948
 
1947
1949
    def test_transport_sftp(self):
1948
1950
        self.requireFeature(features.paramiko)
1949
 
        from bzrlib.tests import stub_sftp
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()
2773
2772
        # Test that a plausible list of modules to doctest is returned
2774
2773
        # by _test_suite_modules_to_doctest.
2775
2774
        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
2775
        self.assertSubset([
2781
2776
            'bzrlib.timestamp',
2782
2777
            ],
2799
2794
        self.overrideAttr(tests, '_test_suite_testmod_names', testmod_names)
2800
2795
        def doctests():
2801
2796
            calls.append("modules_to_doctest")
2802
 
            if __doc__ is None:
2803
 
                return []
2804
2797
            return ['bzrlib.timestamp']
2805
2798
        self.overrideAttr(tests, '_test_suite_modules_to_doctest', doctests)
2806
2799
        expected_test_list = [
2809
2802
            ('bzrlib.tests.per_transport.TransportTests'
2810
2803
             '.test_abspath(LocalTransport,LocalURLServer)'),
2811
2804
            'bzrlib.tests.test_selftest.TestTestSuite.test_test_suite',
 
2805
            # modules_to_doctest
 
2806
            'bzrlib.timestamp.format_highres_date',
2812
2807
            # plugins can't be tested that way since selftest may be run with
2813
2808
            # --no-plugins
2814
2809
            ]
2815
 
        if __doc__ is not None:
2816
 
            expected_test_list.extend([
2817
 
                # modules_to_doctest
2818
 
                'bzrlib.timestamp.format_highres_date',
2819
 
                ])
2820
2810
        suite = tests.test_suite()
2821
2811
        self.assertEqual(set(["testmod_names", "modules_to_doctest"]),
2822
2812
            set(calls))