~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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
16
16
 
17
17
"""Tests for the test framework."""
18
18
 
19
 
import cStringIO
 
19
from cStringIO import StringIO
 
20
from doctest import ELLIPSIS
20
21
import os
21
 
from StringIO import StringIO
 
22
import signal
22
23
import sys
23
24
import time
24
25
import unittest
25
26
import warnings
26
27
 
 
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
 
27
36
import bzrlib
28
37
from bzrlib import (
29
38
    branchbuilder,
30
39
    bzrdir,
 
40
    debug,
31
41
    errors,
 
42
    lockdir,
32
43
    memorytree,
33
44
    osutils,
 
45
    progress,
34
46
    remote,
35
47
    repository,
36
48
    symbol_versioning,
37
49
    tests,
 
50
    transport,
38
51
    workingtree,
39
52
    )
40
 
from bzrlib.progress import _BaseProgressBar
41
53
from bzrlib.repofmt import (
 
54
    groupcompress_repo,
42
55
    pack_repo,
43
56
    weaverepo,
44
57
    )
48
61
    deprecated_method,
49
62
    )
50
63
from bzrlib.tests import (
51
 
                          ChrootedTestCase,
52
 
                          ExtendedTestResult,
53
 
                          Feature,
54
 
                          KnownFailure,
55
 
                          TestCase,
56
 
                          TestCaseInTempDir,
57
 
                          TestCaseWithMemoryTransport,
58
 
                          TestCaseWithTransport,
59
 
                          TestNotApplicable,
60
 
                          TestSkipped,
61
 
                          TestSuite,
62
 
                          TestUtil,
63
 
                          TextTestRunner,
64
 
                          UnavailableFeature,
65
 
                          condition_id_re,
66
 
                          condition_isinstance,
67
 
                          exclude_tests_by_condition,
68
 
                          exclude_tests_by_re,
69
 
                          filter_suite_by_condition,
70
 
                          filter_suite_by_re,
71
 
                          iter_suite_tests,
72
 
                          preserve_input,
73
 
                          randomize_suite,
74
 
                          run_suite,
75
 
                          split_suite_by_condition,
76
 
                          split_suite_by_re,
77
 
                          test_lsprof,
78
 
                          test_suite,
79
 
                          )
80
 
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
81
 
from bzrlib.tests.TestUtil import _load_module_by_name
 
64
    features,
 
65
    test_lsprof,
 
66
    test_server,
 
67
    test_sftp_transport,
 
68
    TestUtil,
 
69
    )
82
70
from bzrlib.trace import note
83
 
from bzrlib.transport.memory import MemoryServer, MemoryTransport
 
71
from bzrlib.transport import memory
84
72
from bzrlib.version import _get_bzr_source_tree
85
73
 
86
74
 
87
75
def _test_ids(test_suite):
88
76
    """Get the ids for the tests in a test suite."""
89
 
    return [t.id() for t in iter_suite_tests(test_suite)]
90
 
 
91
 
 
92
 
class SelftestTests(TestCase):
 
77
    return [t.id() for t in tests.iter_suite_tests(test_suite)]
 
78
 
 
79
 
 
80
class SelftestTests(tests.TestCase):
93
81
 
94
82
    def test_import_tests(self):
95
 
        mod = _load_module_by_name('bzrlib.tests.test_selftest')
 
83
        mod = TestUtil._load_module_by_name('bzrlib.tests.test_selftest')
96
84
        self.assertEqual(mod.SelftestTests, SelftestTests)
97
85
 
98
86
    def test_import_test_failure(self):
99
87
        self.assertRaises(ImportError,
100
 
                          _load_module_by_name,
 
88
                          TestUtil._load_module_by_name,
101
89
                          'bzrlib.no-name-yet')
102
90
 
103
 
class MetaTestLog(TestCase):
 
91
 
 
92
class MetaTestLog(tests.TestCase):
104
93
 
105
94
    def test_logging(self):
106
95
        """Test logs are captured when a test fails."""
107
96
        self.log('a test message')
108
 
        self._log_file.flush()
109
 
        self.assertContainsRe(self._get_log(keep_log_file=True),
110
 
                              'a test message\n')
111
 
 
112
 
 
113
 
class TestUnicodeFilename(TestCase):
 
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))
 
104
 
 
105
 
 
106
class TestUnicodeFilename(tests.TestCase):
114
107
 
115
108
    def test_probe_passes(self):
116
109
        """UnicodeFilename._probe passes."""
119
112
        tests.UnicodeFilename._probe()
120
113
 
121
114
 
122
 
class TestTreeShape(TestCaseInTempDir):
 
115
class TestTreeShape(tests.TestCaseInTempDir):
123
116
 
124
117
    def test_unicode_paths(self):
125
118
        self.requireFeature(tests.UnicodeFilename)
129
122
        self.failUnlessExists(filename)
130
123
 
131
124
 
132
 
class TestTransportScenarios(TestCase):
 
125
class TestTransportScenarios(tests.TestCase):
133
126
    """A group of tests that test the transport implementation adaption core.
134
127
 
135
128
    This is a meta test that the tests are applied to all available
146
139
            def get_test_permutations(self):
147
140
                return sample_permutation
148
141
        sample_permutation = [(1,2), (3,4)]
149
 
        from bzrlib.tests.test_transport_implementations \
150
 
            import get_transport_test_permutations
 
142
        from bzrlib.tests.per_transport import get_transport_test_permutations
151
143
        self.assertEqual(sample_permutation,
152
144
                         get_transport_test_permutations(MockModule()))
153
145
 
154
 
    def test_scenarios_invlude_all_modules(self):
 
146
    def test_scenarios_include_all_modules(self):
155
147
        # this checks that the scenario generator returns as many permutations
156
148
        # as there are in all the registered transport modules - we assume if
157
149
        # this matches its probably doing the right thing especially in
158
150
        # combination with the tests for setting the right classes below.
159
 
        from bzrlib.tests.test_transport_implementations \
160
 
            import transport_test_permutations
 
151
        from bzrlib.tests.per_transport import transport_test_permutations
161
152
        from bzrlib.transport import _get_transport_modules
162
153
        modules = _get_transport_modules()
163
154
        permutation_count = 0
175
166
        # This test used to know about all the possible transports and the
176
167
        # order they were returned but that seems overly brittle (mbp
177
168
        # 20060307)
178
 
        from bzrlib.tests.test_transport_implementations \
179
 
            import transport_test_permutations
 
169
        from bzrlib.tests.per_transport import transport_test_permutations
180
170
        scenarios = transport_test_permutations()
181
171
        # there are at least that many builtin transports
182
172
        self.assertTrue(len(scenarios) > 6)
188
178
                                   bzrlib.transport.Server))
189
179
 
190
180
 
191
 
class TestBranchScenarios(TestCase):
 
181
class TestBranchScenarios(tests.TestCase):
192
182
 
193
183
    def test_scenarios(self):
194
184
        # check that constructor parameters are passed through to the adapted
195
185
        # test.
196
 
        from bzrlib.tests.branch_implementations import make_scenarios
 
186
        from bzrlib.tests.per_branch import make_scenarios
197
187
        server1 = "a"
198
188
        server2 = "b"
199
189
        formats = [("c", "C"), ("d", "D")]
213
203
            scenarios)
214
204
 
215
205
 
216
 
class TestBzrDirScenarios(TestCase):
 
206
class TestBzrDirScenarios(tests.TestCase):
217
207
 
218
208
    def test_scenarios(self):
219
209
        # check that constructor parameters are passed through to the adapted
220
210
        # test.
221
 
        from bzrlib.tests.bzrdir_implementations import make_scenarios
 
211
        from bzrlib.tests.per_controldir import make_scenarios
222
212
        vfs_factory = "v"
223
213
        server1 = "a"
224
214
        server2 = "b"
238
228
            scenarios)
239
229
 
240
230
 
241
 
class TestRepositoryScenarios(TestCase):
 
231
class TestRepositoryScenarios(tests.TestCase):
242
232
 
243
233
    def test_formats_to_scenarios(self):
244
234
        from bzrlib.tests.per_repository import formats_to_scenarios
245
235
        formats = [("(c)", remote.RemoteRepositoryFormat()),
246
236
                   ("(d)", repository.format_registry.get(
247
 
                        'Bazaar pack repository format 1 (needs bzr 0.92)\n'))]
 
237
                    'Bazaar repository format 2a (needs bzr 1.16 or later)\n'))]
248
238
        no_vfs_scenarios = formats_to_scenarios(formats, "server", "readonly",
249
239
            None)
250
240
        vfs_scenarios = formats_to_scenarios(formats, "server", "readonly",
251
241
            vfs_transport_factory="vfs")
252
242
        # no_vfs generate scenarios without vfs_transport_factory
253
 
        self.assertEqual([
 
243
        expected = [
254
244
            ('RemoteRepositoryFormat(c)',
255
245
             {'bzrdir_format': remote.RemoteBzrDirFormat(),
256
246
              'repository_format': remote.RemoteRepositoryFormat(),
257
247
              'transport_readonly_server': 'readonly',
258
248
              'transport_server': 'server'}),
259
 
            ('RepositoryFormatKnitPack1(d)',
 
249
            ('RepositoryFormat2a(d)',
260
250
             {'bzrdir_format': bzrdir.BzrDirMetaFormat1(),
261
 
              'repository_format': pack_repo.RepositoryFormatKnitPack1(),
 
251
              'repository_format': groupcompress_repo.RepositoryFormat2a(),
262
252
              'transport_readonly_server': 'readonly',
263
 
              'transport_server': 'server'})],
264
 
            no_vfs_scenarios)
 
253
              'transport_server': 'server'})]
 
254
        self.assertEqual(expected, no_vfs_scenarios)
265
255
        self.assertEqual([
266
256
            ('RemoteRepositoryFormat(c)',
267
257
             {'bzrdir_format': remote.RemoteBzrDirFormat(),
269
259
              'transport_readonly_server': 'readonly',
270
260
              'transport_server': 'server',
271
261
              'vfs_transport_factory': 'vfs'}),
272
 
            ('RepositoryFormatKnitPack1(d)',
 
262
            ('RepositoryFormat2a(d)',
273
263
             {'bzrdir_format': bzrdir.BzrDirMetaFormat1(),
274
 
              'repository_format': pack_repo.RepositoryFormatKnitPack1(),
 
264
              'repository_format': groupcompress_repo.RepositoryFormat2a(),
275
265
              'transport_readonly_server': 'readonly',
276
266
              'transport_server': 'server',
277
267
              'vfs_transport_factory': 'vfs'})],
278
268
            vfs_scenarios)
279
269
 
280
270
 
281
 
class TestTestScenarioApplication(TestCase):
 
271
class TestTestScenarioApplication(tests.TestCase):
282
272
    """Tests for the test adaption facilities."""
283
273
 
284
274
    def test_apply_scenario(self):
314
304
            adapted_test2.id())
315
305
 
316
306
 
317
 
class TestInterRepositoryScenarios(TestCase):
 
307
class TestInterRepositoryScenarios(tests.TestCase):
318
308
 
319
309
    def test_scenarios(self):
320
310
        # check that constructor parameters are passed through to the adapted
321
311
        # test.
322
 
        from bzrlib.tests.interrepository_implementations import \
323
 
            make_scenarios
 
312
        from bzrlib.tests.per_interrepository import make_scenarios
324
313
        server1 = "a"
325
314
        server2 = "b"
326
 
        formats = [(str, "C1", "C2"), (int, "D1", "D2")]
 
315
        formats = [("C0", "C1", "C2"), ("D0", "D1", "D2")]
327
316
        scenarios = make_scenarios(server1, server2, formats)
328
317
        self.assertEqual([
329
 
            ('str,str,str',
330
 
             {'interrepo_class': str,
331
 
              'repository_format': 'C1',
 
318
            ('C0,str,str',
 
319
             {'repository_format': 'C1',
332
320
              'repository_format_to': 'C2',
333
321
              'transport_readonly_server': 'b',
334
322
              'transport_server': 'a'}),
335
 
            ('int,str,str',
336
 
             {'interrepo_class': int,
337
 
              'repository_format': 'D1',
 
323
            ('D0,str,str',
 
324
             {'repository_format': 'D1',
338
325
              'repository_format_to': 'D2',
339
326
              'transport_readonly_server': 'b',
340
327
              'transport_server': 'a'})],
341
328
            scenarios)
342
329
 
343
330
 
344
 
class TestWorkingTreeScenarios(TestCase):
 
331
class TestWorkingTreeScenarios(tests.TestCase):
345
332
 
346
333
    def test_scenarios(self):
347
334
        # check that constructor parameters are passed through to the adapted
348
335
        # test.
349
 
        from bzrlib.tests.workingtree_implementations \
350
 
            import make_scenarios
 
336
        from bzrlib.tests.per_workingtree import make_scenarios
351
337
        server1 = "a"
352
338
        server2 = "b"
353
339
        formats = [workingtree.WorkingTreeFormat2(),
367
353
            scenarios)
368
354
 
369
355
 
370
 
class TestTreeScenarios(TestCase):
 
356
class TestTreeScenarios(tests.TestCase):
371
357
 
372
358
    def test_scenarios(self):
373
359
        # the tree implementation scenario generator is meant to setup one
377
363
        # workingtree_to_test_tree attribute set to 'return_parameter' and the
378
364
        # revision one set to revision_tree_from_workingtree.
379
365
 
380
 
        from bzrlib.tests.tree_implementations import (
 
366
        from bzrlib.tests.per_tree import (
381
367
            _dirstate_tree_from_workingtree,
382
368
            make_scenarios,
383
369
            preview_tree_pre,
446
432
        self.assertEqual(expected_scenarios, scenarios)
447
433
 
448
434
 
449
 
class TestInterTreeScenarios(TestCase):
 
435
class TestInterTreeScenarios(tests.TestCase):
450
436
    """A group of tests that test the InterTreeTestAdapter."""
451
437
 
452
438
    def test_scenarios(self):
459
445
        # unlike the TestProviderAdapter we dont want to automatically add a
460
446
        # parameterized one for WorkingTree - the optimisers will tell us what
461
447
        # ones to add.
462
 
        from bzrlib.tests.tree_implementations import (
 
448
        from bzrlib.tests.per_tree import (
463
449
            return_parameter,
464
450
            revision_tree_from_workingtree
465
451
            )
466
 
        from bzrlib.tests.intertree_implementations import (
 
452
        from bzrlib.tests.per_intertree import (
467
453
            make_scenarios,
468
454
            )
469
455
        from bzrlib.workingtree import WorkingTreeFormat2, WorkingTreeFormat3
502
488
        self.assertEqual(scenarios, expected_scenarios)
503
489
 
504
490
 
505
 
class TestTestCaseInTempDir(TestCaseInTempDir):
 
491
class TestTestCaseInTempDir(tests.TestCaseInTempDir):
506
492
 
507
493
    def test_home_is_not_working(self):
508
494
        self.assertNotEqual(self.test_dir, self.test_home_dir)
519
505
        self.assertEqualStat(real, fake)
520
506
 
521
507
    def test_assertEqualStat_notequal(self):
522
 
        self.build_tree(["foo", "bar"])
 
508
        self.build_tree(["foo", "longname"])
523
509
        self.assertRaises(AssertionError, self.assertEqualStat,
524
 
            os.lstat("foo"), os.lstat("bar"))
525
 
 
526
 
 
527
 
class TestTestCaseWithMemoryTransport(TestCaseWithMemoryTransport):
 
510
            os.lstat("foo"), os.lstat("longname"))
 
511
 
 
512
 
 
513
class TestTestCaseWithMemoryTransport(tests.TestCaseWithMemoryTransport):
528
514
 
529
515
    def test_home_is_non_existant_dir_under_root(self):
530
516
        """The test_home_dir for TestCaseWithMemoryTransport is missing.
