/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: Robert Collins
  • Date: 2009-08-26 01:18:13 UTC
  • mto: This revision was merged to the branch mainline in revision 4656.
  • Revision ID: robertc@robertcollins.net-20090826011813-46x8kcuzwz97opoi
Deserialise IncompatibleRepositories errors in the client, generating
nicer feedback when the smart server encounters such a situation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
17
17
"""Tests for the test framework."""
18
18
 
19
19
from cStringIO import StringIO
20
 
from doctest import ELLIPSIS
21
20
import os
22
21
import signal
23
22
import sys
25
24
import unittest
26
25
import warnings
27
26
 
28
 
from testtools import MultiTestResult
29
 
from testtools.content_type import ContentType
30
 
from testtools.matchers import (
31
 
    DocTestMatches,
32
 
    Equals,
33
 
    )
34
 
import testtools.tests.helpers
35
 
 
36
27
import bzrlib
37
28
from bzrlib import (
38
29
    branchbuilder,
47
38
    repository,
48
39
    symbol_versioning,
49
40
    tests,
50
 
    transport,
51
41
    workingtree,
52
42
    )
53
43
from bzrlib.repofmt import (
61
51
    deprecated_method,
62
52
    )
63
53
from bzrlib.tests import (
64
 
    features,
 
54
    SubUnitFeature,
65
55
    test_lsprof,
66
 
    test_server,
67
56
    test_sftp_transport,
68
57
    TestUtil,
69
58
    )
70
59
from bzrlib.trace import note
71
 
from bzrlib.transport import memory
 
60
from bzrlib.transport.memory import MemoryServer, MemoryTransport
72
61
from bzrlib.version import _get_bzr_source_tree
73
62
 
74
63
 
88
77
                          TestUtil._load_module_by_name,
89
78
                          'bzrlib.no-name-yet')
90
79
 
91
 
 
92
80
class MetaTestLog(tests.TestCase):
93
81
 
94
82
    def test_logging(self):
95
83
        """Test logs are captured when a test fails."""
96
84
        self.log('a test message')
97
 
        details = self.getDetails()
98
 
        log = details['log']
99
 
        self.assertThat(log.content_type, Equals(ContentType(
100
 
            "text", "plain", {"charset": "utf8"})))
101
 
        self.assertThat(u"".join(log.iter_text()), Equals(self.get_log()))
102
 
        self.assertThat(self.get_log(),
103
 
            DocTestMatches(u"...a test message\n", ELLIPSIS))
 
85
        self._log_file.flush()
 
86
        self.assertContainsRe(self._get_log(keep_log_file=True),
 
87
                              'a test message\n')
104
88
 
105
89
 
106
90
class TestUnicodeFilename(tests.TestCase):
505
489
        self.assertEqualStat(real, fake)
506
490
 
507
491
    def test_assertEqualStat_notequal(self):
508
 
        self.build_tree(["foo", "longname"])
 
492
        self.build_tree(["foo", "bar"])
509
493
        self.assertRaises(AssertionError, self.assertEqualStat,
510
 
            os.lstat("foo"), os.lstat("longname"))
 
494
            os.lstat("foo"), os.lstat("bar"))
511
495
 
512
496
 
513
497
class TestTestCaseWithMemoryTransport(tests.TestCaseWithMemoryTransport):
531
515
        cwd = osutils.getcwd()
532
516
        self.assertIsSameRealPath(self.test_dir, cwd)
533
517
 
534
 
    def test_BZR_HOME_and_HOME_are_bytestrings(self):
535
 
        """The $BZR_HOME and $HOME environment variables should not be unicode.
536
 
 
537
 
        See https://bugs.launchpad.net/bzr/+bug/464174
538
 
        """
539
 
        self.assertIsInstance(os.environ['BZR_HOME'], str)
540
 
        self.assertIsInstance(os.environ['HOME'], str)
541
 
 
542
518
    def test_make_branch_and_memory_tree(self):
543
519
        """In TestCaseWithMemoryTransport we should not make the branch on disk.
544
520
 
600
576
                         self.get_transport().get_bytes(
601
577
                            'dir/.bzr/repository/format'))
602
578
 
 
579
    def test_safety_net(self):
 
580
        """No test should modify the safety .bzr directory.
 
581
 
 
582
        We just test that the _check_safety_net private method raises
 
583
        AssertionError, it's easier than building a test suite with the same
 
584
        test.
 
