/brz/remove-bazaar

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

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

  • Committer: Frank Aspell
  • Date: 2009-02-22 16:54:02 UTC
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: frankaspell@googlemail.com-20090222165402-2myrucnu7er5w4ha
Fixing various typos

Show diffs side-by-side

added added

removed removed

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