545
531
        cwd = osutils.getcwd()
546
532
        self.assertIsSameRealPath(self.test_dir, cwd)
547
533
 
 
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
 
548
542
    def test_make_branch_and_memory_tree(self):
549
543
        """In TestCaseWithMemoryTransport we should not make the branch on disk.
550
544
 
606
600
                         self.get_transport().get_bytes(
607
601
                            'dir/.bzr/repository/format'))
608
602
 
609
 
    def test_safety_net(self):
610
 
        """No test should modify the safety .bzr directory.
611
 
 
612
 
        We just test that the _check_safety_net private method raises
613
 
        AssertionError, it's easier than building a test suite with the same
614
 
        test.
615
 
        """
616
 
        # Oops, a commit in the current directory (i.e. without local .bzr
617
 
        # directory) will crawl up the hierarchy to find a .bzr directory.
618
 
        self.run_bzr(['commit', '-mfoo', '--unchanged'])
619
 
        # But we have a safety net in place.
620
 
        self.assertRaises(AssertionError, self._check_safety_net)
621
 
 
622
 
 
623
 
class TestTestCaseWithTransport(TestCaseWithTransport):
 
603
    def test_dangling_locks_cause_failures(self):
 
604
        class TestDanglingLock(tests.TestCaseWithMemoryTransport):
 
605
            def test_function(self):
 
606
                t = self.get_transport('.')
 
607
                l = lockdir.LockDir(t, 'lock')
 
608
                l.create()
 
609
                l.attempt_lock()
 
610
        test = TestDanglingLock('test_function')
 
611
        result = test.run()
 
612
        total_failures = result.errors + result.failures
 
613
        if self._lock_check_thorough:
 
614
            self.assertLength(1, total_failures)
 
615
        else:
 
616
            # When _lock_check_thorough is disabled, then we don't trigger a
 
617
            # failure
 
618
            self.assertLength(0, total_failures)
 
619
 
 
620
 
 
621
class TestTestCaseWithTransport(tests.TestCaseWithTransport):
624
622
    """Tests for the convenience functions TestCaseWithTransport introduces."""
625
623
 
626
624
    def test_get_readonly_url_none(self):
627
 
        from bzrlib.transport import get_transport
628
 
        from bzrlib.transport.memory import MemoryServer
629
625
        from bzrlib.transport.readonly import ReadonlyTransportDecorator
630
 
        self.vfs_transport_factory = MemoryServer
 
626
        self.vfs_transport_factory = memory.MemoryServer
631
627
        self.transport_readonly_server = None
632
628
        # calling get_readonly_transport() constructs a decorator on the url
633
629
        # for the server
634
630
        url = self.get_readonly_url()
635
631
        url2 = self.get_readonly_url('foo/bar')
636
 
        t = get_transport(url)
637
 
        t2 = get_transport(url2)
 
632
        t = transport.get_transport(url)
 
633
        t2 = transport.get_transport(url2)
638
634
        self.failUnless(isinstance(t, ReadonlyTransportDecorator))
639
635
        self.failUnless(isinstance(t2, ReadonlyTransportDecorator))
640
636
        self.assertEqual(t2.base[:-1], t.abspath('foo/bar'))
641
637
 
642
638
    def test_get_readonly_url_http(self):
643
639
        from bzrlib.tests.http_server import HttpServer
644
 
        from bzrlib.transport import get_transport
645
 
        from bzrlib.transport.local import LocalURLServer
646
640
        from bzrlib.transport.http import HttpTransportBase
647
 
        self.transport_server = LocalURLServer
 
641
        self.transport_server = test_server.LocalURLServer
648
642
        self.transport_readonly_server = HttpServer
649
643
        # calling get_readonly_transport() gives us a HTTP server instance.
650
644
        url = self.get_readonly_url()
651
645
        url2 = self.get_readonly_url('foo/bar')
652
646
        # the transport returned may be any HttpTransportBase subclass
653
 
        t = get_transport(url)
654
 
        t2 = get_transport(url2)
 
647
        t = transport.get_transport(url)
 
648
        t2 = transport.get_transport(url2)
655
649
        self.failUnless(isinstance(t, HttpTransportBase))
656
650
        self.failUnless(isinstance(t2, HttpTransportBase))
657
651
        self.assertEqual(t2.base[:-1], t.abspath('foo/bar'))
677
671
        self.assertEqual((1, rev_id), a_branch.last_revision_info())
678
672
 
679
673
 
680
 
class TestTestCaseTransports(TestCaseWithTransport):
 
674
class TestTestCaseTransports(tests.TestCaseWithTransport):
681
675
 
682
676
    def setUp(self):
683
677
        super(TestTestCaseTransports, self).setUp()
684
 
        self.vfs_transport_factory = MemoryServer
 
678
        self.vfs_transport_factory = memory.MemoryServer
685
679
 
686
680
    def test_make_bzrdir_preserves_transport(self):
687
681
        t = self.get_transport()
688
682
        result_bzrdir = self.make_bzrdir('subdir')
689
683
        self.assertIsInstance(result_bzrdir.transport,
690
 
                              MemoryTransport)
 
684
                              memory.MemoryTransport)
691
685
        # should not be on disk, should only be in memory
692
686
        self.failIfExists('subdir')
693
687
 
694
688
 
695
 
class TestChrootedTest(ChrootedTestCase):
 
689
class TestChrootedTest(tests.ChrootedTestCase):
696
690
 
697
691
    def test_root_is_root(self):
698
 
        from bzrlib.transport import get_transport
699
 
        t = get_transport(self.get_readonly_url())
 
692
        t = transport.get_transport(self.get_readonly_url())
700
693
        url = t.base
701
694
        self.assertEqual(url, t.clone('..').base)
702
695
 
703
696
 
704
 
class MockProgress(_BaseProgressBar):
705
 
    """Progress-bar standin that records calls.
706
 
 
707
 
    Useful for testing pb using code.
708
 
    """
709
 
 
710
 
    def __init__(self):
711
 
        _BaseProgressBar.__init__(self)
712
 
        self.calls = []
713
 
 
714
 
    def tick(self):
715
 
        self.calls.append(('tick',))
716
 
 
717
 
    def update(self, msg=None, current=None, total=None):
718
 
        self.calls.append(('update', msg, current, total))
719
 
 
720
 
    def clear(self):
721
 
        self.calls.append(('clear',))
722
 
 
723
 
    def note(self, msg, *args):
724
 
        self.calls.append(('note', msg, args))
725
 
 
726
 
 
727
 
class TestTestResult(TestCase):
 
697
class TestProfileResult(tests.TestCase):
 
698
 
 
699
    def test_profiles_tests(self):
 
700
        self.requireFeature(test_lsprof.LSProfFeature)
 
701
        terminal = testtools.tests.helpers.ExtendedTestResult()
 
702
        result = tests.ProfileResult(terminal)
 
703
        class Sample(tests.TestCase):
 
704
            def a(self):
 
705
                self.sample_function()
 
706
            def sample_function(self):
 
707
                pass
 
708
        test = Sample("a")
 
709
        test.run(result)
 
710
        case = terminal._events[0][1]
 
711
        self.assertLength(1, case._benchcalls)
 
712
        # We must be able to unpack it as the test reporting code wants
 
713
        (_, _, _), stats = case._benchcalls[0]
 
714
        self.assertTrue(callable(stats.pprint))
 
715
 
 
716
 
 
717
class TestTestResult(tests.TestCase):
728
718
 
729
719
    def check_timing(self, test_case, expected_re):
730
720
        result = bzrlib.tests.TextTestResult(self._log_file,
731
721
                descriptions=0,
732
722
                verbosity=1,
733
723
                )
734
 
        test_case.run(result)
735
 
        timed_string = result._testTimeString(test_case)
 
724
        capture = testtools.tests.helpers.ExtendedTestResult()
 
725
        test_case.run(MultiTestResult(result, capture))
 
726
        run_case = capture._events[0][1]
 
727
        timed_string = result._testTimeString(run_case)
736
728
        self.assertContainsRe(timed_string, expected_re)
737
729
 
738
730
    def test_test_reporting(self):
739
 
        class ShortDelayTestCase(TestCase):
 
731
        class ShortDelayTestCase(tests.TestCase):
740
732
            def test_short_delay(self):
741
733
                time.sleep(0.003)
742
734
            def test_short_benchmark(self):
743
735
                self.time(time.sleep, 0.003)
744
736
        self.check_timing(ShortDelayTestCase('test_short_delay'),
745
737
                          r"^ +[0-9]+ms$")
746
 
        # if a benchmark time is given, we want a x of y style result.
 
738
        # if a benchmark time is given, we now show just that time followed by
 
739
        # a star
747
740
        self.check_timing(ShortDelayTestCase('test_short_benchmark'),
748
 
                          r"^ +[0-9]+ms/ +[0-9]+ms$")
 
741
                          r"^ +[0-9]+ms\*$")
749
742
 
750
743
    def test_unittest_reporting_unittest_class(self):
751
744
        # getting the time from a non-bzrlib test works ok
755
748
        self.check_timing(ShortDelayTestCase('test_short_delay'),
756
749
                          r"^ +[0-9]+ms$")
757
750
 
 
751
    def _patch_get_bzr_source_tree(self):
 
752
        # Reading from the actual source tree breaks isolation, but we don't
 
753
        # want to assume that thats *all* that would happen.
 
754
        self.overrideAttr(bzrlib.version, '_get_bzr_source_tree', lambda: None)
 
755
 
758
756
    def test_assigned_benchmark_file_stores_date(self):
 
757
        self._patch_get_bzr_source_tree()
759
758
        output = StringIO()
760
759
        result = bzrlib.tests.TextTestResult(self._log_file,
761
760
                                        descriptions=0,
769
768
        self.assertContainsRe(output_string, "--date [0-9.]+")
770
769
 
771
770
    def test_benchhistory_records_test_times(self):
 
771
        self._patch_get_bzr_source_tree()
772
772
        result_stream = StringIO()
773
773
        result = bzrlib.tests.TextTestResult(
774
774
            self._log_file,
801
801
        self.requireFeature(test_lsprof.LSProfFeature)
802
802
        result_stream = StringIO()
803
803
        result = bzrlib.tests.VerboseTestResult(
804
 
            unittest._WritelnDecorator(result_stream),
 
804
            result_stream,
805
805
            descriptions=0,
806
806
            verbosity=2,
807
807
            )
835
835
 
836
836
    def test_known_failure(self):
837
837
        """A KnownFailure being raised should trigger several result actions."""
838
 
        class InstrumentedTestResult(ExtendedTestResult):
839
 
 
 
838
        class InstrumentedTestResult(tests.ExtendedTestResult):
 
839
            def stopTestRun(self): pass
 
840
            def startTests(self): pass
840
841
            def report_test_start(self, test): pass
841
 
            def report_known_failure(self, test, err):
842
 
                self._call = test, err
 
842
            def report_known_failure(self, test, err=None, details=None):
 
843
                self._call = test, 'known failure'
843
844
        result = InstrumentedTestResult(None, None, None, None)
844
 
        def test_function():
845
 
            raise KnownFailure('failed!')
846
 
        test = unittest.FunctionTestCase(test_function)
 
845
        class Test(tests.TestCase):
 
846
            def test_function(self):
 
847
                raise tests.KnownFailure('failed!')
 
848
        test = Test("test_function")
847
849
        test.run(result)
848
850
        # it should invoke 'report_known_failure'.
849
851
        self.assertEqual(2, len(result._call))
850
 
        self.assertEqual(test, result._call[0])
851
 
        self.assertEqual(KnownFailure, result._call[1][0])
852
 
        self.assertIsInstance(result._call[1][1], KnownFailure)
 
852
        self.assertEqual(test.id(), result._call[0].id())
 
853
        self.assertEqual('known failure', result._call[1])
853
854
        # we dont introspec the traceback, if the rest is ok, it would be
854
855
        # exceptional for it not to be.
855
856
        # it should update the known_failure_count on the object.
861
862
        # verbose test output formatting
862
863
        result_stream = StringIO()
863
864
        result = bzrlib.tests.VerboseTestResult(
864
 
            unittest._WritelnDecorator(result_stream),
 
865
            result_stream,
865
866
            descriptions=0,
866
867
            verbosity=2,
867
868
            )
872
873
        # (class, exception object, traceback)
873
874
        # KnownFailures dont get their tracebacks shown though, so we
874
875
        # can skip that.
875
 
        err = (KnownFailure, KnownFailure('foo'), None)
 
876
        err = (tests.KnownFailure, tests.KnownFailure('foo'), None)
876
877
        result.report_known_failure(test, err)
877
878
        output = result_stream.getvalue()[prefix:]
878
879
        lines = output.splitlines()
879
880
        self.assertContainsRe(lines[0], r'XFAIL *\d+ms$')
 
881
        if sys.version_info > (2, 7):
 
882
            self.expectFailure("_ExpectedFailure on 2.7 loses the message",
 
883
                self.assertNotEqual, lines[1], '    ')
880
884
        self.assertEqual(lines[1], '    foo')
881
885
        self.assertEqual(2, len(lines))
882
886
 
883
 
    def test_text_report_known_failure(self):
884
 
        # text test output formatting
885
 
        pb = MockProgress()
886
 
        result = bzrlib.tests.TextTestResult(
887
 
            None,
888
 
            descriptions=0,
889
 
            verbosity=1,
890
 
            pb=pb,
891
 
            )
892
 
        test = self.get_passing_test()
893
 
        # this seeds the state to handle reporting the test.
894
 
        result.startTest(test)
895
 
        # the err parameter has the shape:
896
 
        # (class, exception object, traceback)
897
 
        # KnownFailures dont get their tracebacks shown though, so we
898
 
        # can skip that.
899
 
        err = (KnownFailure, KnownFailure('foo'), None)
900
 
        result.report_known_failure(test, err)
901
 
        self.assertEqual(
902
 
            [
903
 
            ('update', '[1 in 0s] passing_test', None, None),
904
 
            ('note', 'XFAIL: %s\n%s\n', ('passing_test', err[1]))
905
 
            ],
906
 
            pb.calls)
907
 
        # known_failures should be printed in the summary, so if we run a test
908
 
        # after there are some known failures, the update prefix should match
909
 
        # this.
910
 
        result.known_failure_count = 3
911
 
        test.run(result)
912
 
        self.assertEqual(
913
 
            [
914
 
            ('update', '[2 in 0s] passing_test', None, None),
915
 
            ],
916
 
            pb.calls[2:])
917
 
 
918
887
    def get_passing_test(self):
919
888
        """Return a test object that can't be run usefully."""
920
889
        def passing_test():
923
892
 
924
893
    def test_add_not_supported(self):
925
894
        """Test the behaviour of invoking addNotSupported."""
926
 
        class InstrumentedTestResult(ExtendedTestResult):
 
895
        class InstrumentedTestResult(tests.ExtendedTestResult):
 
896
            def stopTestRun(self): pass
 
897
            def startTests(self): pass
927
898
            def report_test_start(self, test): pass
928
899
            def report_unsupported(self, test, feature):
929
900
                self._call = test, feature
930
901
        result = InstrumentedTestResult(None, None, None, None)
931
902
        test = SampleTestCase('_test_pass')
932
 
        feature = Feature()
 
903
        feature = tests.Feature()
933
904
        result.startTest(test)
934
905
        result.addNotSupported(test, feature)
935
906
        # it should invoke 'report_unsupported'.
949
920
        # verbose test output formatting
950
921
        result_stream = StringIO()
951
922
        result = bzrlib.tests.VerboseTestResult(
952
 
            unittest._WritelnDecorator(result_stream),
 
923
            result_stream,
953
924
            descriptions=0,
954
925
            verbosity=2,
955
926
            )