585
        """
 
586
        # Oops, a commit in the current directory (i.e. without local .bzr
 
587
        # directory) will crawl up the hierarchy to find a .bzr directory.
 
588
        self.run_bzr(['commit', '-mfoo', '--unchanged'])
 
589
        # But we have a safety net in place.
 
590
        self.assertRaises(AssertionError, self._check_safety_net)
 
591
 
603
592
    def test_dangling_locks_cause_failures(self):
604
593
        class TestDanglingLock(tests.TestCaseWithMemoryTransport):
605
594
            def test_function(self):
622
611
 
623
612
    def test_get_readonly_url_none(self):
624
613
        from bzrlib.transport import get_transport
 
614
        from bzrlib.transport.memory import MemoryServer
625
615
        from bzrlib.transport.readonly import ReadonlyTransportDecorator
626
 
        self.vfs_transport_factory = memory.MemoryServer
 
616
        self.vfs_transport_factory = MemoryServer
627
617
        self.transport_readonly_server = None
628
618
        # calling get_readonly_transport() constructs a decorator on the url
629
619
        # for the server
638
628
    def test_get_readonly_url_http(self):
639
629
        from bzrlib.tests.http_server import HttpServer
640
630
        from bzrlib.transport import get_transport
 
631
        from bzrlib.transport.local import LocalURLServer
641
632
        from bzrlib.transport.http import HttpTransportBase
642
 
        self.transport_server = test_server.LocalURLServer
 
633
        self.transport_server = LocalURLServer
643
634
        self.transport_readonly_server = HttpServer
644
635
        # calling get_readonly_transport() gives us a HTTP server instance.
645
636
        url = self.get_readonly_url()
676
667
 
677
668
    def setUp(self):
678
669
        super(TestTestCaseTransports, self).setUp()
679
 
        self.vfs_transport_factory = memory.MemoryServer
 
670
        self.vfs_transport_factory = MemoryServer
680
671
 
681
672
    def test_make_bzrdir_preserves_transport(self):
682
673
        t = self.get_transport()
683
674
        result_bzrdir = self.make_bzrdir('subdir')
684
675
        self.assertIsInstance(result_bzrdir.transport,
685
 
                              memory.MemoryTransport)
 
676
                              MemoryTransport)
686
677
        # should not be on disk, should only be in memory
687
678
        self.failIfExists('subdir')
688
679
 
700
691
 
701
692
    def test_profiles_tests(self):
702
693
        self.requireFeature(test_lsprof.LSProfFeature)
703
 
        terminal = testtools.tests.helpers.ExtendedTestResult()
 
694
        terminal = unittest.TestResult()
704
695
        result = tests.ProfileResult(terminal)
705
696
        class Sample(tests.TestCase):
706
697
            def a(self):
708
699
            def sample_function(self):
709
700
                pass
710
701
        test = Sample("a")
 
702
        test.attrs_to_keep = test.attrs_to_keep + ('_benchcalls',)
711
703
        test.run(result)
712
 
        case = terminal._events[0][1]
713
 
        self.assertLength(1, case._benchcalls)
 
704
        self.assertLength(1, test._benchcalls)
714
705
        # We must be able to unpack it as the test reporting code wants
715
 
        (_, _, _), stats = case._benchcalls[0]
 
706
        (_, _, _), stats = test._benchcalls[0]
716
707
        self.assertTrue(callable(stats.pprint))
717
708
 
718
709
 
723
714
                descriptions=0,
724
715
                verbosity=1,
725
716
                )
726
 
        capture = testtools.tests.helpers.ExtendedTestResult()
727
 
        test_case.run(MultiTestResult(result, capture))
728
 
        run_case = capture._events[0][1]
729
 
        timed_string = result._testTimeString(run_case)
 
717
        test_case.run(result)
 
718
        timed_string = result._testTimeString(test_case)
730
719
        self.assertContainsRe(timed_string, expected_re)
731
720
 
732
721
    def test_test_reporting(self):
750
739
        self.check_timing(ShortDelayTestCase('test_short_delay'),
751
740
                          r"^ +[0-9]+ms$")
752
741
 
753
 
    def _patch_get_bzr_source_tree(self):
754
 
        # Reading from the actual source tree breaks isolation, but we don't
755
 
        # want to assume that thats *all* that would happen.
756
 
        self.overrideAttr(bzrlib.version, '_get_bzr_source_tree', lambda: None)
757
 
 
758
742
    def test_assigned_benchmark_file_stores_date(self):
759
 
        self._patch_get_bzr_source_tree()
760
743
        output = StringIO()
761
744
        result = bzrlib.tests.TextTestResult(self._log_file,
762
745
                                        descriptions=0,
770
753
        self.assertContainsRe(output_string, "--date [0-9.]+")
771
754
 
772
755
    def test_benchhistory_records_test_times(self):
773
 
        self._patch_get_bzr_source_tree()
774
756
        result_stream = StringIO()
775
757
        result = bzrlib.tests.TextTestResult(
776
758
            self._log_file,
838
820
    def test_known_failure(self):
839
821
        """A KnownFailure being raised should trigger several result actions."""
840
822
        class InstrumentedTestResult(tests.ExtendedTestResult):
841
 
            def stopTestRun(self): pass
 
823
            def done(self): pass
842
824
            def startTests(self): pass
843
825
            def report_test_start(self, test): pass
844
 
            def report_known_failure(self, test, err=None, details=None):
845
 
                self._call = test, 'known failure'
 
826
            def report_known_failure(self, test, err):
 
827
                self._call = test, err
846
828
        result = InstrumentedTestResult(None, None, None, None)
847
 
        class Test(tests.TestCase):
848
 
            def test_function(self):
849
 
                raise tests.KnownFailure('failed!')
850
 
        test = Test("test_function")
 
829
        def test_function():
 
830
            raise tests.KnownFailure('failed!')
 
831
        test = unittest.FunctionTestCase(test_function)
851
832
        test.run(result)
852
833
        # it should invoke 'report_known_failure'.
853
834
        self.assertEqual(2, len(result._call))
854
 
        self.assertEqual(test.id(), result._call[0].id())
855
 
        self.assertEqual('known failure', result._call[1])
 
835
        self.assertEqual(test, result._call[0])
 
836
        self.assertEqual(tests.KnownFailure, result._call[1][0])
 
837
        self.assertIsInstance(result._call[1][1], tests.KnownFailure)
856
838
        # we dont introspec the traceback, if the rest is ok, it would be
857
839
        # exceptional for it not to be.
858
840
        # it should update the known_failure_count on the object.
892
874
    def test_add_not_supported(self):
893
875
        """Test the behaviour of invoking addNotSupported."""
894
876
        class InstrumentedTestResult(tests.ExtendedTestResult):
895
 
            def stopTestRun(self): pass
 
877
            def done(self): pass
896
878
            def startTests(self): pass
897
879
            def report_test_start(self, test): pass
898
880
            def report_unsupported(self, test, feature):
930
912
        result.report_unsupported(test, feature)
931
913
        output = result_stream.getvalue()[prefix:]
932
914
        lines = output.splitlines()
933
 
        # We don't check for the final '0ms' since it may fail on slow hosts
934
 
        self.assertStartsWith(lines[0], 'NODEP')
935
 
        self.assertEqual(lines[1],
936
 
                         "    The feature 'Feature' is not available.")
 
915
        self.assertEqual(lines, ['NODEP        0ms',
 
916
                                 "    The feature 'Feature' is not available."])
937
917
 
938
918
    def test_unavailable_exception(self):
939
919
        """An UnavailableFeature being raised should invoke addNotSupported."""
940
920
        class InstrumentedTestResult(tests.ExtendedTestResult):
941
 
            def stopTestRun(self): pass
 
921
            def done(self): pass
942
922
            def startTests(self): pass
943
923
            def report_test_start(self, test): pass
944
924
            def addNotSupported(self, test, feature):
945
925
                self._call = test, feature
946
926
        result = InstrumentedTestResult(None, None, None, None)
947
927
        feature = tests.Feature()
948
 
        class Test(tests.TestCase):
949
 
            def test_function(self):
950
 
                raise tests.UnavailableFeature(feature)
951
 
        test = Test("test_function")
 
928
        def test_function():
 
929
            raise tests.UnavailableFeature(feature)
 
930
        test = unittest.FunctionTestCase(test_function)
952
931
        test.run(result)
953
932
        # it should invoke 'addNotSupported'.
954
933
        self.assertEqual(2, len(result._call))
955
 
        self.assertEqual(test.id(), result._call[0].id())
 
934
        self.assertEqual(test, result._call[0])
956
935
        self.assertEqual(feature, result._call[1])
957
936
        # and not count as an error
958
937
        self.assertEqual(0, result.error_count)
971
950
                                             verbosity=1)
972
951
        test = self.get_passing_test()
973
952
        err = (tests.KnownFailure, tests.KnownFailure('foo'), None)
974
 
        result.addExpectedFailure(test, err)
 
953
        result._addKnownFailure(test, err)
975
954
        self.assertFalse(result.wasStrictlySuccessful())
976
955
        self.assertEqual(None, result._extractBenchmarkTime(test))
977
956
 
1022
1001
        because of our use of global state.
1023
1002
        """
