/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-02-09 21:05:52 UTC
  • mto: (5029.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5030.
  • Revision ID: v.ladeuil+lp@free.fr-20100209210552-x9xo02bw0g8lu0ck
selftest -s bt.test_remote passing

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,
65
66
    test_lsprof,
66
67
    test_server,
67
68
    test_sftp_transport,
623
624
    def test_get_readonly_url_none(self):
624
625
        from bzrlib.transport import get_transport
625
626
        from bzrlib.transport.readonly import ReadonlyTransportDecorator
626
 
        self.vfs_transport_factory = memory.MemoryServer
 
627
        self.vfs_transport_factory = test_server.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
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 = test_server.MemoryServer
680
681
 
681
682
    def test_make_bzrdir_preserves_transport(self):
682
683
        t = self.get_transport()
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 = test_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 = test_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)
1946
1947
 
1947
1948
    def test_transport_sftp(self):
1948
1949
        self.requireFeature(features.paramiko)
1949
 
        from bzrlib.tests import stub_sftp
1950
1950
        self.check_transport_set(stub_sftp.SFTPAbsoluteServer)
1951
1951
 
1952
1952
    def test_transport_memory(self):
1953
 
        self.check_transport_set(memory.MemoryServer)
 
1953
        self.check_transport_set(test_server.MemoryServer)
1954
1954
 
1955
1955
 
1956
1956
class TestSelftestWithIdList(tests.TestCaseInTempDir, SelfTestHelper):
2621
2621
        # Running bzr in blackbox mode, normal/expected/user errors should be
2622
2622
        # caught in the regular way and turned into an error message plus exit
2623
2623
        # code.
2624
 
        transport_server = memory.MemoryServer()
 
2624
        transport_server = test_server.MemoryServer()
2625
2625
        transport_server.start_server()
2626
2626
        self.addCleanup(transport_server.stop_server)
2627
2627
        url = transport_server.get_url()
2773
2773
        # Test that a plausible list of modules to doctest is returned
2774
2774
        # by _test_suite_modules_to_doctest.
2775
2775
        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
2776
        self.assertSubset([
2781
2777
            'bzrlib.timestamp',
2782
2778
            ],
2799
2795
        self.overrideAttr(tests, '_test_suite_testmod_names', testmod_names)
2800
2796
        def doctests():
2801
2797
            calls.append("modules_to_doctest")
2802
 
            if __doc__ is None:
2803
 
                return []
2804
2798
            return ['bzrlib.timestamp']
2805
2799
        self.overrideAttr(tests, '_test_suite_modules_to_doctest', doctests)
2806
2800
        expected_test_list = [
2809
2803
            ('bzrlib.tests.per_transport.TransportTests'
2810
2804
             '.test_abspath(LocalTransport,LocalURLServer)'),
2811
2805
            'bzrlib.tests.test_selftest.TestTestSuite.test_test_suite',
 
2806
            # modules_to_doctest
 
2807
            'bzrlib.timestamp.format_highres_date',
2812
2808
            # plugins can't be tested that way since selftest may be run with
2813
2809
            # --no-plugins
2814
2810
            ]
2815
 
        if __doc__ is not None:
2816
 
            expected_test_list.extend([
2817
 
                # modules_to_doctest
2818
 
                'bzrlib.timestamp.format_highres_date',
2819
 
                ])
2820
2811
        suite = tests.test_suite()
2821
2812
        self.assertEqual(set(["testmod_names", "modules_to_doctest"]),
2822
2813
            set(calls))