956
927
        test = self.get_passing_test()
957
 
        feature = Feature()
 
928
        feature = tests.Feature()
958
929
        result.startTest(test)
959
930
        prefix = len(result_stream.getvalue())
960
931
        result.report_unsupported(test, feature)
961
932
        output = result_stream.getvalue()[prefix:]
962
933
        lines = output.splitlines()
963
 
        self.assertEqual(lines, ['NODEP                   0ms', "    The feature 'Feature' is not available."])
964
 
 
965
 
    def test_text_report_unsupported(self):
966
 
        # text test output formatting
967
 
        pb = MockProgress()
968
 
        result = bzrlib.tests.TextTestResult(
969
 
            None,
970
 
            descriptions=0,
971
 
            verbosity=1,
972
 
            pb=pb,
973
 
            )
974
 
        test = self.get_passing_test()
975
 
        feature = Feature()
976
 
        # this seeds the state to handle reporting the test.
977
 
        result.startTest(test)
978
 
        result.report_unsupported(test, feature)
979
 
        # no output on unsupported features
980
 
        self.assertEqual(
981
 
            [('update', '[1 in 0s] passing_test', None, None)
982
 
            ],
983
 
            pb.calls)
984
 
        # the number of missing features should be printed in the progress
985
 
        # summary, so check for that.
986
 
        result.unsupported = {'foo':0, 'bar':0}
987
 
        test.run(result)
988
 
        self.assertEqual(
989
 
            [
990
 
            ('update', '[2 in 0s, 2 missing] passing_test', None, None),
991
 
            ],
992
 
            pb.calls[1:])
 
934
        # We don't check for the final '0ms' since it may fail on slow hosts
 
935
        self.assertStartsWith(lines[0], 'NODEP')
 
936
        self.assertEqual(lines[1],
 
937
                         "    The feature 'Feature' is not available.")
993
938
 
994
939
    def test_unavailable_exception(self):
995
940
        """An UnavailableFeature being raised should invoke addNotSupported."""
996
 
        class InstrumentedTestResult(ExtendedTestResult):
997
 
 
 
941
        class InstrumentedTestResult(tests.ExtendedTestResult):
 
942
            def stopTestRun(self): pass
 
943
            def startTests(self): pass
998
944
            def report_test_start(self, test): pass
999
945
            def addNotSupported(self, test, feature):
1000
946
                self._call = test, feature
1001
947
        result = InstrumentedTestResult(None, None, None, None)
1002
 
        feature = Feature()
1003
 
        def test_function():
1004
 
            raise UnavailableFeature(feature)
1005
 
        test = unittest.FunctionTestCase(test_function)
 
948
        feature = tests.Feature()
 
949
        class Test(tests.TestCase):
 
950
            def test_function(self):
 
951
                raise tests.UnavailableFeature(feature)
 
952
        test = Test("test_function")
1006
953
        test.run(result)
1007
954
        # it should invoke 'addNotSupported'.
1008
955
        self.assertEqual(2, len(result._call))
1009
 
        self.assertEqual(test, result._call[0])
 
956
        self.assertEqual(test.id(), result._call[0].id())
1010
957
        self.assertEqual(feature, result._call[1])
1011
958
        # and not count as an error
1012
959
        self.assertEqual(0, result.error_count)
1024
971
        result = bzrlib.tests.TextTestResult(self._log_file, descriptions=0,
1025
972
                                             verbosity=1)
1026
973
        test = self.get_passing_test()
1027
 
        err = (KnownFailure, KnownFailure('foo'), None)
1028
 
        result._addKnownFailure(test, err)
 
974
        err = (tests.KnownFailure, tests.KnownFailure('foo'), None)
 
975
        result.addExpectedFailure(test, err)
1029
976
        self.assertFalse(result.wasStrictlySuccessful())
1030
977
        self.assertEqual(None, result._extractBenchmarkTime(test))
1031
978
 
1037
984
        self.assertTrue(result.wasStrictlySuccessful())
1038
985
        self.assertEqual(None, result._extractBenchmarkTime(test))
1039
986
 
1040
 
 
1041
 
class TestUnicodeFilenameFeature(TestCase):
 
987
    def test_startTests(self):
 
988
        """Starting the first test should trigger startTests."""
 
989
        class InstrumentedTestResult(tests.ExtendedTestResult):
 
990
            calls = 0
 
991
            def startTests(self): self.calls += 1
 
992
            def report_test_start(self, test): pass
 
993
        result = InstrumentedTestResult(None, None, None, None)
 
994
        def test_function():
 
995
            pass
 
996
        test = unittest.FunctionTestCase(test_function)
 
997
        test.run(result)
 
998
        self.assertEquals(1, result.calls)
 
999
 
 
1000
 
 
1001
class TestUnicodeFilenameFeature(tests.TestCase):
1042
1002
 
1043
1003
    def test_probe_passes(self):
1044
1004
        """UnicodeFilenameFeature._probe passes."""
1047
1007
        tests.UnicodeFilenameFeature._probe()
1048
1008
 
1049
1009
 
1050
 
class TestRunner(TestCase):
 
1010
class TestRunner(tests.TestCase):
1051
1011
 
1052
1012
    def dummy_test(self):
1053
1013
        pass
1058
1018
        This current saves and restores:
1059
1019
        TestCaseInTempDir.TEST_ROOT
1060
1020
 
1061
 
        There should be no tests in this file that use bzrlib.tests.TextTestRunner
1062
 
        without using this convenience method, because of our use of global state.
 
1021
        There should be no tests in this file that use
 
1022
        bzrlib.tests.TextTestRunner without using this convenience method,
 
1023
        because of our use of global state.