1024
1003
        old_root = tests.TestCaseInTempDir.TEST_ROOT
1025
 
        old_leak = tests.TestCase._first_thread_leaker_id
1026
1004
        try:
1027
1005
            tests.TestCaseInTempDir.TEST_ROOT = None
1028
 
            tests.TestCase._first_thread_leaker_id = None
1029
1006
            return testrunner.run(test)
1030
1007
        finally:
1031
1008
            tests.TestCaseInTempDir.TEST_ROOT = old_root
1032
 
            tests.TestCase._first_thread_leaker_id = old_leak
1033
1009
 
1034
1010
    def test_known_failure_failed_run(self):
1035
1011
        # run a test that generates a known failure which should be printed in
1036
1012
        # the final output when real failures occur.
1037
 
        class Test(tests.TestCase):
1038
 
            def known_failure_test(self):
1039
 
                self.expectFailure('failed', self.assertTrue, False)
 
1013
        def known_failure_test():
 
1014
            raise tests.KnownFailure('failed')
1040
1015
        test = unittest.TestSuite()
1041
 
        test.addTest(Test("known_failure_test"))
 
1016
        test.addTest(unittest.FunctionTestCase(known_failure_test))
1042
1017
        def failing_test():
1043
 
            self.fail('foo')
 
1018
            raise AssertionError('foo')
1044
1019
        test.addTest(unittest.FunctionTestCase(failing_test))
1045
1020
        stream = StringIO()
1046
1021
        runner = tests.TextTestRunner(stream=stream)
1047
1022
        result = self.run_test_runner(runner, test)
1048
1023
        lines = stream.getvalue().splitlines()
1049
1024
        self.assertContainsRe(stream.getvalue(),
1050
 
            '(?sm)^bzr selftest.*$'
 
1025
            '(?sm)^testing.*$'
1051
1026
            '.*'
1052
1027
            '^======================================================================\n'
1053
 
            '^FAIL: failing_test\n'
 
1028
            '^FAIL: unittest.FunctionTestCase \\(failing_test\\)\n'
1054
1029
            '^----------------------------------------------------------------------\n'
1055
1030
            'Traceback \\(most recent call last\\):\n'
1056
1031
            '  .*' # File .*, line .*, in failing_test' - but maybe not from .pyc
1057
 
            '    self.fail\\(\'foo\'\\)\n'
 
1032
            '    raise AssertionError\\(\'foo\'\\)\n'
1058
1033
            '.*'
1059
1034
            '^----------------------------------------------------------------------\n'
1060
1035
            '.*'
1062
1037
            )
1063
1038
 
1064
1039
    def test_known_failure_ok_run(self):
1065
 
        # run a test that generates a known failure which should be printed in
1066
 
        # the final output.
1067
 
        class Test(tests.TestCase):
1068
 
            def known_failure_test(self):
1069
 
                self.expectFailure('failed', self.assertTrue, False)
1070
 
        test = Test("known_failure_test")
 
1040
        # run a test that generates a known failure which should be printed in the final output.
 
1041
        def known_failure_test():
 
1042
            raise tests.KnownFailure('failed')
 
1043
        test = unittest.FunctionTestCase(known_failure_test)
1071
1044
        stream = StringIO()
1072
1045
        runner = tests.TextTestRunner(stream=stream)
1073
1046
        result = self.run_test_runner(runner, test)
1150
1123
 
1151
1124
    def test_not_applicable(self):
1152
1125
        # run a test that is skipped because it's not applicable
1153
 
        class Test(tests.TestCase):
1154
 
            def not_applicable_test(self):
1155
 
                raise tests.TestNotApplicable('this test never runs')
 
1126
        def not_applicable_test():
 
1127
            raise tests.TestNotApplicable('this test never runs')
1156
1128
        out = StringIO()
1157
1129
        runner = tests.TextTestRunner(stream=out, verbosity=2)
1158
 
        test = Test("not_applicable_test")
 
1130
        test = unittest.FunctionTestCase(not_applicable_test)
1159
1131
        result = self.run_test_runner(runner, test)
1160
1132
        self._log_file.write(out.getvalue())
1161
1133
        self.assertTrue(result.wasSuccessful())
1190
1162
            ],
1191
1163
            lines[-3:])
1192
1164
 
1193
 
    def _patch_get_bzr_source_tree(self):
1194
 
        # Reading from the actual source tree breaks isolation, but we don't
1195
 
        # want to assume that thats *all* that would happen.
1196
 
        self._get_source_tree_calls = []
1197
 
        def new_get():
1198
 
            self._get_source_tree_calls.append("called")
1199
 
            return None
1200
 
        self.overrideAttr(bzrlib.version, '_get_bzr_source_tree',  new_get)
1201
 
 
1202
1165
    def test_bench_history(self):
1203
 
        # tests that the running the benchmark passes bench_history into
1204
 
        # the test result object. We can tell that happens if
1205
 
        # _get_bzr_source_tree is called.
1206
 
        self._patch_get_bzr_source_tree()
 
1166
        # tests that the running the benchmark produces a history file
 
1167
        # containing a timestamp and the revision id of the bzrlib source which
 
1168
        # was tested.
 
1169
        workingtree = _get_bzr_source_tree()
1207
1170
        test = TestRunner('dummy_test')
1208
1171
        output = StringIO()