1063
1024
        """
1064
 
        old_root = TestCaseInTempDir.TEST_ROOT
 
1025
        old_root = tests.TestCaseInTempDir.TEST_ROOT
 
1026
        old_leak = tests.TestCase._first_thread_leaker_id
1065
1027
        try:
1066
 
            TestCaseInTempDir.TEST_ROOT = None
 
1028
            tests.TestCaseInTempDir.TEST_ROOT = None
 
1029
            tests.TestCase._first_thread_leaker_id = None
1067
1030
            return testrunner.run(test)
1068
1031
        finally:
1069
 
            TestCaseInTempDir.TEST_ROOT = old_root
 
1032
            tests.TestCaseInTempDir.TEST_ROOT = old_root
 
1033
            tests.TestCase._first_thread_leaker_id = old_leak
1070
1034
 
1071
1035
    def test_known_failure_failed_run(self):
1072
1036
        # run a test that generates a known failure which should be printed in
1073
1037
        # the final output when real failures occur.
1074
 
        def known_failure_test():
1075
 
            raise KnownFailure('failed')
 
1038
        class Test(tests.TestCase):
 
1039
            def known_failure_test(self):
 
1040
                self.expectFailure('failed', self.assertTrue, False)
1076
1041
        test = unittest.TestSuite()
1077
 
        test.addTest(unittest.FunctionTestCase(known_failure_test))
 
1042
        test.addTest(Test("known_failure_test"))
1078
1043
        def failing_test():
1079
 
            raise AssertionError('foo')
 
1044
            self.fail('foo')
1080
1045
        test.addTest(unittest.FunctionTestCase(failing_test))
1081
1046
        stream = StringIO()
1082
 
        runner = TextTestRunner(stream=stream)
 
1047
        runner = tests.TextTestRunner(stream=stream)
1083
1048
        result = self.run_test_runner(runner, test)
1084
1049
        lines = stream.getvalue().splitlines()
1085
 
        self.assertEqual([
1086
 
            '',
1087
 
            '======================================================================',
1088
 
            'FAIL: unittest.FunctionTestCase (failing_test)',
1089
 
            '----------------------------------------------------------------------',
1090
 
            'Traceback (most recent call last):',
1091
 
            '    raise AssertionError(\'foo\')',
1092
 
            'AssertionError: foo',
1093
 
            '',
1094
 
            '----------------------------------------------------------------------',
1095
 
            '',
1096
 
            'FAILED (failures=1, known_failure_count=1)'],
1097
 
            lines[0:5] + lines[6:10] + lines[11:])
 
1050
        self.assertContainsRe(stream.getvalue(),
 
1051
            '(?sm)^bzr selftest.*$'
 
1052
            '.*'
 
1053
            '^======================================================================\n'
 
1054
            '^FAIL: failing_test\n'
 
1055
            '^----------------------------------------------------------------------\n'
 
1056
            'Traceback \\(most recent call last\\):\n'
 
1057
            '  .*' # File .*, line .*, in failing_test' - but maybe not from .pyc
 
1058
            '    self.fail\\(\'foo\'\\)\n'
 
1059
            '.*'
 
1060
            '^----------------------------------------------------------------------\n'
 
1061
            '.*'
 
1062
            'FAILED \\(failures=1, known_failure_count=1\\)'
 
1063
            )
1098
1064
 
1099
1065
    def test_known_failure_ok_run(self):
1100
 
        # run a test that generates a known failure which should be printed in the final output.
1101
 
        def known_failure_test():
1102
 
            raise KnownFailure('failed')
1103
 
        test = unittest.FunctionTestCase(known_failure_test)
 
1066
        # run a test that generates a known failure which should be printed in
 
1067
        # the final output.
 
1068
        class Test(tests.TestCase):
 
1069
            def known_failure_test(self):
 
1070
                self.expectFailure('failed', self.assertTrue, False)
 
1071
        test = Test("known_failure_test")
1104
1072
        stream = StringIO()
1105
 
        runner = TextTestRunner(stream=stream)
 
1073
        runner = tests.TextTestRunner(stream=stream)
1106
1074
        result = self.run_test_runner(runner, test)
1107
1075
        self.assertContainsRe(stream.getvalue(),
1108
1076
            '\n'
1111
1079
            '\n'
1112
1080
            'OK \\(known_failures=1\\)\n')
1113
1081
 
 
1082
    def test_result_decorator(self):
 
1083
        # decorate results
 
1084
        calls = []
 
1085
        class LoggingDecorator(tests.ForwardingResult):
 
1086
            def startTest(self, test):
 
1087
                tests.ForwardingResult.startTest(self, test)
 
1088
                calls.append('start')
 
1089
        test = unittest.FunctionTestCase(lambda:None)
 
1090
        stream = StringIO()
 
1091
        runner = tests.TextTestRunner(stream=stream,
 
1092
            result_decorators=[LoggingDecorator])
 
1093
        result = self.run_test_runner(runner, test)
 
1094
        self.assertLength(1, calls)
 
1095
 
1114
1096
    def test_skipped_test(self):
1115
1097
        # run a test that is skipped, and check the suite as a whole still
1116
1098
        # succeeds.
1117
1099
        # skipping_test must be hidden in here so it's not run as a real test
1118
 
        class SkippingTest(TestCase):
 
1100
        class SkippingTest(tests.TestCase):
1119
1101
            def skipping_test(self):
1120
 
                raise TestSkipped('test intentionally skipped')
1121
 
        runner = TextTestRunner(stream=self._log_file)
 
1102
                raise tests.TestSkipped('test intentionally skipped')
 
1103
        runner = tests.TextTestRunner(stream=self._log_file)
1122
1104
        test = SkippingTest("skipping_test")
1123
1105
        result = self.run_test_runner(runner, test)
1124
1106
        self.assertTrue(result.wasSuccessful())
1125
1107
 
1126
1108
    def test_skipped_from_setup(self):
1127
1109
        calls = []
1128
 
        class SkippedSetupTest(TestCase):
 
1110
        class SkippedSetupTest(tests.TestCase):
1129
1111
 
1130
1112
            def setUp(self):
1131
1113
                calls.append('setUp')
1132
1114
                self.addCleanup(self.cleanup)
1133
 
                raise TestSkipped('skipped setup')
 
1115
                raise tests.TestSkipped('skipped setup')
1134
1116
 
1135
1117
            def test_skip(self):
1136
1118
                self.fail('test reached')
1138
1120
            def cleanup(self):
1139
1121
                calls.append('cleanup')
1140
1122
 
1141
 
        runner = TextTestRunner(stream=self._log_file)
 
1123
        runner = tests.TextTestRunner(stream=self._log_file)
1142
1124
        test = SkippedSetupTest('test_skip')
1143
1125
        result = self.run_test_runner(runner, test)
1144
1126
        self.assertTrue(result.wasSuccessful())
1147
1129
 
1148
1130
    def test_skipped_from_test(self):
1149
1131
        calls = []
1150
 
        class SkippedTest(TestCase):
 
1132
        class SkippedTest(tests.TestCase):
1151
1133
 
1152
1134
            def setUp(self):
1153
 
                TestCase.setUp(self)
 
1135
                tests.TestCase.setUp(self)
1154
1136
                calls.append('setUp')
1155
1137
                self.addCleanup(self.cleanup)
1156
1138
 
1157
1139
            def test_skip(self):
1158
 
                raise TestSkipped('skipped test')
 
1140
                raise tests.TestSkipped('skipped test')
1159
1141
 
1160
1142
            def cleanup(self):
1161
1143
                calls.append('cleanup')
1162
1144
 
1163
 
        runner = TextTestRunner(stream=self._log_file)
 
1145
        runner = tests.TextTestRunner(stream=self._log_file)
1164
1146
        test = SkippedTest('test_skip')
1165
1147
        result = self.run_test_runner(runner, test)
1166
1148
        self.assertTrue(result.wasSuccessful())
1169
1151
 
1170
1152
    def test_not_applicable(self):
1171
1153
        # run a test that is skipped because it's not applicable
1172
 
        def not_applicable_test():
1173
 
            from bzrlib.tests import TestNotApplicable
1174
 
            raise TestNotApplicable('this test never runs')
 
1154
        class Test(tests.TestCase):
 
1155
            def not_applicable_test(self):
 
1156
                raise tests.TestNotApplicable('this test never runs')
1175
1157
        out = StringIO()
1176
 
        runner = TextTestRunner(stream=out, verbosity=2)
1177
 
        test = unittest.FunctionTestCase(not_applicable_test)
 
1158
        runner = tests.TextTestRunner(stream=out, verbosity=2)
 
1159
        test = Test("not_applicable_test")
1178
1160
        result = self.run_test_runner(runner, test)
1179
1161
        self._log_file.write(out.getvalue())
1180
1162
        self.assertTrue(result.wasSuccessful())
1184
1166
        self.assertContainsRe(out.getvalue(),
1185
1167
                r'(?m)^    this test never runs')
1186
1168
 
1187
 
    def test_not_applicable_demo(self):
1188
 
        # just so you can see it in the test output
1189
 
        raise TestNotApplicable('this test is just a demonstation')
1190
 
 
1191
1169
    def test_unsupported_features_listed(self):
1192
1170
        """When unsupported features are encountered they are detailed."""
1193
 
        class Feature1(Feature):
 
1171
        class Feature1(tests.Feature):
1194
1172
            def _probe(self): return False
1195
 
        class Feature2(Feature):
 
1173
        class Feature2(tests.Feature):
1196
1174
            def _probe(self): return False
1197
1175
        # create sample tests
1198
1176
        test1 = SampleTestCase('_test_pass')
1203
1181
        test.addTest(test1)
1204
1182
        test.addTest(test2)
1205
1183
        stream = StringIO()
1206
 
        runner = TextTestRunner(stream=stream)
 
1184
        runner = tests.TextTestRunner(stream=stream)
1207
1185
        result = self.run_test_runner(runner, test)
1208
1186
        lines = stream.getvalue().splitlines()
1209
1187
        self.assertEqual([
1213
1191
            ],
1214
1192
            lines[-3:])
1215
1193
 
 
1194
    def _patch_get_bzr_source_tree(self):
 
1195
        # Reading from the actual source tree breaks isolation, but we don't
 
1196
        # want to assume that thats *all* that would happen.
 
1197
        self._get_source_tree_calls = []
 
1198
        def new_get():
 
1199
            self._get_source_tree_calls.append("called")
 
1200
            return None
 
1201
        self.overrideAttr(bzrlib.version, '_get_bzr_source_tree',  new_get)
 
1202
 
1216
1203
    def test_bench_history(self):
1217
 
        # tests that the running the benchmark produces a history file
1218
 
        # containing a timestamp and the revision id of the bzrlib source which
1219
 
        # was tested.
1220
 
        workingtree = _get_bzr_source_tree()
 
1204
        # tests that the running the benchmark passes bench_history into
 
1205
        # the test result object. We can tell that happens if
 
1206
        # _get_bzr_source_tree is called.
 
1207
        self._patch_get_bzr_source_tree()
1221
1208
        test = TestRunner('dummy_test')
1222
1209
        output = StringIO()
1223
 
        runner = TextTestRunner(stream=self._log_file, bench_history=output)
 
1210
        runner = tests.TextTestRunner(stream=self._log_file,
 
1211
                                      bench_history=output)
1224
1212
        result = self.run_test_runner(runner, test)
1225
1213
        output_string = output.getvalue()
1226
1214
        self.assertContainsRe(output_string, "--date [0-9.]+")
1227
 
        if workingtree is not None:
1228
 
            revision_id = workingtree.get_parent_ids()[0]
1229
 
            self.assertEndsWith(output_string.rstrip(), revision_id)
1230
 
 
1231
 
    def assertLogDeleted(self, test):
1232
 
        log = test._get_log()
1233
 
        self.assertEqual("DELETED log file to reduce memory footprint", log)
1234
 
        self.assertEqual('', test._log_contents)
1235
 
        self.assertIs(None, test._log_file_name)
1236
 
 
1237
 
    def test_success_log_deleted(self):
1238
 
        """Successful tests have their log deleted"""
1239
 
 
1240
 
        class LogTester(TestCase):
1241
 
 
1242
 
            def test_success(self):
1243
 
                self.log('this will be removed\n')
1244
 
 
1245
 
        sio = cStringIO.StringIO()
1246
 
        runner = TextTestRunner(stream=sio)
1247
 
        test = LogTester('test_success')
1248
 
        result = self.run_test_runner(runner, test)
1249
 
 
1250
 
        self.assertLogDeleted(test)
1251
 
 
1252
 
    def test_skipped_log_deleted(self):
1253
 
        """Skipped tests have their log deleted"""
1254
 
 
1255
 
        class LogTester(TestCase):
1256
 
 
1257
 
            def test_skipped(self):
1258
 
                self.log('this will be removed\n')
1259
 
                raise tests.TestSkipped()
1260
 
 
1261
 
        sio = cStringIO.StringIO()
1262
 
        runner = TextTestRunner(stream=sio)
1263
 
        test = LogTester('test_skipped')
1264
 
        result = self.run_test_runner(runner, test)
1265
 
 
1266
 
        self.assertLogDeleted(test)
1267
 
 
1268
 
    def test_not_aplicable_log_deleted(self):
1269
 
        """Not applicable tests have their log deleted"""
1270
 
 
1271
 
        class LogTester(TestCase):
1272
 
 
1273
 
            def test_not_applicable(self):
1274
 
                self.log('this will be removed\n')
1275
 
                raise tests.TestNotApplicable()
1276
 
 
1277
 
        sio = cStringIO.StringIO()
1278
 
        runner = TextTestRunner(stream=sio)
1279
 
        test = LogTester('test_not_applicable')
1280
 
        result = self.run_test_runner(runner, test)
1281
 
 
1282
 
        self.assertLogDeleted(test)
1283
 
 
1284
 
    def test_known_failure_log_deleted(self):
1285
 
        """Know failure tests have their log deleted"""
1286
 
 
1287
 
        class LogTester(TestCase):
1288
 
 
1289
 
            def test_known_failure(self):
1290
 
                self.log('this will be removed\n')
1291
 
                raise tests.KnownFailure()
1292
 
 
1293
 
        sio = cStringIO.StringIO()
1294
 
        runner = TextTestRunner(stream=sio)
1295
 
        test = LogTester('test_known_failure')
1296
 
        result = self.run_test_runner(runner, test)
1297
 
 
1298
 
        self.assertLogDeleted(test)
1299
 
 
1300
 
    def test_fail_log_kept(self):
1301
 
        """Failed tests have their log kept"""
1302
 
 
1303
 
        class LogTester(TestCase):
1304
 
 
1305
 
            def test_fail(self):
1306
 
                self.log('this will be kept\n')
1307
 
                self.fail('this test fails')
1308
 
 
1309
 
        sio = cStringIO.StringIO()
1310
 
        runner = TextTestRunner(stream=sio)
1311
 
        test = LogTester('test_fail')
1312
 
        result = self.run_test_runner(runner, test)
1313
 
 
1314
 
        text = sio.getvalue()
1315
 
        self.assertContainsRe(text, 'this will be kept')
1316
 
        self.assertContainsRe(text, 'this test fails')
1317
 
 
1318
 
        log = test._get_log()
1319
 
        self.assertContainsRe(log, 'this will be kept')
1320
 
        self.assertEqual(log, test._log_contents)
1321
 
 
1322
 
    def test_error_log_kept(self):
1323
 
        """Tests with errors have their log kept"""
1324
 
 
1325
 
        class LogTester(TestCase):
1326
 
 
1327
 
            def test_error(self):
1328
 
                self.log('this will be kept\n')
1329
 
                raise ValueError('random exception raised')
1330
 
 
1331
 
        sio = cStringIO.StringIO()
1332
 
        runner = TextTestRunner(stream=sio)
1333
 
        test = LogTester('test_error')
1334
 
        result = self.run_test_runner(runner, test)
1335
 
 
1336
 
        text = sio.getvalue()
1337
 
        self.assertContainsRe(text, 'this will be kept')
1338
 
        self.assertContainsRe(text, 'random exception raised')
1339
 
 
1340
 
        log = test._get_log()
1341
 
        self.assertContainsRe(log, 'this will be kept')
1342
 
        self.assertEqual(log, test._log_contents)
1343
 
 
1344
 
 
1345
 
class SampleTestCase(TestCase):
 
1215
        self.assertLength(1, self._get_source_tree_calls)
 
1216
 
 
1217
    def test_startTestRun(self):
 
1218
        """run should call result.startTestRun()"""
 
1219
        calls = []
 
1220
        class LoggingDecorator(tests.ForwardingResult):
 
1221
            def startTestRun(self):
 
1222
                tests.ForwardingResult.startTestRun(self)
 
1223
                calls.append('startTestRun')
 
1224
        test = unittest.FunctionTestCase(lambda:None)
 
1225
        stream = StringIO()
 
1226
        runner = tests.TextTestRunner(stream=stream,
 
1227
            result_decorators=[LoggingDecorator])
 
1228
        result = self.run_test_runner(runner, test)
 
1229
        self.assertLength(1, calls)
 
1230
 
 
1231
    def test_stopTestRun(self):
 
1232
        """run should call result.stopTestRun()"""
 
1233
        calls = []
 
1234
        class LoggingDecorator(tests.ForwardingResult):
 
1235
            def stopTestRun(self):
 
1236
                tests.ForwardingResult.stopTestRun(self)
 
1237
                calls.append('stopTestRun')
 
1238
        test = unittest.FunctionTestCase(lambda:None)
 
1239
        stream = StringIO()
 
1240
        runner = tests.TextTestRunner(stream=stream,
 
1241
            result_decorators=[LoggingDecorator])
 
1242
        result = self.run_test_runner(runner, test)
 
1243
        self.assertLength(1, calls)
 
1244
 
 
1245
 
 
1246
class SampleTestCase(tests.TestCase):
1346
1247
 
1347
1248
    def _test_pass(self):
1348
1249
        pass
1350
1251
class _TestException(Exception):
1351
1252
    pass
1352
1253
 
1353
 
class TestTestCase(TestCase):
 
1254
 
 
1255
class TestTestCase(tests.TestCase):
1354
1256
    """Tests that test the core bzrlib TestCase."""
1355
1257
 
1356
1258
    def test_assertLength_matches_empty(self):
1373
1275
            exception.args[0])
1374
1276
 
1375
1277
    def test_base_setUp_not_called_causes_failure(self):
1376
 
        class TestCaseWithBrokenSetUp(TestCase):
 
1278
        class TestCaseWithBrokenSetUp(tests.TestCase):
1377
1279
            def setUp(self):
1378
1280
                pass # does not call TestCase.setUp
1379
1281
            def test_foo(self):
1385
1287
        self.assertEqual(1, result.testsRun)
1386
1288
 
1387
1289
    def test_base_tearDown_not_called_causes_failure(self):
1388
 
        class TestCaseWithBrokenTearDown(TestCase):
 
1290
        class TestCaseWithBrokenTearDown(tests.TestCase):
1389
1291
            def tearDown(self):
1390
1292
                pass # does not call TestCase.tearDown
1391
1293
            def test_foo(self):
1399
1301
    def test_debug_flags_sanitised(self):
1400
1302
        """The bzrlib debug flags should be sanitised by setUp."""
1401
1303
        if 'allow_debug' in tests.selftest_debug_flags:
1402
 
            raise TestNotApplicable(
 
1304
            raise tests.TestNotApplicable(
1403
1305
                '-Eallow_debug option prevents debug flag sanitisation')
1404
1306
        # we could set something and run a test that will check
1405
1307
        # it gets santised, but this is probably sufficient for now:
1406
1308
        # if someone runs the test with -Dsomething it will error.
1407
 
        self.assertEqual(set(), bzrlib.debug.debug_flags)
 
1309
        flags = set()
 
1310
        if self._lock_check_thorough:
 
1311
            flags.add('strict_locks')
 
1312
        self.assertEqual(flags, bzrlib.debug.debug_flags)
1408
1313
 
1409
1314
    def change_selftest_debug_flags(self, new_flags):
1410
 
        orig_selftest_flags = tests.selftest_debug_flags
1411
 
        self.addCleanup(self._restore_selftest_debug_flags, orig_selftest_flags)
1412
 
        tests.selftest_debug_flags = set(new_flags)
1413
 
 
1414
 
    def _restore_selftest_debug_flags(self, flags):
1415
 
        tests.selftest_debug_flags = flags
 
1315
        self.overrideAttr(tests, 'selftest_debug_flags', set(new_flags))
1416
1316
 
1417
1317
    def test_allow_debug_flag(self):
1418
1318
        """The -Eallow_debug flag prevents bzrlib.debug.debug_flags from being
1420
1320
        """
1421
1321
        self.change_selftest_debug_flags(set(['allow_debug']))
1422
1322
        bzrlib.debug.debug_flags = set(['a-flag'])
1423
 
        class TestThatRecordsFlags(TestCase):
1424
 
            def test_foo(nested_self):
1425
 
                self.flags = set(bzrlib.debug.debug_flags)
1426
 
        test = TestThatRecordsFlags('test_foo')
1427
 
        test.run(self.make_test_result())
1428
 
        self.assertEqual(set(['a-flag']), self.flags)
 
1323
        class TestThatRecordsFlags(tests.TestCase):
 
1324
            def test_foo(nested_self):
 
1325
                self.flags = set(bzrlib.debug.debug_flags)
 
1326
        test = TestThatRecordsFlags('test_foo')
 
1327
        test.run(self.make_test_result())
 
1328
        flags = set(['a-flag'])
 
1329
        if 'disable_lock_checks' not in tests.selftest_debug_flags:
 
1330
            flags.add('strict_locks')
 
1331
        self.assertEqual(flags, self.flags)
 
1332
 
 
1333
    def test_disable_lock_checks(self):
 
1334
        """The -Edisable_lock_checks flag disables thorough checks."""
 
1335
        class TestThatRecordsFlags(tests.TestCase):
 
1336
            def test_foo(nested_self):
 
1337
                self.flags = set(bzrlib.debug.debug_flags)
 
1338
                self.test_lock_check_thorough = nested_self._lock_check_thorough
 
1339
        self.change_selftest_debug_flags(set())
 
1340
        test = TestThatRecordsFlags('test_foo')
 
1341
        test.run(self.make_test_result())
 
1342
        # By default we do strict lock checking and thorough lock/unlock
 
1343
        # tracking.
 
1344
        self.assertTrue(self.test_lock_check_thorough)
 
1345
        self.assertEqual(set(['strict_locks']), self.flags)
 
1346
        # Now set the disable_lock_checks flag, and show that this changed.
 
1347
        self.change_selftest_debug_flags(set(['disable_lock_checks']))
 
1348
        test = TestThatRecordsFlags('test_foo')
 
1349
        test.run(self.make_test_result())
 
1350
        self.assertFalse(self.test_lock_check_thorough)
 
1351
        self.assertEqual(set(), self.flags)
 
1352
 
 
1353
    def test_this_fails_strict_lock_check(self):
 
1354
        class TestThatRecordsFlags(tests.TestCase):
 
1355
            def test_foo(nested_self):
 
1356
                self.flags1 = set(bzrlib.debug.debug_flags)
 
1357
                self.thisFailsStrictLockCheck()
 
1358
                self.flags2 = set(bzrlib.debug.debug_flags)
 
1359
        # Make sure lock checking is active
 
1360
        self.change_selftest_debug_flags(set())
 
1361
        test = TestThatRecordsFlags('test_foo')
 
1362
        test.run(self.make_test_result())
 
1363
        self.assertEqual(set(['strict_locks']), self.flags1)
 
1364
        self.assertEqual(set(), self.flags2)
1429
1365
 
1430
1366
    def test_debug_flags_restored(self):
1431
1367
        """The bzrlib debug flags should be restored to their original state
1434
1370
        self.change_selftest_debug_flags(set(['allow_debug']))
1435
1371
        # Now run a test that modifies debug.debug_flags.
1436
1372
        bzrlib.debug.debug_flags = set(['original-state'])
1437
 
        class TestThatModifiesFlags(TestCase):
 
1373
        class TestThatModifiesFlags(tests.TestCase):
1438
1374
            def test_foo(self):
1439
1375
                bzrlib.debug.debug_flags = set(['modified'])
1440
1376
        test = TestThatModifiesFlags('test_foo')
1442
1378
        self.assertEqual(set(['original-state']), bzrlib.debug.debug_flags)
1443
1379
 
1444
1380
    def make_test_result(self):
1445
 
        return bzrlib.tests.TextTestResult(
1446
 
            self._log_file, descriptions=0, verbosity=1)
 
1381
        """Get a test result that writes to the test log file."""
 
1382
        return tests.TextTestResult(self._log_file, descriptions=0, verbosity=1)
1447
1383
 
1448
1384
    def inner_test(self):
1449
1385
        # the inner child test
1456
1392
        result = self.make_test_result()
1457
1393
        self.inner_test.run(result)
1458
1394
        note("outer finish")
 
1395
        self.addCleanup(osutils.delete_any, self._log_file_name)
1459
1396
 
1460
1397
    def test_trace_nesting(self):
1461
1398
        # this tests that each test case nests its trace facility correctly.
1485
1422
        sample_test = TestTestCase("method_that_times_a_bit_twice")
1486
1423
        output_stream = StringIO()
1487
1424
        result = bzrlib.tests.VerboseTestResult(
1488
 
            unittest._WritelnDecorator(output_stream),
 
1425
            output_stream,
1489
1426
            descriptions=0,
1490
 
            verbosity=2,
1491
 
            num_tests=sample_test.countTestCases())
 
1427
            verbosity=2)
1492
1428
        sample_test.run(result)
1493
1429
        self.assertContainsRe(
1494
1430
            output_stream.getvalue(),
1495
 
            r"\d+ms/ +\d+ms\n$")
 