1209
1172
        runner = tests.TextTestRunner(stream=self._log_file,
1211
1174
        result = self.run_test_runner(runner, test)
1212
1175
        output_string = output.getvalue()
1213
1176
        self.assertContainsRe(output_string, "--date [0-9.]+")
1214
 
        self.assertLength(1, self._get_source_tree_calls)
1215
 
 
1216
 
    def test_startTestRun(self):
1217
 
        """run should call result.startTestRun()"""
1218
 
        calls = []
1219
 
        class LoggingDecorator(tests.ForwardingResult):
1220
 
            def startTestRun(self):
1221
 
                tests.ForwardingResult.startTestRun(self)
1222
 
                calls.append('startTestRun')
1223
 
        test = unittest.FunctionTestCase(lambda:None)
1224
 
        stream = StringIO()
1225
 
        runner = tests.TextTestRunner(stream=stream,
1226
 
            result_decorators=[LoggingDecorator])
1227
 
        result = self.run_test_runner(runner, test)
1228
 
        self.assertLength(1, calls)
1229
 
 
1230
 
    def test_stopTestRun(self):
1231
 
        """run should call result.stopTestRun()"""
1232
 
        calls = []
1233
 
        class LoggingDecorator(tests.ForwardingResult):
1234
 
            def stopTestRun(self):
1235
 
                tests.ForwardingResult.stopTestRun(self)
1236
 
                calls.append('stopTestRun')
1237
 
        test = unittest.FunctionTestCase(lambda:None)
1238
 
        stream = StringIO()
1239
 
        runner = tests.TextTestRunner(stream=stream,
1240
 
            result_decorators=[LoggingDecorator])
1241
 
        result = self.run_test_runner(runner, test)
1242
 
        self.assertLength(1, calls)
 
1177
        if workingtree is not None:
 
1178
            revision_id = workingtree.get_parent_ids()[0]
 
1179
            self.assertEndsWith(output_string.rstrip(), revision_id)
 
1180
 
 
1181
    def assertLogDeleted(self, test):
 
1182
        log = test._get_log()
 
1183
        self.assertEqual("DELETED log file to reduce memory footprint", log)
 
1184
        self.assertEqual('', test._log_contents)
 
1185
        self.assertIs(None, test._log_file_name)
 
1186
 
 
1187
    def test_success_log_deleted(self):
 
1188
        """Successful tests have their log deleted"""
 
1189
 
 
1190
        class LogTester(tests.TestCase):
 
1191
 
 
1192
            def test_success(self):
 
1193
                self.log('this will be removed\n')
 
1194
 
 
1195
        sio = StringIO()
 
1196
        runner = tests.TextTestRunner(stream=sio)
 
1197
        test = LogTester('test_success')
 
1198
        result = self.run_test_runner(runner, test)
 
1199
 
 
1200
        self.assertLogDeleted(test)
 
1201
 
 
1202
    def test_skipped_log_deleted(self):
 
1203
        """Skipped tests have their log deleted"""
 
1204
 
 
1205
        class LogTester(tests.TestCase):
 
1206
 
 
1207
            def test_skipped(self):
 
1208
                self.log('this will be removed\n')
 
1209
                raise tests.TestSkipped()
 
1210
 
 
1211
        sio = StringIO()
 
1212
        runner = tests.TextTestRunner(stream=sio)
 
1213
        test = LogTester('test_skipped')
 
1214
        result = self.run_test_runner(runner, test)
 
1215
 
 
1216
        self.assertLogDeleted(test)
 
1217
 
 
1218
    def test_not_aplicable_log_deleted(self):
 
1219
        """Not applicable tests have their log deleted"""
 
1220
 
 
1221
        class LogTester(tests.TestCase):
 
1222
 
 
1223
            def test_not_applicable(self):
 
1224
                self.log('this will be removed\n')
 
1225
                raise tests.TestNotApplicable()
 
1226
 
 
1227
        sio = StringIO()
 
1228
        runner = tests.TextTestRunner(stream=sio)
 
1229
        test = LogTester('test_not_applicable')
 
1230
        result = self.run_test_runner(runner, test)
 
1231
 
 
1232
        self.assertLogDeleted(test)
 
1233
 
 
1234
    def test_known_failure_log_deleted(self):
 
1235
        """Know failure tests have their log deleted"""
 
1236
 
 
1237
        class LogTester(tests.TestCase):
 
1238
 
 
1239
            def test_known_failure(self):
 
1240
                self.log('this will be removed\n')
 
1241
                raise tests.KnownFailure()
 
1242
 
 
1243
        sio = StringIO()
 
1244
        runner = tests.TextTestRunner(stream=sio)
 
1245
        test = LogTester('test_known_failure')
 
1246
        result = self.run_test_runner(runner, test)
 
1247
 
 
1248
        self.assertLogDeleted(test)
 
1249
 
 
1250
    def test_fail_log_kept(self):
 
1251
        """Failed tests have their log kept"""
 
1252
 
 
1253
        class LogTester(tests.TestCase):
 
1254
 
 
1255
            def test_fail(self):
 
1256
                self.log('this will be kept\n')
 
1257
                self.fail('this test fails')
 
1258
 
 
1259
        sio = StringIO()
 
1260
        runner = tests.TextTestRunner(stream=sio)
 
1261
        test = LogTester('test_fail')
 
1262
        result = self.run_test_runner(runner, test)
 
1263
 
 
1264
        text = sio.getvalue()
 
1265
        self.assertContainsRe(text, 'this will be kept')
 
1266
        self.assertContainsRe(text, 'this test fails')
 
1267
 
 
1268
        log = test._get_log()
 
1269
        self.assertContainsRe(log, 'this will be kept')
 
1270
        self.assertEqual(log, test._log_contents)
 
1271
 
 
1272
    def test_error_log_kept(self):
 
1273
        """Tests with errors have their log kept"""
 
1274
 
 
1275
        class LogTester(tests.TestCase):
 
1276
 
 
1277
            def test_error(self):
 
1278
                self.log('this will be kept\n')
 
1279
                raise ValueError('random exception raised')
 
1280
 
 
1281
        sio = StringIO()
 
1282
        runner = tests.TextTestRunner(stream=sio)
 
1283
        test = LogTester('test_error')
 
1284
        result = self.run_test_runner(runner, test)
 
1285
 
 
1286
        text = sio.getvalue()
 
1287
        self.assertContainsRe(text, 'this will be kept')
 
1288
        self.assertContainsRe(text, 'random exception raised')
 
1289
 
 
1290
        log = test._get_log()
 
1291
        self.assertContainsRe(log, 'this will be kept')
 
1292
        self.assertEqual(log, test._log_contents)
1243
1293
 
1244
1294
 
1245
1295
class SampleTestCase(tests.TestCase):
1311
1361
        self.assertEqual(flags, bzrlib.debug.debug_flags)
1312
1362
 
1313
1363
    def change_selftest_debug_flags(self, new_flags):
1314
 
        self.overrideAttr(tests, 'selftest_debug_flags', set(new_flags))
 
1364
        orig_selftest_flags = tests.selftest_debug_flags
 
1365
        self.addCleanup(self._restore_selftest_debug_flags, orig_selftest_flags)
 
1366
        tests.selftest_debug_flags = set(new_flags)
 
1367
 
 
1368
    def _restore_selftest_debug_flags(self, flags):
 
1369
        tests.selftest_debug_flags = flags
1315
1370
 
1316
1371
    def test_allow_debug_flag(self):
1317
1372
        """The -Eallow_debug flag prevents bzrlib.debug.debug_flags from being
1377
1432
        self.assertEqual(set(['original-state']), bzrlib.debug.debug_flags)
1378
1433
 
1379
1434
    def make_test_result(self):
1380
 
        """Get a test result that writes to the test log file."""
1381
1435
        return tests.TextTestResult(self._log_file, descriptions=0, verbosity=1)
1382
1436
 
1383
1437
    def inner_test(self):
1391
1445
        result = self.make_test_result()
1392
1446
        self.inner_test.run(result)
1393
1447
        note("outer finish")
1394
 
        self.addCleanup(osutils.delete_any, self._log_file_name)
1395
1448
 
1396
1449
    def test_trace_nesting(self):
1397
1450
        # this tests that each test case nests its trace facility correctly.
1463
1516
        """Self.knownFailure() should raise a KnownFailure exception."""
1464
1517
        self.assertRaises(tests.KnownFailure, self.knownFailure, "A Failure")
1465
1518
 
1466
 
    def test_open_bzrdir_safe_roots(self):
1467
 
        # even a memory transport should fail to open when its url isn't 
1468
 
        # permitted.
1469
 
        # Manually set one up (TestCase doesn't and shouldn't provide magic
1470
 
        # machinery)
1471
 
        transport_server = memory.MemoryServer()
1472
 
        transport_server.start_server()
1473
 
        self.addCleanup(transport_server.stop_server)
1474
 
        t = transport.get_transport(transport_server.get_url())
1475
 
        bzrdir.BzrDir.create(t.base)
1476
 
        self.assertRaises(errors.BzrError,
1477
 
            bzrdir.BzrDir.open_from_transport, t)
1478
 
        # But if we declare this as safe, we can open the bzrdir.
1479
 
        self.permit_url(t.base)
1480
 
        self._bzr_selftest_roots.append(t.base)
1481
 
        bzrdir.BzrDir.open_from_transport(t)
1482
 
 
1483
1519
    def test_requireFeature_available(self):
1484
1520
        """self.requireFeature(available) is a no-op."""
1485
1521
        class Available(tests.Feature):
1529
1565
        """Test disabled tests behaviour with support aware results."""
1530
1566
        test = SampleTestCase('_test_pass')
1531
1567
        class DisabledFeature(object):
1532
 
            def __eq__(self, other):
1533
 
                return isinstance(other, DisabledFeature)
1534
1568
            def available(self):
1535
1569
                return False
1536
1570
        the_feature = DisabledFeature()
1547
1581
                self.calls.append(('addNotSupported', test, feature))
1548
1582
        result = InstrumentedTestResult()
1549
1583
        test.run(result)
1550
 
        case = result.calls[0][1]
1551
1584
        self.assertEqual([
1552
 
            ('startTest', case),
1553
 
            ('addNotSupported', case, the_feature),
1554
 
            ('stopTest', case),
 
1585
            ('startTest', test),
 
1586
            ('addNotSupported', test, the_feature),
 
1587
            ('stopTest', test),
1555
1588
            ],
1556
1589
            result.calls)
1557
1590
 
1558
 
    def test_start_server_registers_url(self):
1559
 
        transport_server = memory.MemoryServer()
1560
 
        # A little strict, but unlikely to be changed soon.
1561
 
        self.assertEqual([], self._bzr_selftest_roots)
1562
 
        self.start_server(transport_server)
1563
 
        self.assertSubset([transport_server.get_url()],
1564
 
            self._bzr_selftest_roots)
1565
 
 
1566
1591
    def test_assert_list_raises_on_generator(self):
1567
1592
        def generator_which_will_raise():
1568
1593
            # This will not raise until after the first yield
1618
1643
        self.assertRaises(AssertionError,
1619
1644
            self.assertListRaises, _TestException, success_generator)
1620
1645
 
1621
 
    def test_overrideAttr_without_value(self):
1622
 
        self.test_attr = 'original' # Define a test attribute
1623
 
        obj = self # Make 'obj' visible to the embedded test
1624
 
        class Test(tests.TestCase):
1625
 
 
1626
 
            def setUp(self):
1627
 
                tests.TestCase.setUp(self)
1628
 
                self.orig = self.overrideAttr(obj, 'test_attr')
1629
 
 
1630
 
            def test_value(self):
1631
 
                self.assertEqual('original', self.orig)
1632
 
                self.assertEqual('original', obj.test_attr)
1633
 
                obj.test_attr = 'modified'
1634
 
                self.assertEqual('modified', obj.test_attr)
1635
 
 
1636
 
        test = Test('test_value')
1637
 
        test.run(unittest.TestResult())
1638
 
        self.assertEqual('original', obj.test_attr)
1639
 
 
1640
 
    def test_overrideAttr_with_value(self):
1641
 
        self.test_attr = 'original' # Define a test attribute
1642
 
        obj = self # Make 'obj' visible to the embedded test
1643
 
        class Test(tests.TestCase):
1644
 
 
1645
 
            def setUp(self):
1646
 
                tests.TestCase.setUp(self)
1647
 
                self.orig = self.overrideAttr(obj, 'test_attr', new='modified')
1648
 
 
1649
 
            def test_value(self):
1650
 
                self.assertEqual('original', self.orig)
1651
 
                self.assertEqual('modified', obj.test_attr)
1652
 
 
1653
 
        test = Test('test_value')
1654
 
        test.run(unittest.TestResult())
1655
 
        self.assertEqual('original', obj.test_attr)
1656
 
 
1657
1646
 
1658
1647
# NB: Don't delete this; it's not actually from 0.11!
1659
1648
@deprecated_function(deprecated_in((0, 11, 0)))
1702
1691
        self.assertEndsWith('foo', 'oo')
1703
1692
        self.assertRaises(AssertionError, self.assertEndsWith, 'o', 'oo')
1704
1693
 
1705
 
    def test_assertEqualDiff(self):
1706
 
        e = self.assertRaises(AssertionError,
1707
 
                              self.assertEqualDiff, '', '\n')
1708
 
        self.assertEquals(str(e),
1709
 
                          # Don't blink ! The '+' applies to the second string
1710
 
                          'first string is missing a final newline.\n+ \n')
1711
 
        e = self.assertRaises(AssertionError,
1712
 
                              self.assertEqualDiff, '\n', '')
1713
 
        self.assertEquals(str(e),
1714
 
                          # Don't blink ! The '-' applies to the second string
1715
 
                          'second string is missing a final newline.\n- \n')
1716
 
 
1717
 
 
1718
 
class TestDeprecations(tests.TestCase):
1719
 
 
1720
1694
    def test_applyDeprecated_not_deprecated(self):
1721
1695
        sample_object = ApplyDeprecatedHelper()
1722
1696
        # calling an undeprecated callable raises an assertion
1799
1773
        tree = self.make_branch_and_memory_tree('a')
1800
1774
        self.assertIsInstance(tree, bzrlib.memorytree.MemoryTree)
1801
1775
 
1802
 
    def test_make_tree_for_local_vfs_backed_transport(self):
1803
 
        # make_branch_and_tree has to use local branch and repositories
1804
 
        # when the vfs transport and local disk are colocated, even if
1805
 
        # a different transport is in use for url generation.
1806
 
        self.transport_server = test_server.FakeVFATServer
1807
 
        self.assertFalse(self.get_url('t1').startswith('file://'))
 
1776
 
 
1777
class TestSFTPMakeBranchAndTree(test_sftp_transport.TestCaseWithSFTPServer):
 
1778
 
 
1779
    def test_make_tree_for_sftp_branch(self):
 
1780
        """Transports backed by local directories create local trees."""
 
1781
        # NB: This is arguably a bug in the definition of make_branch_and_tree.
1808
1782
        tree = self.make_branch_and_tree('t1')
1809
1783
        base = tree.bzrdir.root_transport.base
1810
 
        self.assertStartsWith(base, 'file://')
 
1784
        self.failIf(base.startswith('sftp'),
 
1785
                'base %r is on sftp but should be local' % base)
1811
1786
        self.assertEquals(tree.bzrdir.root_transport,
1812
1787
                tree.branch.bzrdir.root_transport)
1813
1788
        self.assertEquals(tree.bzrdir.root_transport,
1907
1882
        self.assertEqual(expected.getvalue(), repeated.getvalue())
1908
1883
 
1909
1884
    def test_runner_class(self):
1910
 
        self.requireFeature(features.subunit)
 
1885
        self.requireFeature(SubUnitFeature)
1911
1886
        from subunit import ProtocolTestCase
1912
1887
        stream = self.run_selftest(runner_class=tests.SubUnitBzrRunner,
1913
1888
            test_suite_factory=self.factory)
1945
1920
        self.assertEqual(transport_server, captured_transport[0])
1946
1921
 
1947
1922
    def test_transport_sftp(self):
1948
 
        self.requireFeature(features.paramiko)
1949
 
        from bzrlib.tests import stub_sftp
1950
 
        self.check_transport_set(stub_sftp.SFTPAbsoluteServer)
 
1923
        try:
 
1924
            import bzrlib.transport.sftp
 
1925
        except errors.ParamikoNotPresent:
 
1926
            raise tests.TestSkipped("Paramiko not present")
 
1927
        self.check_transport_set(bzrlib.transport.sftp.SFTPAbsoluteServer)
1951
1928
 
1952
1929
    def test_transport_memory(self):
1953
 
        self.check_transport_set(memory.MemoryServer)
 
1930
        self.check_transport_set(bzrlib.transport.memory.MemoryServer)
1954
1931
 
1955
1932
 
1956
1933
class TestSelftestWithIdList(tests.TestCaseInTempDir, SelfTestHelper):
1982
1959
 
1983
1960
        Attempts to run bzr from inside this class don't actually run it.
1984
1961
 
1985
 
        We test how run_bzr actually invokes bzr in another location.  Here we
1986
 
        only need to test that it passes the right parameters to run_bzr.
 
1962
        We test how run_bzr actually invokes bzr in another location.
 
1963
        Here we only need to test that it is run_bzr passes the right
 
1964
        parameters to run_bzr.
1987
1965
        """
1988
1966
        self.argv = list(argv)
1989
1967
        self.retcode = retcode
1990
1968
        self.encoding = encoding
1991
1969
        self.stdin = stdin
1992
1970
        self.working_dir = working_dir
1993
 
        return self.retcode, self.out, self.err
 
1971
        return self.out, self.err
1994
1972
 
1995
1973
    def test_run_bzr_error(self):
1996
1974
        self.out = "It sure does!\n"
1997
1975
        out, err = self.run_bzr_error(['^$'], ['rocks'], retcode=34)
1998
1976
        self.assertEqual(['rocks'], self.argv)
1999
1977
        self.assertEqual(34, self.retcode)
2000
 
        self.assertEqual('It sure does!\n', out)
2001
 
        self.assertEquals(out, self.out)
2002
 
        self.assertEqual('', err)
2003
 
        self.assertEquals(err, self.err)
 
1978
        self.assertEqual(out, 'It sure does!\n')
2004
1979
 
2005
1980
    def test_run_bzr_error_regexes(self):
2006
1981
        self.out = ''
2007
1982
        self.err = "bzr: ERROR: foobarbaz is not versioned"
2008
1983
        out, err = self.run_bzr_error(
2009
 
            ["bzr: ERROR: foobarbaz is not versioned"],
2010
 
            ['file-id', 'foobarbaz'])
 
1984
                ["bzr: ERROR: foobarbaz is not versioned"],
 
1985
                ['file-id', 'foobarbaz'])