1431
            r"\d+ms\*\n$")
1496
1432
 
1497
1433
    def test_hooks_sanitised(self):
1498
1434
        """The bzrlib hooks should be sanitised by setUp."""
1522
1458
        self.assertEqual((time.sleep, (0.003,), {}), self._benchcalls[1][0])
1523
1459
        self.assertIsInstance(self._benchcalls[0][1], bzrlib.lsprof.Stats)
1524
1460
        self.assertIsInstance(self._benchcalls[1][1], bzrlib.lsprof.Stats)
 
1461
        del self._benchcalls[:]
1525
1462
 
1526
1463
    def test_knownFailure(self):
1527
1464
        """Self.knownFailure() should raise a KnownFailure exception."""
1528
 
        self.assertRaises(KnownFailure, self.knownFailure, "A Failure")
 
1465
        self.assertRaises(tests.KnownFailure, self.knownFailure, "A Failure")
 
1466
 
 
1467
    def test_open_bzrdir_safe_roots(self):
 
1468
        # even a memory transport should fail to open when its url isn't 
 
1469
        # permitted.
 
1470
        # Manually set one up (TestCase doesn't and shouldn't provide magic
 
1471
        # machinery)
 
1472
        transport_server = memory.MemoryServer()
 
1473
        transport_server.start_server()
 
1474
        self.addCleanup(transport_server.stop_server)
 
1475
        t = transport.get_transport(transport_server.get_url())
 
1476
        bzrdir.BzrDir.create(t.base)
 
1477
        self.assertRaises(errors.BzrError,
 
1478
            bzrdir.BzrDir.open_from_transport, t)
 
1479
        # But if we declare this as safe, we can open the bzrdir.
 
1480
        self.permit_url(t.base)
 
1481
        self._bzr_selftest_roots.append(t.base)
 
1482
        bzrdir.BzrDir.open_from_transport(t)
1529
1483
 
1530
1484
    def test_requireFeature_available(self):
1531
1485
        """self.requireFeature(available) is a no-op."""
1532
 
        class Available(Feature):
 
1486
        class Available(tests.Feature):
1533
1487
            def _probe(self):return True
1534
1488
        feature = Available()
1535
1489
        self.requireFeature(feature)
1536
1490
 
1537
1491
    def test_requireFeature_unavailable(self):
1538
1492
        """self.requireFeature(unavailable) raises UnavailableFeature."""
1539
 
        class Unavailable(Feature):
 
1493
        class Unavailable(tests.Feature):
1540
1494
            def _probe(self):return False
1541
1495
        feature = Unavailable()
1542
 
        self.assertRaises(UnavailableFeature, self.requireFeature, feature)
 
1496
        self.assertRaises(tests.UnavailableFeature,
 
1497
                          self.requireFeature, feature)
1543
1498
 
1544
1499
    def test_run_no_parameters(self):
1545
1500
        test = SampleTestCase('_test_pass')
1575
1530
        """Test disabled tests behaviour with support aware results."""
1576
1531
        test = SampleTestCase('_test_pass')
1577
1532
        class DisabledFeature(object):
 
1533
            def __eq__(self, other):
 
1534
                return isinstance(other, DisabledFeature)
1578
1535
            def available(self):
1579
1536
                return False
1580
1537
        the_feature = DisabledFeature()
1591
1548
                self.calls.append(('addNotSupported', test, feature))
1592
1549
        result = InstrumentedTestResult()
1593
1550
        test.run(result)
 
1551
        case = result.calls[0][1]
1594
1552
        self.assertEqual([
1595
 
            ('startTest', test),
1596
 
            ('addNotSupported', test, the_feature),
1597
 
            ('stopTest', test),
 
1553
            ('startTest', case),
 
1554
            ('addNotSupported', case, the_feature),
 
1555
            ('stopTest', case),
1598
1556
            ],
1599
1557
            result.calls)
1600
1558
 
 
1559
    def test_start_server_registers_url(self):
 
1560
        transport_server = memory.MemoryServer()
 
1561
        # A little strict, but unlikely to be changed soon.
 
1562
        self.assertEqual([], self._bzr_selftest_roots)
 
1563
        self.start_server(transport_server)
 
1564
        self.assertSubset([transport_server.get_url()],
 
1565
            self._bzr_selftest_roots)
 
1566
 
1601
1567
    def test_assert_list_raises_on_generator(self):
1602
1568
        def generator_which_will_raise():
1603
1569
            # This will not raise until after the first yield
1653
1619
        self.assertRaises(AssertionError,
1654
1620
            self.assertListRaises, _TestException, success_generator)
1655
1621
 
 
1622
    def test_overrideAttr_without_value(self):
 
1623
        self.test_attr = 'original' # Define a test attribute
 
1624
        obj = self # Make 'obj' visible to the embedded test
 
1625
        class Test(tests.TestCase):
 
1626
 
 
1627
            def setUp(self):
 
1628
                tests.TestCase.setUp(self)
 
1629
                self.orig = self.overrideAttr(obj, 'test_attr')
 
1630
 
 
1631
            def test_value(self):
 
1632
                self.assertEqual('original', self.orig)
 
1633
                self.assertEqual('original', obj.test_attr)
 
1634
                obj.test_attr = 'modified'
 
1635
                self.assertEqual('modified', obj.test_attr)
 
1636
 
 
1637
        test = Test('test_value')
 
1638
        test.run(unittest.TestResult())
 
1639
        self.assertEqual('original', obj.test_attr)
 
1640
 
 
1641
    def test_overrideAttr_with_value(self):
 
1642
        self.test_attr = 'original' # Define a test attribute
 
1643
        obj = self # Make 'obj' visible to the embedded test
 
1644
        class Test(tests.TestCase):
 
1645
 
 
1646
            def setUp(self):
 
1647
                tests.TestCase.setUp(self)
 
1648
                self.orig = self.overrideAttr(obj, 'test_attr', new='modified')
 
1649
 
 
1650
            def test_value(self):
 
1651
                self.assertEqual('original', self.orig)
 
1652
                self.assertEqual('modified', obj.test_attr)
 
1653
 
 
1654
        test = Test('test_value')
 
1655
        test.run(unittest.TestResult())
 
1656
        self.assertEqual('original', obj.test_attr)
 
1657
 
1656
1658
 
1657
1659
# NB: Don't delete this; it's not actually from 0.11!
1658
1660
@deprecated_function(deprecated_in((0, 11, 0)))
1681
1683
        return sample_deprecated_function()
1682
1684
 
1683
1685
 
1684
 
class TestExtraAssertions(TestCase):
 
1686
class TestExtraAssertions(tests.TestCase):
1685
1687
    """Tests for new test assertions in bzrlib test suite"""
1686
1688
 
1687
1689
    def test_assert_isinstance(self):
1688
1690
        self.assertIsInstance(2, int)
1689
1691
        self.assertIsInstance(u'', basestring)
1690
 
        self.assertRaises(AssertionError, self.assertIsInstance, None, int)
 
1692
        e = self.assertRaises(AssertionError, self.assertIsInstance, None, int)
 
1693
        self.assertEquals(str(e),
 
1694
            "None is an instance of <type 'NoneType'> rather than <type 'int'>")
1691
1695
        self.assertRaises(AssertionError, self.assertIsInstance, 23.3, int)
 
1696
        e = self.assertRaises(AssertionError,
 
1697
            self.assertIsInstance, None, int, "it's just not")
 
1698
        self.assertEquals(str(e),
 
1699
            "None is an instance of <type 'NoneType'> rather than <type 'int'>"
 
1700
            ": it's just not")
1692
1701
 
1693
1702
    def test_assertEndsWith(self):
1694
1703
        self.assertEndsWith('foo', 'oo')
1695
1704
        self.assertRaises(AssertionError, self.assertEndsWith, 'o', 'oo')
1696
1705
 
 
1706
    def test_assertEqualDiff(self):
 
1707
        e = self.assertRaises(AssertionError,
 
1708
                              self.assertEqualDiff, '', '\n')
 
1709
        self.assertEquals(str(e),
 
1710
                          # Don't blink ! The '+' applies to the second string
 
1711
                          'first string is missing a final newline.\n+ \n')
 
1712
        e = self.assertRaises(AssertionError,
 
1713
                              self.assertEqualDiff, '\n', '')
 
1714
        self.assertEquals(str(e),
 
1715
                          # Don't blink ! The '-' applies to the second string
 
1716
                          'second string is missing a final newline.\n- \n')
 
1717
 
 
1718
 
 
1719
class TestDeprecations(tests.TestCase):
 
1720
 
1697
1721
    def test_applyDeprecated_not_deprecated(self):
1698
1722
        sample_object = ApplyDeprecatedHelper()
1699
1723
        # calling an undeprecated callable raises an assertion
1742
1766
        self.callDeprecated([], testfunc, be_deprecated=False)
1743
1767
 
1744
1768
 
1745
 
class TestWarningTests(TestCase):
 
1769
class TestWarningTests(tests.TestCase):
1746
1770
    """Tests for calling methods that raise warnings."""
1747
1771
 
1748
1772
    def test_callCatchWarnings(self):
1758
1782
        self.assertEquals("this is your last warning", str(w0))
1759
1783
 
1760
1784
 
1761
 
class TestConvenienceMakers(TestCaseWithTransport):
 
1785
class TestConvenienceMakers(tests.TestCaseWithTransport):
1762
1786
    """Test for the make_* convenience functions."""
1763
1787
 
1764
1788
    def test_make_branch_and_tree_with_format(self):
1776
1800
        tree = self.make_branch_and_memory_tree('a')
1777
1801
        self.assertIsInstance(tree, bzrlib.memorytree.MemoryTree)
1778
1802
 
1779
 
 
1780
 
class TestSFTPMakeBranchAndTree(TestCaseWithSFTPServer):
1781
 
 
1782
 
    def test_make_tree_for_sftp_branch(self):
1783
 
        """Transports backed by local directories create local trees."""
1784
 
 
 
1803
    def test_make_tree_for_local_vfs_backed_transport(self):
 
1804
        # make_branch_and_tree has to use local branch and repositories
 
1805
        # when the vfs transport and local disk are colocated, even if
 
1806
        # a different transport is in use for url generation.
 
1807
        self.transport_server = test_server.FakeVFATServer
 
1808
        self.assertFalse(self.get_url('t1').startswith('file://'))
1785
1809
        tree = self.make_branch_and_tree('t1')
1786
1810
        base = tree.bzrdir.root_transport.base
1787
 
        self.failIf(base.startswith('sftp'),
1788
 
                'base %r is on sftp but should be local' % base)
 
1811
        self.assertStartsWith(base, 'file://')
1789
1812
        self.assertEquals(tree.bzrdir.root_transport,
1790
1813
                tree.branch.bzrdir.root_transport)
1791
1814
        self.assertEquals(tree.bzrdir.root_transport,
1792
1815
                tree.branch.repository.bzrdir.root_transport)
1793
1816
 
1794
1817
 
1795
 
class TestSelftest(TestCase):
 
1818
class SelfTestHelper:
 
1819
 
 
1820
    def run_selftest(self, **kwargs):
 
1821
        """Run selftest returning its output."""
 
1822
        output = StringIO()
 
1823
        old_transport = bzrlib.tests.default_transport
 
1824
        old_root = tests.TestCaseWithMemoryTransport.TEST_ROOT
 
1825
        tests.TestCaseWithMemoryTransport.TEST_ROOT = None
 
1826
        try:
 
1827
            self.assertEqual(True, tests.selftest(stream=output, **kwargs))
 
1828
        finally:
 
1829
            bzrlib.tests.default_transport = old_transport
 
1830
            tests.TestCaseWithMemoryTransport.TEST_ROOT = old_root
 
1831
        output.seek(0)
 
1832
        return output
 
1833
 
 
1834
 
 
1835
class TestSelftest(tests.TestCase, SelfTestHelper):
1796
1836
    """Tests of bzrlib.tests.selftest."""
1797
1837
 
1798
1838
    def test_selftest_benchmark_parameter_invokes_test_suite__benchmark__(self):
1799
1839
        factory_called = []
1800
1840
        def factory():
1801
1841
            factory_called.append(True)
1802
 
            return TestSuite()
 
1842
            return TestUtil.TestSuite()
1803
1843
        out = StringIO()
1804
1844
        err = StringIO()
1805
1845
        self.apply_redirected(out, err, None, bzrlib.tests.selftest,
1806
1846
            test_suite_factory=factory)
1807
1847
        self.assertEqual([True], factory_called)
1808
1848
 
1809
 
 
1810
 
class TestKnownFailure(TestCase):
1811
 
 
1812
 
    def test_known_failure(self):
1813
 
        """Check that KnownFailure is defined appropriately."""
1814
 
        # a KnownFailure is an assertion error for compatability with unaware
1815
 
        # runners.
1816
 
        self.assertIsInstance(KnownFailure(""), AssertionError)
1817
 
 
1818
 
    def test_expect_failure(self):
1819
 
        try:
1820
 
            self.expectFailure("Doomed to failure", self.assertTrue, False)
1821
 
        except KnownFailure, e:
1822
 
            self.assertEqual('Doomed to failure', e.args[0])
1823
 
        try:
1824
 
            self.expectFailure("Doomed to failure", self.assertTrue, True)
1825
 
        except AssertionError, e:
1826
 
            self.assertEqual('Unexpected success.  Should have failed:'
1827
 
                             ' Doomed to failure', e.args[0])
 
1849
    def factory(self):
 
1850
        """A test suite factory."""
 
1851
        class Test(tests.TestCase):
 
1852
            def a(self):
 
1853
                pass
 
1854
            def b(self):
 
1855
                pass
 
1856
            def c(self):
 
1857
                pass
 
1858
        return TestUtil.TestSuite([Test("a"), Test("b"), Test("c")])
 
1859
 
 
1860
    def test_list_only(self):
 
1861
        output = self.run_selftest(test_suite_factory=self.factory,
 
1862
            list_only=True)
 
1863
        self.assertEqual(3, len(output.readlines()))
 
1864
 
 
1865
    def test_list_only_filtered(self):
 
1866
        output = self.run_selftest(test_suite_factory=self.factory,
 
1867
            list_only=True, pattern="Test.b")
 
1868
        self.assertEndsWith(output.getvalue(), "Test.b\n")
 
1869
        self.assertLength(1, output.readlines())
 
1870
 
 
1871
    def test_list_only_excludes(self):
 
1872
        output = self.run_selftest(test_suite_factory=self.factory,
 
1873
            list_only=True, exclude_pattern="Test.b")
 
1874
        self.assertNotContainsRe("Test.b", output.getvalue())
 
1875
        self.assertLength(2, output.readlines())
 
1876
 
 
1877
    def test_lsprof_tests(self):
 
1878
        self.requireFeature(test_lsprof.LSProfFeature)
 
1879
        calls = []
 
1880
        class Test(object):
 
1881
            def __call__(test, result):
 
1882
                test.run(result)
 
1883
            def run(test, result):
 
1884
                self.assertIsInstance(result, tests.ForwardingResult)
 
1885
                calls.append("called")
 
1886
            def countTestCases(self):
 
1887
                return 1
 
1888
        self.run_selftest(test_suite_factory=Test, lsprof_tests=True)
 
1889
        self.assertLength(1, calls)
 
1890
 
 
1891
    def test_random(self):
 
1892
        # test randomising by listing a number of tests.
 
1893
        output_123 = self.run_selftest(test_suite_factory=self.factory,
 
1894
            list_only=True, random_seed="123")
 
1895
        output_234 = self.run_selftest(test_suite_factory=self.factory,
 
1896
            list_only=True, random_seed="234")
 
1897
        self.assertNotEqual(output_123, output_234)
 
1898
        # "Randominzing test order..\n\n
 
1899
        self.assertLength(5, output_123.readlines())
 
1900
        self.assertLength(5, output_234.readlines())
 
1901
 
 
1902
    def test_random_reuse_is_same_order(self):
 
1903
        # test randomising by listing a number of tests.
 
1904
        expected = self.run_selftest(test_suite_factory=self.factory,
 
1905
            list_only=True, random_seed="123")
 
1906
        repeated = self.run_selftest(test_suite_factory=self.factory,
 
1907
            list_only=True, random_seed="123")
 
1908
        self.assertEqual(expected.getvalue(), repeated.getvalue())
 
1909
 
 
1910
    def test_runner_class(self):
 
1911
        self.requireFeature(features.subunit)
 
1912
        from subunit import ProtocolTestCase
 
1913
        stream = self.run_selftest(runner_class=tests.SubUnitBzrRunner,
 
1914
            test_suite_factory=self.factory)
 
1915
        test = ProtocolTestCase(stream)
 
1916
        result = unittest.TestResult()
 
1917
        test.run(result)
 
1918
        self.assertEqual(3, result.testsRun)
 
1919
 
 
1920
    def test_starting_with_single_argument(self):
 
1921
        output = self.run_selftest(test_suite_factory=self.factory,
 
1922
            starting_with=['bzrlib.tests.test_selftest.Test.a'],
 
1923
            list_only=True)
 
1924
        self.assertEqual('bzrlib.tests.test_selftest.Test.a\n',
 
1925
            output.getvalue())
 
1926
 
 
1927
    def test_starting_with_multiple_argument(self):
 
1928
        output = self.run_selftest(test_suite_factory=self.factory,
 
1929
            starting_with=['bzrlib.tests.test_selftest.Test.a',
 
1930
                'bzrlib.tests.test_selftest.Test.b'],
 
1931
            list_only=True)
 
1932
        self.assertEqual('bzrlib.tests.test_selftest.Test.a\n'
 
1933
            'bzrlib.tests.test_selftest.Test.b\n',
 
1934
            output.getvalue())
 
1935
 
 
1936
    def check_transport_set(self, transport_server):
 
1937
        captured_transport = []
 
1938
        def seen_transport(a_transport):
 
1939
            captured_transport.append(a_transport)
 
1940
        class Capture(tests.TestCase):
 
1941
            def a(self):
 
1942
                seen_transport(bzrlib.tests.default_transport)
 
1943
        def factory():
 
1944
            return TestUtil.TestSuite([Capture("a")])
 
1945
        self.run_selftest(transport=transport_server, test_suite_factory=factory)
 
1946
        self.assertEqual(transport_server, captured_transport[0])
 
1947
 
 
1948
    def test_transport_sftp(self):
 
1949
        self.requireFeature(features.paramiko)
 
1950
        from bzrlib.tests import stub_sftp
 
1951
        self.check_transport_set(stub_sftp.SFTPAbsoluteServer)
 
1952
 
 
1953
    def test_transport_memory(self):
 
1954
        self.check_transport_set(memory.MemoryServer)
 
1955
 
 
1956
 
 
1957
class TestSelftestWithIdList(tests.TestCaseInTempDir, SelfTestHelper):
 
1958
    # Does IO: reads test.list
 
1959
 
 
1960
    def test_load_list(self):
 
1961
        # Provide a list with one test - this test.
 
1962
        test_id_line = '%s\n' % self.id()
 
1963
        self.build_tree_contents([('test.list', test_id_line)])
 
1964
        # And generate a list of the tests in  the suite.
 
1965
        stream = self.run_selftest(load_list='test.list', list_only=True)
 
1966
        self.assertEqual(test_id_line, stream.getvalue())
 
1967
 
 
1968
    def test_load_unknown(self):
 
1969
        # Provide a list with one test - this test.
 
1970
        # And generate a list of the tests in  the suite.
 
1971
        err = self.assertRaises(errors.NoSuchFile, self.run_selftest,
 
1972
            load_list='missing file name', list_only=True)
 
1973
 
 
1974
 
 
1975
class TestRunBzr(tests.TestCase):
 
1976
 
 
1977
    out = ''
 
1978
    err = ''
 
1979
 
 
1980
    def _run_bzr_core(self, argv, retcode=0, encoding=None, stdin=None,
 
1981
                         working_dir=None):
 
1982
        """Override _run_bzr_core to test how it is invoked by run_bzr.
 
1983
 
 
1984
        Attempts to run bzr from inside this class don't actually run it.
 
1985
 
 
1986
        We test how run_bzr actually invokes bzr in another location.  Here we
 
1987
        only need to test that it passes the right parameters to run_bzr.
 
1988
        """
 
1989
        self.argv = list(argv)
 
1990
        self.retcode = retcode
 
1991
        self.encoding = encoding
 
1992
        self.stdin = stdin
 
1993
        self.working_dir = working_dir
 
1994
        return self.retcode, self.out, self.err
 
1995
 
 
1996
    def test_run_bzr_error(self):
 
1997
        self.out = "It sure does!\n"
 
1998
        out, err = self.run_bzr_error(['^$'], ['rocks'], retcode=34)
 
1999
        self.assertEqual(['rocks'], self.argv)
 
2000
        self.assertEqual(34, self.retcode)
 
2001
        self.assertEqual('It sure does!\n', out)
 
2002
        self.assertEquals(out, self.out)
 
2003
        self.assertEqual('', err)
 
2004
        self.assertEquals(err, self.err)
 
2005
 
 
2006
    def test_run_bzr_error_regexes(self):
 
2007
        self.out = ''
 
2008
        self.err = "bzr: ERROR: foobarbaz is not versioned"
 
2009
        out, err = self.run_bzr_error(
 
2010
            ["bzr: ERROR: foobarbaz is not versioned"],
 
2011
            ['file-id', 'foobarbaz'])
 
2012
 
 
2013
    def test_encoding(self):
 
2014
        """Test that run_bzr passes encoding to _run_bzr_core"""
 
2015
        self.run_bzr('foo bar')
 
2016
        self.assertEqual(None, self.encoding)
 
2017
        self.assertEqual(['foo', 'bar'], self.argv)
 
2018
 
 
2019
        self.run_bzr('foo bar', encoding='baz')
 
2020
        self.assertEqual('baz', self.encoding)
 
2021
        self.assertEqual(['foo', 'bar'], self.argv)
 
2022
 
 
2023
    def test_retcode(self):
 
2024
        """Test that run_bzr passes retcode to _run_bzr_core"""
 
2025
        # Default is retcode == 0
 
2026
        self.run_bzr('foo bar')
 
2027
        self.assertEqual(0, self.retcode)
 
2028
        self.assertEqual(['foo', 'bar'], self.argv)
 
2029
 
 
2030
        self.run_bzr('foo bar', retcode=1)
 
2031
        self.assertEqual(1, self.retcode)
 
2032
        self.assertEqual(['foo', 'bar'], self.argv)
 
2033
 
 
2034
        self.run_bzr('foo bar', retcode=None)
 
2035
        self.assertEqual(None, self.retcode)
 
2036
        self.assertEqual(['foo', 'bar'], self.argv)
 
2037
 
 
2038
        self.run_bzr(['foo', 'bar'], retcode=3)
 
2039
        self.assertEqual(3, self.retcode)
 
2040
        self.assertEqual(['foo', 'bar'], self.argv)
 
2041
 
 
2042
    def test_stdin(self):
 
2043
        # test that the stdin keyword to run_bzr is passed through to
 
2044
        # _run_bzr_core as-is. We do this by overriding
 
2045
        # _run_bzr_core in this class, and then calling run_bzr,
 
2046
        # which is a convenience function for _run_bzr_core, so
 
2047
        # should invoke it.
 
2048
        self.run_bzr('foo bar', stdin='gam')
 
2049
        self.assertEqual('gam', self.stdin)
 
2050
        self.assertEqual(['foo', 'bar'], self.argv)
 
2051
 
 
2052
        self.run_bzr('foo bar', stdin='zippy')
 
2053
        self.assertEqual('zippy', self.stdin)
 
2054
        self.assertEqual(['foo', 'bar'], self.argv)
 
2055
 
 
2056
    def test_working_dir(self):
 
2057
        """Test that run_bzr passes working_dir to _run_bzr_core"""
 
2058
        self.run_bzr('foo bar')
 
2059
        self.assertEqual(None, self.working_dir)
 
2060
        self.assertEqual(['foo', 'bar'], self.argv)
 
2061
 
 
2062
        self.run_bzr('foo bar', working_dir='baz')
 
2063
        self.assertEqual('baz', self.working_dir)
 
2064
        self.assertEqual(['foo', 'bar'], self.argv)
 
2065
 
 
2066
    def test_reject_extra_keyword_arguments(self):
 
2067
        self.assertRaises(TypeError, self.run_bzr, "foo bar",
 
2068
                          error_regex=['error message'])
 
2069
 
 
2070
 
 
2071
class TestRunBzrCaptured(tests.TestCaseWithTransport):
 
2072
    # Does IO when testing the working_dir parameter.
 
2073
 
 
2074
    def apply_redirected(self, stdin=None, stdout=None, stderr=None,
 
2075
                         a_callable=None, *args, **kwargs):
 
2076
        self.stdin = stdin
 
2077
        self.factory_stdin = getattr(bzrlib.ui.ui_factory, "stdin", None)
 
2078
        self.factory = bzrlib.ui.ui_factory
 
2079
        self.working_dir = osutils.getcwd()
 
2080
        stdout.write('foo\n')
 
2081
        stderr.write('bar\n')
 
2082
        return 0
 
2083
 
 
2084
    def test_stdin(self):
 
2085
        # test that the stdin keyword to _run_bzr_core is passed through to
 
2086
        # apply_redirected as a StringIO. We do this by overriding
 
2087
        # apply_redirected in this class, and then calling _run_bzr_core,
 
2088
        # which calls apply_redirected.
 
2089
        self.run_bzr(['foo', 'bar'], stdin='gam')
 
2090
        self.assertEqual('gam', self.stdin.read())
 
2091
        self.assertTrue(self.stdin is self.factory_stdin)
 
2092
        self.run_bzr(['foo', 'bar'], stdin='zippy')
 
2093
        self.assertEqual('zippy', self.stdin.read())
 
2094
        self.assertTrue(self.stdin is self.factory_stdin)
 
2095
 
 
2096
    def test_ui_factory(self):
 
2097
        # each invocation of self.run_bzr should get its
 
2098
        # own UI factory, which is an instance of TestUIFactory,
 
2099
        # with stdin, stdout and stderr attached to the stdin,
 
2100
        # stdout and stderr of the invoked run_bzr
 
2101
        current_factory = bzrlib.ui.ui_factory
 
2102
        self.run_bzr(['foo'])
 
2103
        self.failIf(current_factory is self.factory)
 
2104
        self.assertNotEqual(sys.stdout, self.factory.stdout)
 
2105
        self.assertNotEqual(sys.stderr, self.factory.stderr)
 
2106
        self.assertEqual('foo\n', self.factory.stdout.getvalue())
 
2107
        self.assertEqual('bar\n', self.factory.stderr.getvalue())
 
2108
        self.assertIsInstance(self.factory, tests.TestUIFactory)
 
2109
 
 
2110
    def test_working_dir(self):
 
2111
        self.build_tree(['one/', 'two/'])
 
2112
        cwd = osutils.getcwd()
 
2113
 
 
2114
        # Default is to work in the current directory
 
2115
        self.run_bzr(['foo', 'bar'])
 
2116
        self.assertEqual(cwd, self.working_dir)
 
2117
 
 
2118
        self.run_bzr(['foo', 'bar'], working_dir=None)
 
2119
        self.assertEqual(cwd, self.working_dir)
 
2120
 
 
2121
        # The function should be run in the alternative directory
 
2122
        # but afterwards the current working dir shouldn't be changed
 
2123
        self.run_bzr(['foo', 'bar'], working_dir='one')
 
2124
        self.assertNotEqual(cwd, self.working_dir)
 
2125
        self.assertEndsWith(self.working_dir, 'one')
 
2126
        self.assertEqual(cwd, osutils.getcwd())
 
2127
 
 
2128
        self.run_bzr(['foo', 'bar'], working_dir='two')
 
2129
        self.assertNotEqual(cwd, self.working_dir)
 
2130
        self.assertEndsWith(self.working_dir, 'two')
 
2131
        self.assertEqual(cwd, osutils.getcwd())
 
2132
 
 
2133
 
 
2134
class StubProcess(object):
 
2135
    """A stub process for testing run_bzr_subprocess."""
 
2136
    
 
2137
    def __init__(self, out="", err="", retcode=0):
 
2138
        self.out = out
 
2139
        self.err = err
 
2140
        self.returncode = retcode
 
2141
 
 
2142
    def communicate(self):
 
2143
        return self.out, self.err
 
2144
 
 
2145
 
 
2146
class TestWithFakedStartBzrSubprocess(tests.TestCaseWithTransport):
 
2147
    """Base class for tests testing how we might run bzr."""
 
2148
 
 
2149
    def setUp(self):
 
2150
        tests.TestCaseWithTransport.setUp(self)
 
2151
        self.subprocess_calls = []
 
2152
 
 
2153
    def start_bzr_subprocess(self, process_args, env_changes=None,
 
2154
                             skip_if_plan_to_signal=False,
 
2155
                             working_dir=None,
 
2156
                             allow_plugins=False):
 
2157
        """capture what run_bzr_subprocess tries to do."""
 
2158
        self.subprocess_calls.append({'process_args':process_args,
 
2159
            'env_changes':env_changes,
 
2160
            'skip_if_plan_to_signal':skip_if_plan_to_signal,
 
2161
            'working_dir':working_dir, 'allow_plugins':allow_plugins})
 
2162
        return self.next_subprocess
 
2163
 
 
2164
 
 
2165
class TestRunBzrSubprocess(TestWithFakedStartBzrSubprocess):
 
2166
 
 
2167
    def assertRunBzrSubprocess(self, expected_args, process, *args, **kwargs):
 
2168
        """Run run_bzr_subprocess with args and kwargs using a stubbed process.
 
2169
 
 
2170
        Inside TestRunBzrSubprocessCommands we use a stub start_bzr_subprocess
 
2171
        that will return static results. This assertion method populates those
 
2172
        results and also checks the arguments run_bzr_subprocess generates.
 
2173
        """
 
2174
        self.next_subprocess = process
 
2175
        try:
 
2176
            result = self.run_bzr_subprocess(*args, **kwargs)
 
2177
        except:
 
2178
            self.next_subprocess = None
 
2179
            for key, expected in expected_args.iteritems():
 
2180
                self.assertEqual(expected, self.subprocess_calls[-1][key])
 
2181
            raise
1828
2182
        else:
1829
 
            self.fail('Assertion not raised')
1830
 
 
1831
 
 
1832
 
class TestFeature(TestCase):
 
2183
            self.next_subprocess = None
 
2184
            for key, expected in expected_args.iteritems():
 
2185
                self.assertEqual(expected, self.subprocess_calls[-1][key])
 
2186
            return result
 
2187
 
 
2188
    def test_run_bzr_subprocess(self):
 
2189
        """The run_bzr_helper_external command behaves nicely."""
 
2190
        self.assertRunBzrSubprocess({'process_args':['--version']},
 
2191
            StubProcess(), '--version')
 
2192
        self.assertRunBzrSubprocess({'process_args':['--version']},
 
2193
            StubProcess(), ['--version'])
 
2194
        # retcode=None disables retcode checking
 
2195
        result = self.assertRunBzrSubprocess({},
 
2196
            StubProcess(retcode=3), '--version', retcode=None)
 
2197
        result = self.assertRunBzrSubprocess({},
 
2198
            StubProcess(out="is free software"), '--version')
 
2199
        self.assertContainsRe(result[0], 'is free software')
 