2011
1986
 
2012
1987
    def test_encoding(self):
2013
1988
        """Test that run_bzr passes encoding to _run_bzr_core"""
2142
2117
        return self.out, self.err
2143
2118
 
2144
2119
 
2145
 
class TestWithFakedStartBzrSubprocess(tests.TestCaseWithTransport):
2146
 
    """Base class for tests testing how we might run bzr."""
 
2120
class TestRunBzrSubprocess(tests.TestCaseWithTransport):
2147
2121
 
2148
2122
    def setUp(self):
2149
2123
        tests.TestCaseWithTransport.setUp(self)
2160
2134
            'working_dir':working_dir, 'allow_plugins':allow_plugins})
2161
2135
        return self.next_subprocess
2162
2136
 
2163
 
 
2164
 
class TestRunBzrSubprocess(TestWithFakedStartBzrSubprocess):
2165
 
 
2166
2137
    def assertRunBzrSubprocess(self, expected_args, process, *args, **kwargs):
2167
2138
        """Run run_bzr_subprocess with args and kwargs using a stubbed process.
2168
2139
 
2231
2202
            StubProcess(), '', allow_plugins=True)
2232
2203
 
2233
2204
 
2234
 
class TestFinishBzrSubprocess(TestWithFakedStartBzrSubprocess):
2235
 
 
2236
 
    def test_finish_bzr_subprocess_with_error(self):
2237
 
        """finish_bzr_subprocess allows specification of the desired exit code.