2200
        # Running a subcommand that is missing errors
 
2201
        self.assertRaises(AssertionError, self.assertRunBzrSubprocess,
 
2202
            {'process_args':['--versionn']}, StubProcess(retcode=3),
 
2203
            '--versionn')
 
2204
        # Unless it is told to expect the error from the subprocess
 
2205
        result = self.assertRunBzrSubprocess({},
 
2206
            StubProcess(retcode=3), '--versionn', retcode=3)
 
2207
        # Or to ignore retcode checking
 
2208
        result = self.assertRunBzrSubprocess({},
 
2209
            StubProcess(err="unknown command", retcode=3), '--versionn',
 
2210
            retcode=None)
 
2211
        self.assertContainsRe(result[1], 'unknown command')
 
2212
 
 
2213
    def test_env_change_passes_through(self):
 
2214
        self.assertRunBzrSubprocess(
 
2215
            {'env_changes':{'new':'value', 'changed':'newvalue', 'deleted':None}},
 
2216
            StubProcess(), '',
 
2217
            env_changes={'new':'value', 'changed':'newvalue', 'deleted':None})
 
2218
 
 
2219
    def test_no_working_dir_passed_as_None(self):
 
2220
        self.assertRunBzrSubprocess({'working_dir': None}, StubProcess(), '')
 
2221
 
 
2222
    def test_no_working_dir_passed_through(self):
 
2223
        self.assertRunBzrSubprocess({'working_dir': 'dir'}, StubProcess(), '',
 
2224
            working_dir='dir')
 
2225
 
 
2226
    def test_run_bzr_subprocess_no_plugins(self):
 
2227
        self.assertRunBzrSubprocess({'allow_plugins': False},
 
2228
            StubProcess(), '')
 
2229
 
 
2230
    def test_allow_plugins(self):
 
2231
        self.assertRunBzrSubprocess({'allow_plugins': True},
 
2232
            StubProcess(), '', allow_plugins=True)
 
2233
 
 
2234
 
 
2235
class TestFinishBzrSubprocess(TestWithFakedStartBzrSubprocess):
 
2236
 
 
2237
    def test_finish_bzr_subprocess_with_error(self):
 
2238
        """finish_bzr_subprocess allows specification of the desired exit code.
 
2239
        """
 
2240
        process = StubProcess(err="unknown command", retcode=3)
 
2241
        result = self.finish_bzr_subprocess(process, retcode=3)
 
2242
        self.assertEqual('', result[0])
 
2243
        self.assertContainsRe(result[1], 'unknown command')
 
2244
 
 
2245
    def test_finish_bzr_subprocess_ignoring_retcode(self):
 
2246
        """finish_bzr_subprocess allows the exit code to be ignored."""
 
2247
        process = StubProcess(err="unknown command", retcode=3)
 
2248
        result = self.finish_bzr_subprocess(process, retcode=None)
 
2249
        self.assertEqual('', result[0])
 
2250
        self.assertContainsRe(result[1], 'unknown command')
 
2251
 
 
2252
    def test_finish_subprocess_with_unexpected_retcode(self):
 
2253
        """finish_bzr_subprocess raises self.failureException if the retcode is
 
2254
        not the expected one.
 
2255
        """
 
2256
        process = StubProcess(err="unknown command", retcode=3)
 
2257
        self.assertRaises(self.failureException, self.finish_bzr_subprocess,
 
2258
                          process)
 
2259
 
 
2260
 
 
2261
class _DontSpawnProcess(Exception):
 
2262
    """A simple exception which just allows us to skip unnecessary steps"""
 
2263
 
 
2264
 
 
2265
class TestStartBzrSubProcess(tests.TestCase):
 
2266
 
 
2267
    def check_popen_state(self):
 
2268
        """Replace to make assertions when popen is called."""
 
2269
 
 
2270
    def _popen(self, *args, **kwargs):
 
2271
        """Record the command that is run, so that we can ensure it is correct"""
 
2272
        self.check_popen_state()
 
2273
        self._popen_args = args
 
2274
        self._popen_kwargs = kwargs
 
2275
        raise _DontSpawnProcess()
 
2276
 
 
2277
    def test_run_bzr_subprocess_no_plugins(self):
 
2278
        self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [])
 
2279
        command = self._popen_args[0]
 
2280
        self.assertEqual(sys.executable, command[0])
 
2281
        self.assertEqual(self.get_bzr_path(), command[1])
 
2282
        self.assertEqual(['--no-plugins'], command[2:])
 
2283
 
 
2284
    def test_allow_plugins(self):
 
2285
        self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [],
 
2286
            allow_plugins=True)
 
2287
        command = self._popen_args[0]
 
2288
        self.assertEqual([], command[2:])
 
2289
 
 
2290
    def test_set_env(self):
 
2291
        self.failIf('EXISTANT_ENV_VAR' in os.environ)
 
2292
        # set in the child
 
2293
        def check_environment():
 
2294
            self.assertEqual('set variable', os.environ['EXISTANT_ENV_VAR'])
 
2295
        self.check_popen_state = check_environment
 
2296
        self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [],
 
2297
            env_changes={'EXISTANT_ENV_VAR':'set variable'})
 
2298
        # not set in theparent
 
2299
        self.assertFalse('EXISTANT_ENV_VAR' in os.environ)
 
2300
 
 
2301
    def test_run_bzr_subprocess_env_del(self):
 
2302
        """run_bzr_subprocess can remove environment variables too."""
 
2303
        self.failIf('EXISTANT_ENV_VAR' in os.environ)
 
2304
        def check_environment():
 
2305
            self.assertFalse('EXISTANT_ENV_VAR' in os.environ)
 
2306
        os.environ['EXISTANT_ENV_VAR'] = 'set variable'
 
2307
        self.check_popen_state = check_environment
 
2308
        self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [],
 
2309
            env_changes={'EXISTANT_ENV_VAR':None})
 
2310
        # Still set in parent
 
2311
        self.assertEqual('set variable', os.environ['EXISTANT_ENV_VAR'])
 
2312
        del os.environ['EXISTANT_ENV_VAR']
 
2313
 
 
2314
    def test_env_del_missing(self):
 
2315
        self.failIf('NON_EXISTANT_ENV_VAR' in os.environ)
 
2316
        def check_environment():
 
2317
            self.assertFalse('NON_EXISTANT_ENV_VAR' in os.environ)
 
2318
        self.check_popen_state = check_environment
 
2319
        self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [],
 
2320
            env_changes={'NON_EXISTANT_ENV_VAR':None})
 
2321
 
 
2322
    def test_working_dir(self):
 
2323
        """Test that we can specify the working dir for the child"""
 
2324
        orig_getcwd = osutils.getcwd
 
2325
        orig_chdir = os.chdir
 
2326
        chdirs = []
 
2327
        def chdir(path):
 
2328
            chdirs.append(path)
 
2329
        os.chdir = chdir
 
2330
        try:
 
2331
            def getcwd():
 
2332
                return 'current'
 
2333
            osutils.getcwd = getcwd
 
2334
            try:
 
2335
                self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [],
 
2336
                    working_dir='foo')
 
2337
            finally:
 
2338
                osutils.getcwd = orig_getcwd
 
2339
        finally:
 
2340
            os.chdir = orig_chdir
 
2341
        self.assertEqual(['foo', 'current'], chdirs)
 
2342
 
 
2343
    def test_get_bzr_path_with_cwd_bzrlib(self):
 
2344
        self.get_source_path = lambda: ""
 
2345
        self.overrideAttr(os.path, "isfile", lambda path: True)
 
2346
        self.assertEqual(self.get_bzr_path(), "bzr")
 
2347
 
 
2348
 
 
2349
class TestActuallyStartBzrSubprocess(tests.TestCaseWithTransport):
 
2350
    """Tests that really need to do things with an external bzr."""
 
2351
 
 
2352
    def test_start_and_stop_bzr_subprocess_send_signal(self):
 
2353
        """finish_bzr_subprocess raises self.failureException if the retcode is
 
2354
        not the expected one.
 
2355
        """
 
2356
        self.disable_missing_extensions_warning()
 
2357
        process = self.start_bzr_subprocess(['wait-until-signalled'],
 
2358
                                            skip_if_plan_to_signal=True)
 
2359
        self.assertEqual('running\n', process.stdout.readline())
 
2360
        result = self.finish_bzr_subprocess(process, send_signal=signal.SIGINT,
 
2361
                                            retcode=3)
 
2362
        self.assertEqual('', result[0])
 
2363
        self.assertEqual('bzr: interrupted\n', result[1])
 
2364
 
 
2365
 
 
2366
class TestFeature(tests.TestCase):
1833
2367
 
1834
2368
    def test_caching(self):
1835
2369
        """Feature._probe is called by the feature at most once."""
1836
 
        class InstrumentedFeature(Feature):
 
2370
        class InstrumentedFeature(tests.Feature):
1837
2371
            def __init__(self):
1838
 
                Feature.__init__(self)
 
2372
                super(InstrumentedFeature, self).__init__()
1839
2373
                self.calls = []
1840
2374
            def _probe(self):
1841
2375
                self.calls.append('_probe')
1848
2382
 
1849
2383
    def test_named_str(self):
1850
2384
        """Feature.__str__ should thunk to feature_name()."""
1851
 
        class NamedFeature(Feature):
 
2385
        class NamedFeature(tests.Feature):
1852
2386
            def feature_name(self):
1853
2387
                return 'symlinks'
1854
2388
        feature = NamedFeature()
1856
2390
 
1857
2391
    def test_default_str(self):
1858
2392
        """Feature.__str__ should default to __class__.__name__."""
1859
 
        class NamedFeature(Feature):
 
2393
        class NamedFeature(tests.Feature):
1860
2394
            pass
1861
2395
        feature = NamedFeature()
1862
2396
        self.assertEqual('NamedFeature', str(feature))
1863
2397
 
1864
2398
 
1865
 
class TestUnavailableFeature(TestCase):
 
2399
class TestUnavailableFeature(tests.TestCase):
1866
2400
 
1867
2401
    def test_access_feature(self):
1868
 
        feature = Feature()
1869
 
        exception = UnavailableFeature(feature)
 
2402
        feature = tests.Feature()
 
2403
        exception = tests.UnavailableFeature(feature)
1870
2404
        self.assertIs(feature, exception.args[0])
1871
2405
 
1872
2406
 
1873
 
class TestSelftestFiltering(TestCase):
 
2407
simple_thunk_feature = tests._CompatabilityThunkFeature(
 
2408
    deprecated_in((2, 1, 0)),
 
2409
    'bzrlib.tests.test_selftest',
 
2410
    'simple_thunk_feature','UnicodeFilename',
 
2411
    replacement_module='bzrlib.tests'
 
2412
    )
 
2413
 
 
2414
class Test_CompatibilityFeature(tests.TestCase):
 
2415
 
 
2416
    def test_does_thunk(self):
 
2417
        res = self.callDeprecated(
 
2418
            ['bzrlib.tests.test_selftest.simple_thunk_feature was deprecated'
 
2419
             ' in version 2.1.0. Use bzrlib.tests.UnicodeFilename instead.'],
 
2420
            simple_thunk_feature.available)
 
2421
        self.assertEqual(tests.UnicodeFilename.available(), res)
 
2422
 
 
2423
 
 
2424
class TestModuleAvailableFeature(tests.TestCase):
 
2425
 
 
2426
    def test_available_module(self):
 
2427
        feature = tests.ModuleAvailableFeature('bzrlib.tests')
 
2428
        self.assertEqual('bzrlib.tests', feature.module_name)
 
2429
        self.assertEqual('bzrlib.tests', str(feature))
 
2430
        self.assertTrue(feature.available())
 
2431
        self.assertIs(tests, feature.module)
 
2432
 
 
2433
    def test_unavailable_module(self):
 
2434
        feature = tests.ModuleAvailableFeature('bzrlib.no_such_module_exists')
 
2435
        self.assertEqual('bzrlib.no_such_module_exists', str(feature))
 
2436
        self.assertFalse(feature.available())
 
2437
        self.assertIs(None, feature.module)
 
2438
 
 
2439
 
 
2440
class TestSelftestFiltering(tests.TestCase):
1874
2441
 
1875
2442
    def setUp(self):
1876
 
        TestCase.setUp(self)
 
2443
        tests.TestCase.setUp(self)
1877
2444
        self.suite = TestUtil.TestSuite()
1878
2445
        self.loader = TestUtil.TestLoader()
1879
 
        self.suite.addTest(self.loader.loadTestsFromModuleNames([
1880
 
            'bzrlib.tests.test_selftest']))
 
2446
        self.suite.addTest(self.loader.loadTestsFromModule(
 
2447
            sys.modules['bzrlib.tests.test_selftest']))
1881
2448
        self.all_names = _test_ids(self.suite)
1882
2449
 
1883
2450
    def test_condition_id_re(self):
1884
2451
        test_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.'
1885
2452
            'test_condition_id_re')
1886
 
        filtered_suite = filter_suite_by_condition(self.suite,
1887
 
            condition_id_re('test_condition_id_re'))
 
2453
        filtered_suite = tests.filter_suite_by_condition(
 
2454
            self.suite, tests.condition_id_re('test_condition_id_re'))
1888
2455
        self.assertEqual([test_name], _test_ids(filtered_suite))
1889
2456
 
1890
2457
    def test_condition_id_in_list(self):
1891
2458
        test_names = ['bzrlib.tests.test_selftest.TestSelftestFiltering.'
1892
2459
                      'test_condition_id_in_list']
1893
2460
        id_list = tests.TestIdList(test_names)
1894
 
        filtered_suite = filter_suite_by_condition(
 
2461
        filtered_suite = tests.filter_suite_by_condition(
1895
2462
            self.suite, tests.condition_id_in_list(id_list))
1896
2463
        my_pattern = 'TestSelftestFiltering.*test_condition_id_in_list'
1897
 
        re_filtered = filter_suite_by_re(self.suite, my_pattern)
 
2464
        re_filtered = tests.filter_suite_by_re(self.suite, my_pattern)
1898
2465
        self.assertEqual(_test_ids(re_filtered), _test_ids(filtered_suite))
1899
2466
 
1900
2467
    def test_condition_id_startswith(self):
1904
2471
        test_names = [ klass + 'test_condition_id_in_list',
1905
2472
                      klass + 'test_condition_id_startswith',
1906
2473
                     ]
1907
 
        filtered_suite = filter_suite_by_condition(
 
2474
        filtered_suite = tests.filter_suite_by_condition(
1908
2475
            self.suite, tests.condition_id_startswith([start1, start2]))
1909
2476
        self.assertEqual(test_names, _test_ids(filtered_suite))
1910
2477
 
1911
2478
    def test_condition_isinstance(self):
1912
 
        filtered_suite = filter_suite_by_condition(self.suite,
1913
 
            condition_isinstance(self.__class__))
 
2479
        filtered_suite = tests.filter_suite_by_condition(
 
2480
            self.suite, tests.condition_isinstance(self.__class__))
1914
2481
        class_pattern = 'bzrlib.tests.test_selftest.TestSelftestFiltering.'
1915
 
        re_filtered = filter_suite_by_re(self.suite, class_pattern)
 
2482
        re_filtered = tests.filter_suite_by_re(self.suite, class_pattern)
1916
2483
        self.assertEqual(_test_ids(re_filtered), _test_ids(filtered_suite))
1917
2484
 
1918
2485
    def test_exclude_tests_by_condition(self):
1919
2486
        excluded_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.'
1920
2487
            'test_exclude_tests_by_condition')
1921
 
        filtered_suite = exclude_tests_by_condition(self.suite,
 
2488
        filtered_suite = tests.exclude_tests_by_condition(self.suite,
1922
2489
            lambda x:x.id() == excluded_name)
1923
2490
        self.assertEqual(len(self.all_names) - 1,
1924
2491
            filtered_suite.countTestCases())
1929
2496
 
1930
2497
    def test_exclude_tests_by_re(self):
1931
2498
        self.all_names = _test_ids(self.suite)
1932
 
        filtered_suite = exclude_tests_by_re(self.suite, 'exclude_tests_by_re')
 
2499
        filtered_suite = tests.exclude_tests_by_re(self.suite,
 
2500
                                                   'exclude_tests_by_re')
1933
2501
        excluded_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.'
1934
2502
            'test_exclude_tests_by_re')
1935
2503
        self.assertEqual(len(self.all_names) - 1,
1942
2510
    def test_filter_suite_by_condition(self):
1943
2511
        test_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.'
1944
2512
            'test_filter_suite_by_condition')
1945
 
        filtered_suite = filter_suite_by_condition(self.suite,
 
2513
        filtered_suite = tests.filter_suite_by_condition(self.suite,
1946
2514
            lambda x:x.id() == test_name)
1947
2515
        self.assertEqual([test_name], _test_ids(filtered_suite))
1948
2516
 
1949
2517
    def test_filter_suite_by_re(self):
1950
 
        filtered_suite = filter_suite_by_re(self.suite, 'test_filter_suite_by_r')
 
2518
        filtered_suite = tests.filter_suite_by_re(self.suite,
 
2519
                                                  'test_filter_suite_by_r')
1951
2520
        filtered_names = _test_ids(filtered_suite)
1952
2521
        self.assertEqual(filtered_names, ['bzrlib.tests.test_selftest.'
1953
2522
            'TestSelftestFiltering.test_filter_suite_by_re'])
1981
2550
 
1982
2551
    def test_preserve_input(self):
1983
2552
        # NB: Surely this is something in the stdlib to do this?
1984
 
        self.assertTrue(self.suite is preserve_input(self.suite))
1985
 
        self.assertTrue("@#$" is preserve_input("@#$"))
 
2553
        self.assertTrue(self.suite is tests.preserve_input(self.suite))
 
2554
        self.assertTrue("@#$" is tests.preserve_input("@#$"))
1986
2555
 
1987
2556
    def test_randomize_suite(self):
1988
 
        randomized_suite = randomize_suite(self.suite)
 
2557
        randomized_suite = tests.randomize_suite(self.suite)
1989
2558
        # randomizing should not add or remove test names.
1990
2559
        self.assertEqual(set(_test_ids(self.suite)),
1991
2560
                         set(_test_ids(randomized_suite)))
2001
2570
 
2002
2571
    def test_split_suit_by_condition(self):
2003
2572
        self.all_names = _test_ids(self.suite)
2004
 
        condition = condition_id_re('test_filter_suite_by_r')
2005
 
        split_suite = split_suite_by_condition(self.suite, condition)
 
2573
        condition = tests.condition_id_re('test_filter_suite_by_r')
 
2574
        split_suite = tests.split_suite_by_condition(self.suite, condition)
2006
2575
        filtered_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.'
2007
2576
            'test_filter_suite_by_re')
2008
2577
        self.assertEqual([filtered_name], _test_ids(split_suite[0]))
2013
2582
 
2014
2583
    def test_split_suit_by_re(self):
2015
2584
        self.all_names = _test_ids(self.suite)
2016
 
        split_suite = split_suite_by_re(self.suite, 'test_filter_suite_by_r')
 
2585
        split_suite = tests.split_suite_by_re(self.suite,
 
2586
                                              'test_filter_suite_by_r')
2017
2587
        filtered_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.'
2018
2588
            'test_filter_suite_by_re')
2019
2589
        self.assertEqual([filtered_name], _test_ids(split_suite[0]))
2023
2593
        self.assertEqual(remaining_names, _test_ids(split_suite[1]))
2024
2594
 
2025
2595
 
2026
 
class TestCheckInventoryShape(TestCaseWithTransport):
 
2596
class TestCheckInventoryShape(tests.TestCaseWithTransport):
2027
2597
 
2028
2598
    def test_check_inventory_shape(self):
2029
2599
        files = ['a', 'b/', 'b/c']
2037
2607
            tree.unlock()
2038
2608
 
2039
2609
 
2040
 
class TestBlackboxSupport(TestCase):
 
2610
class TestBlackboxSupport(tests.TestCase):
2041
2611
    """Tests for testsuite blackbox features."""
2042
2612
 
2043
2613
    def test_run_bzr_failure_not_caught(self):
2051
2621
        # the test framework
2052
2622
        self.assertEquals('always fails', str(e))
2053
2623
        # check that there's no traceback in the test log
2054
 
        self.assertNotContainsRe(self._get_log(keep_log_file=True),
2055
 
            r'Traceback')
 
2624
        self.assertNotContainsRe(self.get_log(), r'Traceback')
2056
2625
 
2057
2626
    def test_run_bzr_user_error_caught(self):
2058
2627
        # Running bzr in blackbox mode, normal/expected/user errors should be
2059
2628
        # caught in the regular way and turned into an error message plus exit
2060
2629
        # code.
2061
 
        out, err = self.run_bzr(["log", "/nonexistantpath"], retcode=3)
 
2630
        transport_server = memory.MemoryServer()
 
2631
        transport_server.start_server()
 
2632
        self.addCleanup(transport_server.stop_server)
 
2633
        url = transport_server.get_url()
 
2634
        self.permit_url(url)
 
2635
        out, err = self.run_bzr(["log", "%s/nonexistantpath" % url], retcode=3)
2062
2636
        self.assertEqual(out, '')
2063
2637
        self.assertContainsRe(err,
2064
2638
            'bzr: ERROR: Not a branch: ".*nonexistantpath/".\n')
2065
2639
 
2066
2640
 
2067
 
class TestTestLoader(TestCase):
 
2641
class TestTestLoader(tests.TestCase):
2068
2642
    """Tests for the test loader."""
2069
2643
 
2070
2644
    def _get_loader_and_module(self):
2071
2645
        """Gets a TestLoader and a module with one test in it."""
2072
2646
        loader = TestUtil.TestLoader()
2073
2647
        module = {}
2074
 
        class Stub(TestCase):
 
2648
        class Stub(tests.TestCase):
2075
2649
            def test_foo(self):
2076
2650
                pass
2077
2651
        class MyModule(object):
2090
2664
        # load_tests do not need that :)
2091
2665
        def load_tests(self, standard_tests, module, loader):
2092
2666
            result = loader.suiteClass()
2093
 
            for test in iter_suite_tests(standard_tests):
 
2667
            for test in tests.iter_suite_tests(standard_tests):
2094
2668
                result.addTests([test, test])
2095
2669
            return result
2096
2670
        # add a load_tests() method which multiplies the tests from the module.
2115
2689
 
2116
2690
    def _create_suite(self, test_id_list):
2117
2691
 
2118
 
        class Stub(TestCase):
 
2692
        class Stub(tests.TestCase):
2119
2693
            def test_foo(self):
2120
2694
                pass
2121
2695
 
2131
2705
 
2132
2706
    def _test_ids(self, test_suite):
2133
2707
        """Get the ids for the tests in a test suite."""
2134
 
        return [t.id() for t in iter_suite_tests(test_suite)]
 
2708
        return [t.id() for t in tests.iter_suite_tests(test_suite)]
2135
2709
 
2136
2710
    def test_empty_list(self):
2137
2711
        id_list = self._create_id_list([])
2163
2737
        self.assertTrue(id_list.refers_to('mod.class'))
2164
2738
        self.assertTrue(id_list.refers_to('mod.class.meth'))
2165
2739
 
2166
 
    def test_test_suite(self):
2167
 
        # This test is slow, so we do a single test with one test in each
2168
 
        # category
2169
 
        test_list = [
2170
 
            # testmod_names
2171
 
            'bzrlib.tests.blackbox.test_branch.TestBranch.test_branch',
2172
 
            'bzrlib.tests.test_selftest.TestTestIdList.test_test_suite',
2173
 
            # transport implementations
2174
 
            'bzrlib.tests.test_transport_implementations.TransportTests'
2175
 
            '.test_abspath(LocalURLServer)',
2176
 
            # modules_to_doctest
2177
 
            'bzrlib.timestamp.format_highres_date',
2178
 
            # plugins can't be tested that way since selftest may be run with
2179
 
            # --no-plugins
2180
 
            ]
2181
 
        suite = tests.test_suite(test_list)
2182
 
        self.assertEquals(test_list, _test_ids(suite))
2183
 
 
2184
2740
    def test_test_suite_matches_id_list_with_unknown(self):
2185
2741
        loader = TestUtil.TestLoader()
2186
2742
        suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler')
2194
2750
        loader = TestUtil.TestLoader()
2195
2751
        suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler')
2196
2752
        dupes = loader.suiteClass()
2197
 
        for test in iter_suite_tests(suite):
 
2753
        for test in tests.iter_suite_tests(suite):
2198
2754
            dupes.addTest(test)
2199
2755
            dupes.addTest(test) # Add it again
2200
2756
 
2206
2762
                          duplicates)
2207
2763
 
2208
2764
 
 
2765
class TestTestSuite(tests.TestCase):
 
2766
 
 
2767
    def test__test_suite_testmod_names(self):
 
2768
        # Test that a plausible list of test module names are returned
 
2769
        # by _test_suite_testmod_names.
 
2770
        test_list = tests._test_suite_testmod_names()
 
2771
        self.assertSubset([
 
2772
            'bzrlib.tests.blackbox',
 
2773
            'bzrlib.tests.per_transport',
 
2774
            'bzrlib.tests.test_selftest',
 
2775
            ],
 
2776
            test_list)
 
2777
 
 
2778
    def test__test_suite_modules_to_doctest(self):
 
2779
        # Test that a plausible list of modules to doctest is returned
 
2780
        # by _test_suite_modules_to_doctest.
 
2781
        test_list = tests._test_suite_modules_to_doctest()
 
2782
        if __doc__ is None:
 
2783
            # When docstrings are stripped, there are no modules to doctest
 
2784
            self.assertEqual([], test_list)
 
2785
            return
 
2786
        self.assertSubset([
 
2787
            'bzrlib.timestamp',
 
2788
            ],
 
2789
            test_list)
 
2790
 
 
2791
    def test_test_suite(self):
 
2792
        # test_suite() loads the entire test suite to operate. To avoid this
 
2793
        # overhead, and yet still be confident that things are happening,
 
2794
        # we temporarily replace two functions used by test_suite with 
 
2795
        # test doubles that supply a few sample tests to load, and check they
 
2796
        # are loaded.
 
2797
        calls = []
 
2798
        def testmod_names():
 
2799
            calls.append("testmod_names")
 
2800
            return [
 
2801
                'bzrlib.tests.blackbox.test_branch',
 
2802
                'bzrlib.tests.per_transport',
 
2803
                'bzrlib.tests.test_selftest',
 
2804
                ]
 
2805
        self.overrideAttr(tests, '_test_suite_testmod_names', testmod_names)
 
2806
        def doctests():
 
2807
            calls.append("modules_to_doctest")
 
2808
            if __doc__ is None:
 
2809
                return []
 
2810
            return ['bzrlib.timestamp']
 
2811
        self.overrideAttr(tests, '_test_suite_modules_to_doctest', doctests)
 
2812
        expected_test_list = [
 
2813
            # testmod_names
 
2814
            'bzrlib.tests.blackbox.test_branch.TestBranch.test_branch',
 
2815
            ('bzrlib.tests.per_transport.TransportTests'
 
2816
             '.test_abspath(LocalTransport,LocalURLServer)'),
 
2817
            'bzrlib.tests.test_selftest.TestTestSuite.test_test_suite',
 
2818
            # plugins can't be tested that way since selftest may be run with
 
2819
            # --no-plugins
 
2820
            ]
 
2821
        if __doc__ is not None:
 
2822
            expected_test_list.extend([
 
2823
                # modules_to_doctest
 
2824
                'bzrlib.timestamp.format_highres_date',
 
2825
                ])
 
2826
        suite = tests.test_suite()
 
2827
        self.assertEqual(set(["testmod_names", "modules_to_doctest"]),
 
2828
            set(calls))
 
2829
        self.assertSubset(expected_test_list, _test_ids(suite))
 
2830
 
 
2831
    def test_test_suite_list_and_start(self):
 
2832
        # We cannot test this at the same time as the main load, because we want
 
2833
        # to know that starting_with == None works. So a second load is
 
2834
        # incurred - note that the starting_with parameter causes a partial load
 
2835
        # rather than a full load so this test should be pretty quick.
 
2836
        test_list = ['bzrlib.tests.test_selftest.TestTestSuite.test_test_suite']
 
2837
        suite = tests.test_suite(test_list,
 
2838
                                 ['bzrlib.tests.test_selftest.TestTestSuite'])
 
2839
        # test_test_suite_list_and_start is not included 
 
2840
        self.assertEquals(test_list, _test_ids(suite))
 
2841
 
 
2842
 
2209
2843
class TestLoadTestIdList(tests.TestCaseInTempDir):
2210
2844
 
2211
2845
    def _create_test_list_file(self, file_name, content):
2249
2883
    def test_load_tests(self):
2250
2884
        test_list = ['bzrlib.tests.test_sampler.DemoTest.test_nothing']
2251
2885
        loader = self._create_loader(test_list)
2252
 
 
2253
2886
        suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler')
2254
2887
        self.assertEquals(test_list, _test_ids(suite))
2255
2888
 
2256
2889
    def test_exclude_tests(self):
2257
2890
        test_list = ['bogus']
2258
2891
        loader = self._create_loader(test_list)
2259
 
 
2260
2892
        suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler')
2261
2893
        self.assertEquals([], _test_ids(suite))
2262
2894
 
2307
2939
        tpr.register('bar', 'bbb.aaa.rrr')
2308
2940
        tpr.register('bar', 'bBB.aAA.rRR')
2309
2941
        self.assertEquals('bbb.aaa.rrr', tpr.get('bar'))
2310
 
        self.assertContainsRe(self._get_log(keep_log_file=True),
2311
 
                              r'.*bar.*bbb.aaa.rrr.*bBB.aAA.rRR')
 
2942
        self.assertThat(self.get_log(),
 
2943
            DocTestMatches("...bar...bbb.aaa.rrr...BB.aAA.rRR", ELLIPSIS))
2312
2944
 
2313
2945
    def test_get_unknown_prefix(self):
2314
2946
        tpr = self._get_registry()
2334
2966
        self.assertEquals('bzrlib.plugins', tpr.resolve_alias('bp'))
2335
2967
 
2336
2968
 
2337
 
class TestRunSuite(TestCase):
 
2969
class TestRunSuite(tests.TestCase):
2338
2970
 
2339
2971
    def test_runner_class(self):
2340
2972
        """run_suite accepts and uses a runner_class keyword argument."""
2341
 
        class Stub(TestCase):
 
2973
        class Stub(tests.TestCase):
2342
2974
            def test_foo(self):
2343
2975
                pass
2344
2976
        suite = Stub("test_foo")
2345
2977
        calls = []
2346
 
        class MyRunner(TextTestRunner):
 
2978
        class MyRunner(tests.TextTestRunner):
2347
2979
            def run(self, test):
2348
2980
                calls.append(test)
2349
 
                return ExtendedTestResult(self.stream, self.descriptions,
2350
 
                    self.verbosity)
2351
 
        run_suite(suite, runner_class=MyRunner)
2352
 
        self.assertEqual(calls, [suite])
 
2981
                return tests.ExtendedTestResult(self.stream, self.descriptions,
 
2982
                                                self.verbosity)
 
2983
        tests.run_suite(suite, runner_class=MyRunner, stream=StringIO())
 
2984
        self.assertLength(1, calls)