2238
 
        """
2239
 
        process = StubProcess(err="unknown command", retcode=3)
2240
 
        result = self.finish_bzr_subprocess(process, retcode=3)
2241
 
        self.assertEqual('', result[0])
2242
 
        self.assertContainsRe(result[1], 'unknown command')
2243
 
 
2244
 
    def test_finish_bzr_subprocess_ignoring_retcode(self):
2245
 
        """finish_bzr_subprocess allows the exit code to be ignored."""
2246
 
        process = StubProcess(err="unknown command", retcode=3)
2247
 
        result = self.finish_bzr_subprocess(process, retcode=None)
2248
 
        self.assertEqual('', result[0])
2249
 
        self.assertContainsRe(result[1], 'unknown command')
2250
 
 
2251
 
    def test_finish_subprocess_with_unexpected_retcode(self):
2252
 
        """finish_bzr_subprocess raises self.failureException if the retcode is
2253
 
        not the expected one.
2254
 
        """
2255
 
        process = StubProcess(err="unknown command", retcode=3)
2256
 
        self.assertRaises(self.failureException, self.finish_bzr_subprocess,
2257
 
                          process)
2258
 
 
2259
 
 
2260
2205
class _DontSpawnProcess(Exception):
2261
2206
    """A simple exception which just allows us to skip unnecessary steps"""
2262
2207
 
2340
2285
        self.assertEqual(['foo', 'current'], chdirs)
2341
2286
 
2342
2287
 
2343
 
class TestActuallyStartBzrSubprocess(tests.TestCaseWithTransport):
2344
 
    """Tests that really need to do things with an external bzr."""
 
2288
class TestBzrSubprocess(tests.TestCaseWithTransport):
 
2289
 
 
2290
    def test_start_and_stop_bzr_subprocess(self):
 
2291
        """We can start and perform other test actions while that process is
 
2292
        still alive.
 
2293
        """
 
2294
        process = self.start_bzr_subprocess(['--version'])
 
2295
        result = self.finish_bzr_subprocess(process)
 
2296
        self.assertContainsRe(result[0], 'is free software')
 
2297
        self.assertEqual('', result[1])
 
2298
 
 
2299
    def test_start_and_stop_bzr_subprocess_with_error(self):
 
2300
        """finish_bzr_subprocess allows specification of the desired exit code.
 
2301
        """
 
2302
        process = self.start_bzr_subprocess(['--versionn'])
 
2303
        result = self.finish_bzr_subprocess(process, retcode=3)
 
2304
        self.assertEqual('', result[0])
 
2305
        self.assertContainsRe(result[1], 'unknown command')
 
2306
 
 
2307
    def test_start_and_stop_bzr_subprocess_ignoring_retcode(self):
 
2308
        """finish_bzr_subprocess allows the exit code to be ignored."""
 
2309
        process = self.start_bzr_subprocess(['--versionn'])
 
2310
        result = self.finish_bzr_subprocess(process, retcode=None)
 
2311
        self.assertEqual('', result[0])
 
2312
        self.assertContainsRe(result[1], 'unknown command')
 
2313
 
 
2314
    def test_start_and_stop_bzr_subprocess_with_unexpected_retcode(self):
 
2315
        """finish_bzr_subprocess raises self.failureException if the retcode is
 
2316
        not the expected one.
 
2317
        """
 
2318
        process = self.start_bzr_subprocess(['--versionn'])
 
2319
        self.assertRaises(self.failureException, self.finish_bzr_subprocess,
 
2320
                          process)
2345
2321
 
2346
2322
    def test_start_and_stop_bzr_subprocess_send_signal(self):
2347
2323
        """finish_bzr_subprocess raises self.failureException if the retcode is
2348
2324
        not the expected one.
2349
2325
        """
2350
 
        self.disable_missing_extensions_warning()
2351
2326
        process = self.start_bzr_subprocess(['wait-until-signalled'],
2352
2327
                                            skip_if_plan_to_signal=True)
2353
2328
        self.assertEqual('running\n', process.stdout.readline())
2356
2331
        self.assertEqual('', result[0])
2357
2332
        self.assertEqual('bzr: interrupted\n', result[1])
2358
2333
 
 
2334
    def test_start_and_stop_working_dir(self):
 
2335
        cwd = osutils.getcwd()
 
2336
        self.make_branch_and_tree('one')
 
2337
        process = self.start_bzr_subprocess(['root'], working_dir='one')
 
2338
        result = self.finish_bzr_subprocess(process, universal_newlines=True)
 
2339
        self.assertEndsWith(result[0], 'one\n')
 
2340
        self.assertEqual('', result[1])
 
2341
 
 
2342
 
 
2343
class TestKnownFailure(tests.TestCase):
 
2344
 
 
2345
    def test_known_failure(self):
 
2346
        """Check that KnownFailure is defined appropriately."""
 
2347
        # a KnownFailure is an assertion error for compatability with unaware
 
2348
        # runners.
 
2349
        self.assertIsInstance(tests.KnownFailure(""), AssertionError)
 
2350
 
 
2351
    def test_expect_failure(self):
 
2352
        try:
 
2353
            self.expectFailure("Doomed to failure", self.assertTrue, False)
 
2354
        except tests.KnownFailure, e:
 
2355
            self.assertEqual('Doomed to failure', e.args[0])
 
2356
        try:
 
2357
            self.expectFailure("Doomed to failure", self.assertTrue, True)
 
2358
        except AssertionError, e:
 
2359
            self.assertEqual('Unexpected success.  Should have failed:'
 
2360
                             ' Doomed to failure', e.args[0])
 
2361
        else:
 
2362
            self.fail('Assertion not raised')
 
2363
 
2359
2364
 
2360
2365
class TestFeature(tests.TestCase):
2361
2366
 
2398
2403
        self.assertIs(feature, exception.args[0])
2399
2404
 
2400
2405
 
2401
 
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
 
    )
2407
 
 
2408
 
class Test_CompatibilityFeature(tests.TestCase):
2409
 
 
2410
 
    def test_does_thunk(self):
2411
 
        res = self.callDeprecated(
2412
 
            ['bzrlib.tests.test_selftest.simple_thunk_feature was deprecated'
2413
 
             ' in version 2.1.0. Use bzrlib.tests.UnicodeFilename instead.'],
2414
 
            simple_thunk_feature.available)
2415
 
        self.assertEqual(tests.UnicodeFilename.available(), res)
2416
 
 
2417
 
 
2418
 
class TestModuleAvailableFeature(tests.TestCase):
2419
 
 
2420
 
    def test_available_module(self):
2421
 
        feature = tests.ModuleAvailableFeature('bzrlib.tests')
2422
 
        self.assertEqual('bzrlib.tests', feature.module_name)
2423
 
        self.assertEqual('bzrlib.tests', str(feature))
2424
 
        self.assertTrue(feature.available())
2425
 
        self.assertIs(tests, feature.module)
2426
 
 
2427
 
    def test_unavailable_module(self):
2428
 
        feature = tests.ModuleAvailableFeature('bzrlib.no_such_module_exists')
2429
 
        self.assertEqual('bzrlib.no_such_module_exists', str(feature))
2430
 
        self.assertFalse(feature.available())
2431
 
        self.assertIs(None, feature.module)
2432
 
 
2433
 
 
2434
2406
class TestSelftestFiltering(tests.TestCase):
2435
2407
 
2436
2408
    def setUp(self):
2615
2587
        # the test framework
2616
2588
        self.assertEquals('always fails', str(e))
2617
2589
        # check that there's no traceback in the test log
2618
 
        self.assertNotContainsRe(self.get_log(), r'Traceback')
 
2590
        self.assertNotContainsRe(self._get_log(keep_log_file=True),
 
2591
            r'Traceback')
2619
2592
 
2620
2593
    def test_run_bzr_user_error_caught(self):
2621
2594
        # Running bzr in blackbox mode, normal/expected/user errors should be
2622
2595
        # caught in the regular way and turned into an error message plus exit
2623
2596
        # code.
2624
 
        transport_server = memory.MemoryServer()
2625
 
        transport_server.start_server()
2626
 
        self.addCleanup(transport_server.stop_server)
2627
 
        url = transport_server.get_url()
2628
 
        self.permit_url(url)
2629
 
        out, err = self.run_bzr(["log", "%s/nonexistantpath" % url], retcode=3)
 
2597
        out, err = self.run_bzr(["log", "/nonexistantpath"], retcode=3)
2630
2598
        self.assertEqual(out, '')
2631
2599
        self.assertContainsRe(err,
2632
2600
            'bzr: ERROR: Not a branch: ".*nonexistantpath/".\n')
2758
2726
 
2759
2727
class TestTestSuite(tests.TestCase):
2760
2728
 
2761
 
    def test__test_suite_testmod_names(self):
2762
 
        # Test that a plausible list of test module names are returned
2763
 
        # by _test_suite_testmod_names.
2764
 
        test_list = tests._test_suite_testmod_names()
2765
 
        self.assertSubset([
2766
 
            'bzrlib.tests.blackbox',
2767
 
            'bzrlib.tests.per_transport',
2768
 
            'bzrlib.tests.test_selftest',
2769
 
            ],
2770
 
            test_list)
2771
 
 
2772
 
    def test__test_suite_modules_to_doctest(self):
2773
 
        # Test that a plausible list of modules to doctest is returned
2774
 
        # by _test_suite_modules_to_doctest.
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
 
        self.assertSubset([
2781
 
            'bzrlib.timestamp',
2782
 
            ],
2783
 
            test_list)
2784
 
 
2785
2729
    def test_test_suite(self):
2786
 
        # test_suite() loads the entire test suite to operate. To avoid this
2787
 
        # overhead, and yet still be confident that things are happening,
2788
 
        # we temporarily replace two functions used by test_suite with 
2789
 
        # test doubles that supply a few sample tests to load, and check they
2790
 
        # are loaded.
2791
 
        calls = []
2792
 
        def testmod_names():
2793
 
            calls.append("testmod_names")
2794
 
            return [
2795
 
                'bzrlib.tests.blackbox.test_branch',
2796
 
                'bzrlib.tests.per_transport',
2797
 
                'bzrlib.tests.test_selftest',
2798
 
                ]
2799
 
        self.overrideAttr(tests, '_test_suite_testmod_names', testmod_names)
2800
 
        def doctests():
2801
 
            calls.append("modules_to_doctest")
2802
 
            if __doc__ is None:
2803
 
                return []
2804
 
            return ['bzrlib.timestamp']
2805
 
        self.overrideAttr(tests, '_test_suite_modules_to_doctest', doctests)
2806
 
        expected_test_list = [
 
2730
        # This test is slow - it loads the entire test suite to operate, so we
 
2731
        # do a single test with one test in each category
 
2732
        test_list = [
2807
2733
            # testmod_names
2808
2734
            'bzrlib.tests.blackbox.test_branch.TestBranch.test_branch',
2809
2735
            ('bzrlib.tests.per_transport.TransportTests'
2810
 
             '.test_abspath(LocalTransport,LocalURLServer)'),
 
2736
             '.test_abspath(LocalURLServer)'),
2811
2737
            'bzrlib.tests.test_selftest.TestTestSuite.test_test_suite',
 
2738
            # modules_to_doctest
 
2739
            'bzrlib.timestamp.format_highres_date',
2812
2740
            # plugins can't be tested that way since selftest may be run with
2813
2741
            # --no-plugins
2814
2742
            ]
2815
 
        if __doc__ is not None:
2816
 
            expected_test_list.extend([
2817
 
                # modules_to_doctest
2818
 
                'bzrlib.timestamp.format_highres_date',
2819
 
                ])
2820
 
        suite = tests.test_suite()
2821
 
        self.assertEqual(set(["testmod_names", "modules_to_doctest"]),
2822
 
            set(calls))
2823
 
        self.assertSubset(expected_test_list, _test_ids(suite))
 
2743
        suite = tests.test_suite(test_list)
 
2744
        self.assertEquals(test_list, _test_ids(suite))
2824
2745
 
2825
2746
    def test_test_suite_list_and_start(self):
2826
2747
        # We cannot test this at the same time as the main load, because we want
2827
 
        # to know that starting_with == None works. So a second load is
2828
 
        # incurred - note that the starting_with parameter causes a partial load
2829
 
        # rather than a full load so this test should be pretty quick.
 
2748
        # to know that starting_with == None works. So a second full load is
 
2749
        # incurred.
2830
2750
        test_list = ['bzrlib.tests.test_selftest.TestTestSuite.test_test_suite']
2831
2751
        suite = tests.test_suite(test_list,
2832
2752
                                 ['bzrlib.tests.test_selftest.TestTestSuite'])
2877
2797
    def test_load_tests(self):
2878
2798
        test_list = ['bzrlib.tests.test_sampler.DemoTest.test_nothing']
2879
2799
        loader = self._create_loader(test_list)
 
2800
 
2880
2801
        suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler')
2881
2802
        self.assertEquals(test_list, _test_ids(suite))
2882
2803
 
2883
2804
    def test_exclude_tests(self):
2884
2805
        test_list = ['bogus']
2885
2806
        loader = self._create_loader(test_list)
 
2807
 
2886
2808
        suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler')
2887
2809
        self.assertEquals([], _test_ids(suite))
2888
2810
 
2933
2855
        tpr.register('bar', 'bbb.aaa.rrr')
2934
2856
        tpr.register('bar', 'bBB.aAA.rRR')
2935
2857
        self.assertEquals('bbb.aaa.rrr', tpr.get('bar'))
2936
 
        self.assertThat(self.get_log(),
2937
 
            DocTestMatches("...bar...bbb.aaa.rrr...BB.aAA.rRR", ELLIPSIS))
 
2858
        self.assertContainsRe(self._get_log(keep_log_file=True),
 
2859
                              r'.*bar.*bbb.aaa.rrr.*bBB.aAA.rRR')
2938
2860
 
2939
2861
    def test_get_unknown_prefix(self):
2940
2862
        tpr = self._get_registry()
2976
2898
                                                self.verbosity)
2977
2899
        tests.run_suite(suite, runner_class=MyRunner, stream=StringIO())
2978
2900
        self.assertLength(1, calls)
 
2901
 
 
2902
    def test_done(self):
 
2903
        """run_suite should call result.done()"""
 
2904
        self.calls = 0
 
2905
        def one_more_call(): self.calls += 1
 
2906
        def test_function():
 
2907
            pass
 
2908
        test = unittest.FunctionTestCase(test_function)
 
2909
        class InstrumentedTestResult(tests.ExtendedTestResult):
 
2910
            def done(self): one_more_call()
 
2911
        class MyRunner(tests.TextTestRunner):
 
2912
            def run(self, test):
 
2913
                return InstrumentedTestResult(self.stream, self.descriptions,
 
2914
                                              self.verbosity)
 
2915
        tests.run_suite(test, runner_class=MyRunner, stream=StringIO())
 
2916
        self.assertEquals(1, self.calls)