/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

(vila) Fix 199440 by taking allowing no password in a section

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007 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
 
    branchbuilder,
39
29
    bzrdir,
40
 
    debug,
41
30
    errors,
42
 
    lockdir,
43
31
    memorytree,
44
32
    osutils,
45
 
    progress,
46
 
    remote,
47
33
    repository,
48
34
    symbol_versioning,
49
35
    tests,
50
 
    transport,
51
 
    workingtree,
52
 
    )
53
 
from bzrlib.repofmt import (
54
 
    groupcompress_repo,
55
 
    pack_repo,
56
 
    weaverepo,
57
 
    )
 
36
    )
 
37
from bzrlib.progress import _BaseProgressBar
 
38
from bzrlib.repofmt import weaverepo
58
39
from bzrlib.symbol_versioning import (
59
 
    deprecated_function,
60
 
    deprecated_in,
61
 
    deprecated_method,
 
40
    one_zero,
 
41
    zero_eleven,
 
42
    zero_ten,
62
43
    )
63
44
from bzrlib.tests import (
64
 
    features,
65
 
    test_lsprof,
66
 
    test_server,
67
 
    test_sftp_transport,
68
 
    TestUtil,
69
 
    )
 
45
                          ChrootedTestCase,
 
46
                          ExtendedTestResult,
 
47
                          Feature,
 
48
                          KnownFailure,
 
49
                          TestCase,
 
50
                          TestCaseInTempDir,
 
51
                          TestCaseWithMemoryTransport,
 
52
                          TestCaseWithTransport,
 
53
                          TestNotApplicable,
 
54
                          TestSkipped,
 
55
                          TestSuite,
 
56
                          TestUtil,
 
57
                          TextTestRunner,
 
58
                          UnavailableFeature,
 
59
                          condition_id_re,
 
60
                          condition_isinstance,
 
61
                          exclude_tests_by_condition,
 
62
                          exclude_tests_by_re,
 
63
                          filter_suite_by_condition,
 
64
                          filter_suite_by_re,
 
65
                          iter_suite_tests,
 
66
                          preserve_input,
 
67
                          randomize_suite,
 
68
                          split_suite_by_re,
 
69
                          test_lsprof,
 
70
                          test_suite,
 
71
                          )
 
72
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
 
73
from bzrlib.tests.TestUtil import _load_module_by_name
70
74
from bzrlib.trace import note
71
 
from bzrlib.transport import memory
 
75
from bzrlib.transport.memory import MemoryServer, MemoryTransport
72
76
from bzrlib.version import _get_bzr_source_tree
73
77
 
74
78
 
75
79
def _test_ids(test_suite):
76
80
    """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):
 
81
    return [t.id() for t in iter_suite_tests(test_suite)]
 
82
 
 
83
 
 
84
class SelftestTests(TestCase):
81
85
 
82
86
    def test_import_tests(self):
83
 
        mod = TestUtil._load_module_by_name('bzrlib.tests.test_selftest')
 
87
        mod = _load_module_by_name('bzrlib.tests.test_selftest')
84
88
        self.assertEqual(mod.SelftestTests, SelftestTests)
85
89
 
86
90
    def test_import_test_failure(self):
87
91
        self.assertRaises(ImportError,
88
 
                          TestUtil._load_module_by_name,
 
92
                          _load_module_by_name,
89
93
                          'bzrlib.no-name-yet')
90
94
 
91
 
 
92
 
class MetaTestLog(tests.TestCase):
 
95
class MetaTestLog(TestCase):
93
96
 
94
97
    def test_logging(self):
95
98
        """Test logs are captured when a test fails."""
96
99
        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):
107
 
 
108
 
    def test_probe_passes(self):
109
 
        """UnicodeFilename._probe passes."""
110
 
        # We can't test much more than that because the behaviour depends
111
 
        # on the platform.
112
 
        tests.UnicodeFilename._probe()
113
 
 
114
 
 
115
 
class TestTreeShape(tests.TestCaseInTempDir):
 
100
        self._log_file.flush()
 
101
        self.assertContainsRe(self._get_log(keep_log_file=True),
 
102
                              'a test message\n')
 
103
 
 
104
 
 
105
class TestTreeShape(TestCaseInTempDir):
116
106
 
117
107
    def test_unicode_paths(self):
118
 
        self.requireFeature(tests.UnicodeFilename)
119
 
 
120
108
        filename = u'hell\u00d8'
121
 
        self.build_tree_contents([(filename, 'contents of hello')])
 
109
        try:
 
110
            self.build_tree_contents([(filename, 'contents of hello')])
 
111
        except UnicodeEncodeError:
 
112
            raise TestSkipped("can't build unicode working tree in "
 
113
                "filesystem encoding %s" % sys.getfilesystemencoding())
122
114
        self.failUnlessExists(filename)
123
115
 
124
116
 
125
 
class TestTransportScenarios(tests.TestCase):
 
117
class TestTransportProviderAdapter(TestCase):
126
118
    """A group of tests that test the transport implementation adaption core.
127
119
 
128
 
    This is a meta test that the tests are applied to all available
 
120
    This is a meta test that the tests are applied to all available 
129
121
    transports.
130
122
 
131
 
    This will be generalised in the future which is why it is in this
 
123
    This will be generalised in the future which is why it is in this 
132
124
    test file even though it is specific to transport tests at the moment.
133
125
    """
134
126
 
135
127
    def test_get_transport_permutations(self):
136
 
        # this checks that get_test_permutations defined by the module is
137
 
        # called by the get_transport_test_permutations function.
 
128
        # this checks that we the module get_test_permutations call
 
129
        # is made by the adapter get_transport_test_permitations method.
138
130
        class MockModule(object):
139
131
            def get_test_permutations(self):
140
132
                return sample_permutation
141
133
        sample_permutation = [(1,2), (3,4)]
142
 
        from bzrlib.tests.per_transport import get_transport_test_permutations
 
134
        from bzrlib.tests.test_transport_implementations \
 
135
            import TransportTestProviderAdapter
 
136
        adapter = TransportTestProviderAdapter()
143
137
        self.assertEqual(sample_permutation,
144
 
                         get_transport_test_permutations(MockModule()))
 
138
                         adapter.get_transport_test_permutations(MockModule()))
145
139
 
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
 
140
    def test_adapter_checks_all_modules(self):
 
141
        # this checks that the adapter returns as many permurtations as
 
142
        # there are in all the registered# transport modules for there
 
143
        # - we assume if this matches its probably doing the right thing
 
144
        # especially in combination with the tests for setting the right
 
145
        # classes below.
 
146
        from bzrlib.tests.test_transport_implementations \
 
147
            import TransportTestProviderAdapter
152
148
        from bzrlib.transport import _get_transport_modules
153
149
        modules = _get_transport_modules()
154
150
        permutation_count = 0
155
151
        for module in modules:
156
152
            try:
157
 
                permutation_count += len(reduce(getattr,
 
153
                permutation_count += len(reduce(getattr, 
158
154
                    (module + ".get_test_permutations").split('.')[1:],
159
155
                     __import__(module))())
160
156
            except errors.DependencyNotPresent:
161
157
                pass
162
 
        scenarios = transport_test_permutations()
163
 
        self.assertEqual(permutation_count, len(scenarios))
 
158
        input_test = TestTransportProviderAdapter(
 
159
            "test_adapter_sets_transport_class")
 
160
        adapter = TransportTestProviderAdapter()
 
161
        self.assertEqual(permutation_count,
 
162
                         len(list(iter(adapter.adapt(input_test)))))
164
163
 
165
 
    def test_scenarios_include_transport_class(self):
 
164
    def test_adapter_sets_transport_class(self):
 
165
        # Check that the test adapter inserts a transport and server into the
 
166
        # generated test.
 
167
        #
166
168
        # This test used to know about all the possible transports and the
167
169
        # order they were returned but that seems overly brittle (mbp
168
170
        # 20060307)
169
 
        from bzrlib.tests.per_transport import transport_test_permutations
170
 
        scenarios = transport_test_permutations()
 
171
        from bzrlib.tests.test_transport_implementations \
 
172
            import TransportTestProviderAdapter
 
173
        scenarios = TransportTestProviderAdapter().scenarios
171
174
        # there are at least that many builtin transports
172
175
        self.assertTrue(len(scenarios) > 6)
173
176
        one_scenario = scenarios[0]
178
181
                                   bzrlib.transport.Server))
179
182
 
180
183
 
181
 
class TestBranchScenarios(tests.TestCase):
 
184
class TestBranchProviderAdapter(TestCase):
 
185
    """A group of tests that test the branch implementation test adapter."""
182
186
 
183
 
    def test_scenarios(self):
 
187
    def test_constructor(self):
184
188
        # check that constructor parameters are passed through to the adapted
185
189
        # test.
186
 
        from bzrlib.tests.per_branch import make_scenarios
 
190
        from bzrlib.tests.branch_implementations import BranchTestProviderAdapter
187
191
        server1 = "a"
188
192
        server2 = "b"
189
193
        formats = [("c", "C"), ("d", "D")]
190
 
        scenarios = make_scenarios(server1, server2, formats)
191
 
        self.assertEqual(2, len(scenarios))
 
194
        adapter = BranchTestProviderAdapter(server1, server2, formats)
 
195
        self.assertEqual(2, len(adapter.scenarios))
192
196
        self.assertEqual([
193
197
            ('str',
194
198
             {'branch_format': 'c',
200
204
              'bzrdir_format': 'D',
201
205
              'transport_readonly_server': 'b',
202
206
              'transport_server': 'a'})],
203
 
            scenarios)
204
 
 
205
 
 
206
 
class TestBzrDirScenarios(tests.TestCase):
207
 
 
208
 
    def test_scenarios(self):
 
207
            adapter.scenarios)
 
208
 
 
209
 
 
210
class TestBzrDirProviderAdapter(TestCase):
 
211
    """A group of tests that test the bzr dir implementation test adapter."""
 
212
 
 
213
    def test_adapted_tests(self):
209
214
        # check that constructor parameters are passed through to the adapted
210
215
        # test.
211
 
        from bzrlib.tests.per_bzrdir import make_scenarios
 
216
        from bzrlib.tests.bzrdir_implementations import BzrDirTestProviderAdapter
212
217
        vfs_factory = "v"
213
218
        server1 = "a"
214
219
        server2 = "b"
215
220
        formats = ["c", "d"]
216
 
        scenarios = make_scenarios(vfs_factory, server1, server2, formats)
 
221
        adapter = BzrDirTestProviderAdapter(vfs_factory,
 
222
            server1, server2, formats)
217
223
        self.assertEqual([
218
224
            ('str',
219
225
             {'bzrdir_format': 'c',
225
231
              'transport_readonly_server': 'b',
226
232
              'transport_server': 'a',
227
233
              'vfs_transport_factory': 'v'})],
228
 
            scenarios)
229
 
 
230
 
 
231
 
class TestRepositoryScenarios(tests.TestCase):
 
234
            adapter.scenarios)
 
235
 
 
236
 
 
237
class TestRepositoryProviderAdapter(TestCase):
 
238
    """A group of tests that test the repository implementation test adapter."""
 
239
 
 
240
    def test_constructor(self):
 
241
        # check that constructor parameters are passed through to the
 
242
        # scenarios.
 
243
        from bzrlib.tests.repository_implementations import RepositoryTestProviderAdapter
 
244
        server1 = "a"
 
245
        server2 = "b"
 
246
        formats = [("c", "C"), ("d", "D")]
 
247
        adapter = RepositoryTestProviderAdapter(server1, server2, formats)
 
248
        self.assertEqual([
 
249
            ('str',
 
250
             {'bzrdir_format': 'C',
 
251
              'repository_format': 'c',
 
252
              'transport_readonly_server': 'b',
 
253
              'transport_server': 'a'}),
 
254
            ('str',
 
255
             {'bzrdir_format': 'D',
 
256
              'repository_format': 'd',
 
257
              'transport_readonly_server': 'b',
 
258
              'transport_server': 'a'})],
 
259
            adapter.scenarios)
 
260
 
 
261
    def test_setting_vfs_transport(self):
 
262
        """The vfs_transport_factory can be set optionally."""
 
263
        from bzrlib.tests.repository_implementations import RepositoryTestProviderAdapter
 
264
        formats = [("a", "b"), ("c", "d")]
 
265
        adapter = RepositoryTestProviderAdapter(None, None, formats,
 
266
            vfs_transport_factory="vfs")
 
267
        self.assertEqual([
 
268
            ('str',
 
269
             {'bzrdir_format': 'b',
 
270
              'repository_format': 'a',
 
271
              'transport_readonly_server': None,
 
272
              'transport_server': None,
 
273
              'vfs_transport_factory': 'vfs'}),
 
274
            ('str',
 
275
             {'bzrdir_format': 'd',
 
276
              'repository_format': 'c',
 
277
              'transport_readonly_server': None,
 
278
              'transport_server': None,
 
279
              'vfs_transport_factory': 'vfs'})],
 
280
            adapter.scenarios)
232
281
 
233
282
    def test_formats_to_scenarios(self):
234
 
        from bzrlib.tests.per_repository import formats_to_scenarios
235
 
        formats = [("(c)", remote.RemoteRepositoryFormat()),
236
 
                   ("(d)", repository.format_registry.get(
237
 
                    'Bazaar repository format 2a (needs bzr 1.16 or later)\n'))]
238
 
        no_vfs_scenarios = formats_to_scenarios(formats, "server", "readonly",
239
 
            None)
240
 
        vfs_scenarios = formats_to_scenarios(formats, "server", "readonly",
241
 
            vfs_transport_factory="vfs")
242
 
        # no_vfs generate scenarios without vfs_transport_factory
243
 
        expected = [
244
 
            ('RemoteRepositoryFormat(c)',
245
 
             {'bzrdir_format': remote.RemoteBzrDirFormat(),
246
 
              'repository_format': remote.RemoteRepositoryFormat(),
 
283
        """The adapter can generate all the scenarios needed."""
 
284
        from bzrlib.tests.repository_implementations import RepositoryTestProviderAdapter
 
285
        no_vfs_adapter = RepositoryTestProviderAdapter("server", "readonly",
 
286
            [], None)
 
287
        vfs_adapter = RepositoryTestProviderAdapter("server", "readonly",
 
288
            [], vfs_transport_factory="vfs")
 
289
        # no_vfs generate scenarios without vfs_transport_factor
 
290
        formats = [("c", "C"), (1, "D")]
 
291
        self.assertEqual([
 
292
            ('str',
 
293
             {'bzrdir_format': 'C',
 
294
              'repository_format': 'c',
247
295
              'transport_readonly_server': 'readonly',
248
296
              'transport_server': 'server'}),
249
 
            ('RepositoryFormat2a(d)',
250
 
             {'bzrdir_format': bzrdir.BzrDirMetaFormat1(),
251
 
              'repository_format': groupcompress_repo.RepositoryFormat2a(),
 
297
            ('int',
 
298
             {'bzrdir_format': 'D',
 
299
              'repository_format': 1,
252
300
              'transport_readonly_server': 'readonly',
253
 
              'transport_server': 'server'})]
254
 
        self.assertEqual(expected, no_vfs_scenarios)
 
301
              'transport_server': 'server'})],
 
302
            no_vfs_adapter.formats_to_scenarios(formats))
255
303
        self.assertEqual([
256
 
            ('RemoteRepositoryFormat(c)',
257
 
             {'bzrdir_format': remote.RemoteBzrDirFormat(),
258
 
              'repository_format': remote.RemoteRepositoryFormat(),
 
304
            ('str',
 
305
             {'bzrdir_format': 'C',
 
306
              'repository_format': 'c',
259
307
              'transport_readonly_server': 'readonly',
260
308
              'transport_server': 'server',
261
309
              'vfs_transport_factory': 'vfs'}),
262
 
            ('RepositoryFormat2a(d)',
263
 
             {'bzrdir_format': bzrdir.BzrDirMetaFormat1(),
264
 
              'repository_format': groupcompress_repo.RepositoryFormat2a(),
 
310
            ('int',
 
311
             {'bzrdir_format': 'D',
 
312
              'repository_format': 1,
265
313
              'transport_readonly_server': 'readonly',
266
314
              'transport_server': 'server',
267
315
              'vfs_transport_factory': 'vfs'})],
268
 
            vfs_scenarios)
269
 
 
270
 
 
271
 
class TestTestScenarioApplication(tests.TestCase):
 
316
            vfs_adapter.formats_to_scenarios(formats))
 
317
 
 
318
 
 
319
class TestTestScenarioApplier(TestCase):
272
320
    """Tests for the test adaption facilities."""
273
321
 
274
 
    def test_apply_scenario(self):
275
 
        from bzrlib.tests import apply_scenario
276
 
        input_test = TestTestScenarioApplication("test_apply_scenario")
 
322
    def test_adapt_applies_scenarios(self):
 
323
        from bzrlib.tests.repository_implementations import TestScenarioApplier
 
324
        input_test = TestTestScenarioApplier("test_adapt_test_to_scenario")
 
325
        adapter = TestScenarioApplier()
 
326
        adapter.scenarios = [("1", "dict"), ("2", "settings")]
 
327
        calls = []
 
328
        def capture_call(test, scenario):
 
329
            calls.append((test, scenario))
 
330
            return test
 
331
        adapter.adapt_test_to_scenario = capture_call
 
332
        adapter.adapt(input_test)
 
333
        self.assertEqual([(input_test, ("1", "dict")),
 
334
            (input_test, ("2", "settings"))], calls)
 
335
 
 
336
    def test_adapt_test_to_scenario(self):
 
337
        from bzrlib.tests.repository_implementations import TestScenarioApplier
 
338
        input_test = TestTestScenarioApplier("test_adapt_test_to_scenario")
 
339
        adapter = TestScenarioApplier()
277
340
        # setup two adapted tests
278
 
        adapted_test1 = apply_scenario(input_test,
 
341
        adapted_test1 = adapter.adapt_test_to_scenario(input_test,
279
342
            ("new id",
280
343
            {"bzrdir_format":"bzr_format",
281
344
             "repository_format":"repo_fmt",
282
345
             "transport_server":"transport_server",
283
346
             "transport_readonly_server":"readonly-server"}))
284
 
        adapted_test2 = apply_scenario(input_test,
 
347
        adapted_test2 = adapter.adapt_test_to_scenario(input_test,
285
348
            ("new id 2", {"bzrdir_format":None}))
286
349
        # input_test should have been altered.
287
350
        self.assertRaises(AttributeError, getattr, input_test, "bzrdir_format")
288
 
        # the new tests are mutually incompatible, ensuring it has
 
351
        # the new tests are mutually incompatible, ensuring it has 
289
352
        # made new ones, and unspecified elements in the scenario
290
353
        # should not have been altered.
291
354
        self.assertEqual("bzr_format", adapted_test1.bzrdir_format)
294
357
        self.assertEqual("readonly-server",
295
358
            adapted_test1.transport_readonly_server)
296
359
        self.assertEqual(
297
 
            "bzrlib.tests.test_selftest.TestTestScenarioApplication."
298
 
            "test_apply_scenario(new id)",
 
360
            "bzrlib.tests.test_selftest.TestTestScenarioApplier."
 
361
            "test_adapt_test_to_scenario(new id)",
299
362
            adapted_test1.id())
300
363
        self.assertEqual(None, adapted_test2.bzrdir_format)
301
364
        self.assertEqual(
302
 
            "bzrlib.tests.test_selftest.TestTestScenarioApplication."
303
 
            "test_apply_scenario(new id 2)",
 
365
            "bzrlib.tests.test_selftest.TestTestScenarioApplier."
 
366
            "test_adapt_test_to_scenario(new id 2)",
304
367
            adapted_test2.id())
305
368
 
306
369
 
307
 
class TestInterRepositoryScenarios(tests.TestCase):
 
370
class TestInterRepositoryProviderAdapter(TestCase):
 
371
    """A group of tests that test the InterRepository test adapter."""
308
372
 
309
 
    def test_scenarios(self):
 
373
    def test_adapted_tests(self):
310
374
        # check that constructor parameters are passed through to the adapted
311
375
        # test.
312
 
        from bzrlib.tests.per_interrepository import make_scenarios
 
376
        from bzrlib.tests.interrepository_implementations import \
 
377
            InterRepositoryTestProviderAdapter
313
378
        server1 = "a"
314
379
        server2 = "b"
315
 
        formats = [("C0", "C1", "C2"), ("D0", "D1", "D2")]
316
 
        scenarios = make_scenarios(server1, server2, formats)
 
380
        formats = [(str, "C1", "C2"), (int, "D1", "D2")]
 
381
        adapter = InterRepositoryTestProviderAdapter(server1, server2, formats)
317
382
        self.assertEqual([
318
 
            ('C0,str,str',
319
 
             {'repository_format': 'C1',
 
383
            ('str,str,str',
 
384
             {'interrepo_class': str,
 
385
              'repository_format': 'C1',
320
386
              'repository_format_to': 'C2',
321
387
              'transport_readonly_server': 'b',
322
388
              'transport_server': 'a'}),
323
 
            ('D0,str,str',
324
 
             {'repository_format': 'D1',
 
389
            ('int,str,str',
 
390
             {'interrepo_class': int,
 
391
              'repository_format': 'D1',
325
392
              'repository_format_to': 'D2',
326
393
              'transport_readonly_server': 'b',
327
394
              'transport_server': 'a'})],
328
 
            scenarios)
329
 
 
330
 
 
331
 
class TestWorkingTreeScenarios(tests.TestCase):
332
 
 
333
 
    def test_scenarios(self):
334
 
        # check that constructor parameters are passed through to the adapted
335
 
        # test.
336
 
        from bzrlib.tests.per_workingtree import make_scenarios
337
 
        server1 = "a"
338
 
        server2 = "b"
339
 
        formats = [workingtree.WorkingTreeFormat2(),
340
 
                   workingtree.WorkingTreeFormat3(),]
341
 
        scenarios = make_scenarios(server1, server2, formats)
342
 
        self.assertEqual([
343
 
            ('WorkingTreeFormat2',
344
 
             {'bzrdir_format': formats[0]._matchingbzrdir,
345
 
              'transport_readonly_server': 'b',
346
 
              'transport_server': 'a',
347
 
              'workingtree_format': formats[0]}),
348
 
            ('WorkingTreeFormat3',
349
 
             {'bzrdir_format': formats[1]._matchingbzrdir,
350
 
              'transport_readonly_server': 'b',
351
 
              'transport_server': 'a',
352
 
              '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,
 
395
            adapter.formats_to_scenarios(formats))
 
396
 
 
397
 
 
398
class TestInterVersionedFileProviderAdapter(TestCase):
 
399
    """A group of tests that test the InterVersionedFile test adapter."""
 
400
 
 
401
    def test_scenarios(self):
 
402
        # check that constructor parameters are passed through to the adapted
 
403
        # test.
 
404
        from bzrlib.tests.interversionedfile_implementations \
 
405
            import InterVersionedFileTestProviderAdapter
 
406
        server1 = "a"
 
407
        server2 = "b"
 
408
        formats = [(str, "C1", "C2"), (int, "D1", "D2")]
 
409
        adapter = InterVersionedFileTestProviderAdapter(server1, server2, formats)
 
410
        self.assertEqual([
 
411
            ('str',
 
412
             {'interversionedfile_class':str,
 
413
              'transport_readonly_server': 'b',
 
414
              'transport_server': 'a',
 
415
              'versionedfile_factory': 'C1',
 
416
              'versionedfile_factory_to': 'C2'}),
 
417
            ('int',
 
418
             {'interversionedfile_class': int,
 
419
              'transport_readonly_server': 'b',
 
420
              'transport_server': 'a',
 
421
              'versionedfile_factory': 'D1',
 
422
              'versionedfile_factory_to': 'D2'})],
 
423
            adapter.scenarios)
 
424
 
 
425
 
 
426
class TestRevisionStoreProviderAdapter(TestCase):
 
427
    """A group of tests that test the RevisionStore test adapter."""
 
428
 
 
429
    def test_scenarios(self):
 
430
        # check that constructor parameters are passed through to the adapted
 
431
        # test.
 
432
        from bzrlib.tests.revisionstore_implementations \
 
433
            import RevisionStoreTestProviderAdapter
 
434
        # revision stores need a store factory - i.e. RevisionKnit
 
435
        #, a readonly and rw transport 
 
436
        # transport servers:
 
437
        server1 = "a"
 
438
        server2 = "b"
 
439
        store_factories = ["c", "d"]
 
440
        adapter = RevisionStoreTestProviderAdapter(server1, server2, store_factories)
 
441
        self.assertEqual([
 
442
            ('c',
 
443
             {'store_factory': 'c',
 
444
              'transport_readonly_server': 'b',
 
445
              'transport_server': 'a'}),
 
446
            ('d',
 
447
             {'store_factory': 'd',
 
448
              'transport_readonly_server': 'b',
 
449
              'transport_server': 'a'})],
 
450
            adapter.scenarios)
 
451
 
 
452
 
 
453
class TestWorkingTreeProviderAdapter(TestCase):
 
454
    """A group of tests that test the workingtree implementation test adapter."""
 
455
 
 
456
    def test_scenarios(self):
 
457
        # check that constructor parameters are passed through to the adapted
 
458
        # test.
 
459
        from bzrlib.tests.workingtree_implementations \
 
460
            import WorkingTreeTestProviderAdapter
 
461
        server1 = "a"
 
462
        server2 = "b"
 
463
        formats = [("c", "C"), ("d", "D")]
 
464
        adapter = WorkingTreeTestProviderAdapter(server1, server2, formats)
 
465
        self.assertEqual([
 
466
            ('str',
 
467
             {'bzrdir_format': 'C',
 
468
              'transport_readonly_server': 'b',
 
469
              'transport_server': 'a',
 
470
              'workingtree_format': 'c'}),
 
471
            ('str',
 
472
             {'bzrdir_format': 'D',
 
473
              'transport_readonly_server': 'b',
 
474
              'transport_server': 'a',
 
475
              'workingtree_format': 'd'})],
 
476
            adapter.scenarios)
 
477
 
 
478
 
 
479
class TestTreeProviderAdapter(TestCase):
 
480
    """Test the setup of tree_implementation tests."""
 
481
 
 
482
    def test_adapted_tests(self):
 
483
        # the tree implementation adapter is meant to setup one instance for
 
484
        # each working tree format, and one additional instance that will
 
485
        # use the default wt format, but create a revision tree for the tests.
 
486
        # this means that the wt ones should have the workingtree_to_test_tree
 
487
        # attribute set to 'return_parameter' and the revision one set to
 
488
        # revision_tree_from_workingtree.
 
489
 
 
490
        from bzrlib.tests.tree_implementations import (
 
491
            TreeTestProviderAdapter,
371
492
            return_parameter,
372
493
            revision_tree_from_workingtree
373
494
            )
 
495
        from bzrlib.workingtree import WorkingTreeFormat, WorkingTreeFormat3
 
496
        input_test = TestTreeProviderAdapter(
 
497
            "test_adapted_tests")
374
498
        server1 = "a"
375
499
        server2 = "b"
376
 
        formats = [workingtree.WorkingTreeFormat2(),
377
 
                   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):
 
500
        formats = [("c", "C"), ("d", "D")]
 
501
        adapter = TreeTestProviderAdapter(server1, server2, formats)
 
502
        suite = adapter.adapt(input_test)
 
503
        tests = list(iter(suite))
 
504
        # XXX We should not have tests fail as we add more scenarios
 
505
        # abentley 20080412
 
506
        self.assertEqual(5, len(tests))
 
507
        # this must match the default format setp up in
 
508
        # TreeTestProviderAdapter.adapt
 
509
        default_format = WorkingTreeFormat3
 
510
        self.assertEqual(tests[0].workingtree_format, formats[0][0])
 
511
        self.assertEqual(tests[0].bzrdir_format, formats[0][1])
 
512
        self.assertEqual(tests[0].transport_server, server1)
 
513
        self.assertEqual(tests[0].transport_readonly_server, server2)
 
514
        self.assertEqual(tests[0]._workingtree_to_test_tree, return_parameter)
 
515
        self.assertEqual(tests[1].workingtree_format, formats[1][0])
 
516
        self.assertEqual(tests[1].bzrdir_format, formats[1][1])
 
517
        self.assertEqual(tests[1].transport_server, server1)
 
518
        self.assertEqual(tests[1].transport_readonly_server, server2)
 
519
        self.assertEqual(tests[1]._workingtree_to_test_tree, return_parameter)
 
520
        self.assertIsInstance(tests[2].workingtree_format, default_format)
 
521
        #self.assertEqual(tests[2].bzrdir_format,
 
522
        #                 default_format._matchingbzrdir)
 
523
        self.assertEqual(tests[2].transport_server, server1)
 
524
        self.assertEqual(tests[2].transport_readonly_server, server2)
 
525
        self.assertEqual(tests[2]._workingtree_to_test_tree,
 
526
            revision_tree_from_workingtree)
 
527
 
 
528
 
 
529
class TestInterTreeProviderAdapter(TestCase):
436
530
    """A group of tests that test the InterTreeTestAdapter."""
437
531
 
438
 
    def test_scenarios(self):
 
532
    def test_adapted_tests(self):
439
533
        # check that constructor parameters are passed through to the adapted
440
534
        # test.
441
535
        # for InterTree tests we want the machinery to bring up two trees in
445
539
        # unlike the TestProviderAdapter we dont want to automatically add a
446
540
        # parameterized one for WorkingTree - the optimisers will tell us what
447
541
        # ones to add.
448
 
        from bzrlib.tests.per_tree import (
 
542
        from bzrlib.tests.tree_implementations import (
449
543
            return_parameter,
450
544
            revision_tree_from_workingtree
451
545
            )
452
 
        from bzrlib.tests.per_intertree import (
453
 
            make_scenarios,
 
546
        from bzrlib.tests.intertree_implementations import (
 
547
            InterTreeTestProviderAdapter,
454
548
            )
455
549
        from bzrlib.workingtree import WorkingTreeFormat2, WorkingTreeFormat3
456
 
        input_test = TestInterTreeScenarios(
457
 
            "test_scenarios")
 
550
        input_test = TestInterTreeProviderAdapter(
 
551
            "test_adapted_tests")
458
552
        server1 = "a"
459
553
        server2 = "b"
460
554
        format1 = WorkingTreeFormat2()
461
555
        format2 = WorkingTreeFormat3()
462
 
        formats = [("1", str, format1, format2, "converter1"),
463
 
            ("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):
 
556
        formats = [(str, format1, format2, "converter1"),
 
557
            (int, format2, format1, "converter2")]
 
558
        adapter = InterTreeTestProviderAdapter(server1, server2, formats)
 
559
        suite = adapter.adapt(input_test)
 
560
        tests = list(iter(suite))
 
561
        self.assertEqual(2, len(tests))
 
562
        self.assertEqual(tests[0].intertree_class, formats[0][0])
 
563
        self.assertEqual(tests[0].workingtree_format, formats[0][1])
 
564
        self.assertEqual(tests[0].workingtree_format_to, formats[0][2])
 
565
        self.assertEqual(tests[0].mutable_trees_to_test_trees, formats[0][3])
 
566
        self.assertEqual(tests[0]._workingtree_to_test_tree, return_parameter)
 
567
        self.assertEqual(tests[0].transport_server, server1)
 
568
        self.assertEqual(tests[0].transport_readonly_server, server2)
 
569
        self.assertEqual(tests[1].intertree_class, formats[1][0])
 
570
        self.assertEqual(tests[1].workingtree_format, formats[1][1])
 
571
        self.assertEqual(tests[1].workingtree_format_to, formats[1][2])
 
572
        self.assertEqual(tests[1].mutable_trees_to_test_trees, formats[1][3])
 
573
        self.assertEqual(tests[1]._workingtree_to_test_tree, return_parameter)
 
574
        self.assertEqual(tests[1].transport_server, server1)
 
575
        self.assertEqual(tests[1].transport_readonly_server, server2)
 
576
 
 
577
 
 
578
class TestTestCaseInTempDir(TestCaseInTempDir):
492
579
 
493
580
    def test_home_is_not_working(self):
494
581
        self.assertNotEqual(self.test_dir, self.test_home_dir)
496
583
        self.assertIsSameRealPath(self.test_dir, cwd)
497
584
        self.assertIsSameRealPath(self.test_home_dir, os.environ['HOME'])
498
585
 
499
 
    def test_assertEqualStat_equal(self):
500
 
        from bzrlib.tests.test_dirstate import _FakeStat
501
 
        self.build_tree(["foo"])
502
 
        real = os.lstat("foo")
503
 
        fake = _FakeStat(real.st_size, real.st_mtime, real.st_ctime,
504
 
            real.st_dev, real.st_ino, real.st_mode)
505
 
        self.assertEqualStat(real, fake)
506
 
 
507
 
    def test_assertEqualStat_notequal(self):
508
 
        self.build_tree(["foo", "longname"])
509
 
        self.assertRaises(AssertionError, self.assertEqualStat,
510
 
            os.lstat("foo"), os.lstat("longname"))
511
 
 
512
 
 
513
 
class TestTestCaseWithMemoryTransport(tests.TestCaseWithMemoryTransport):
 
586
 
 
587
class TestTestCaseWithMemoryTransport(TestCaseWithMemoryTransport):
514
588
 
515
589
    def test_home_is_non_existant_dir_under_root(self):
516
590
        """The test_home_dir for TestCaseWithMemoryTransport is missing.
517
591
 
518
592
        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
 
593
        need any disk resources: they should be hooked into bzrlib in such a 
 
594
        way that no global settings are being changed by the test (only a 
521
595
        few tests should need to do that), and having a missing dir as home is
522
596
        an effective way to ensure that this is the case.
523
597
        """
525
599
            self.TEST_ROOT + "/MemoryTransportMissingHomeDir",
526
600
            self.test_home_dir)
527
601
        self.assertIsSameRealPath(self.test_home_dir, os.environ['HOME'])
528
 
 
 
602
        
529
603
    def test_cwd_is_TEST_ROOT(self):
530
604
        self.assertIsSameRealPath(self.test_dir, self.TEST_ROOT)
531
605
        cwd = osutils.getcwd()
532
606
        self.assertIsSameRealPath(self.test_dir, cwd)
533
607
 
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
608
    def test_make_branch_and_memory_tree(self):
543
609
        """In TestCaseWithMemoryTransport we should not make the branch on disk.
544
610
 
563
629
        self.assertEqual(format.repository_format.__class__,
564
630
            tree.branch.repository._format.__class__)
565
631
 
566
 
    def test_make_branch_builder(self):
567
 
        builder = self.make_branch_builder('dir')
568
 
        self.assertIsInstance(builder, branchbuilder.BranchBuilder)
569
 
        # Guard against regression into MemoryTransport leaking
570
 
        # files to disk instead of keeping them in memory.
571
 
        self.failIf(osutils.lexists('dir'))
572
 
 
573
 
    def test_make_branch_builder_with_format(self):
574
 
        # Use a repo layout that doesn't conform to a 'named' layout, to ensure
575
 
        # that the format objects are used.
576
 
        format = bzrdir.BzrDirMetaFormat1()
577
 
        repo_format = weaverepo.RepositoryFormat7()
578
 
        format.repository_format = repo_format
579
 
        builder = self.make_branch_builder('dir', format=format)
580
 
        the_branch = builder.get_branch()
581
 
        # Guard against regression into MemoryTransport leaking
582
 
        # files to disk instead of keeping them in memory.
583
 
        self.failIf(osutils.lexists('dir'))
584
 
        self.assertEqual(format.repository_format.__class__,
585
 
                         the_branch.repository._format.__class__)
586
 
        self.assertEqual(repo_format.get_format_string(),
587
 
                         self.get_transport().get_bytes(
588
 
                            'dir/.bzr/repository/format'))
589
 
 
590
 
    def test_make_branch_builder_with_format_name(self):
591
 
        builder = self.make_branch_builder('dir', format='knit')
592
 
        the_branch = builder.get_branch()
593
 
        # Guard against regression into MemoryTransport leaking
594
 
        # files to disk instead of keeping them in memory.
595
 
        self.failIf(osutils.lexists('dir'))
596
 
        dir_format = bzrdir.format_registry.make_bzrdir('knit')
597
 
        self.assertEqual(dir_format.repository_format.__class__,
598
 
                         the_branch.repository._format.__class__)
599
 
        self.assertEqual('Bazaar-NG Knit Repository Format 1',
600
 
                         self.get_transport().get_bytes(
601
 
                            'dir/.bzr/repository/format'))
602
 
 
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):
 
632
    def test_safety_net(self):
 
633
        """No test should modify the safety .bzr directory.
 
634
 
 
635
        We just test that the _check_safety_net private method raises
 
636
        AssertionError, it's easier than building a test suite with the same
 
637
        test.
 
638
        """
 
639
        # Oops, a commit in the current directory (i.e. without local .bzr
 
640
        # directory) will crawl up the hierarchy to find a .bzr directory.
 
641
        self.run_bzr(['commit', '-mfoo', '--unchanged'])
 
642
        # But we have a safety net in place.
 
643
        self.assertRaises(AssertionError, self._check_safety_net)
 
644
 
 
645
 
 
646
class TestTestCaseWithTransport(TestCaseWithTransport):
621
647
    """Tests for the convenience functions TestCaseWithTransport introduces."""
622
648
 
623
649
    def test_get_readonly_url_none(self):
624
650
        from bzrlib.transport import get_transport
 
651
        from bzrlib.transport.memory import MemoryServer
625
652
        from bzrlib.transport.readonly import ReadonlyTransportDecorator
626
 
        self.vfs_transport_factory = memory.MemoryServer
 
653
        self.vfs_transport_factory = MemoryServer
627
654
        self.transport_readonly_server = None
628
655
        # calling get_readonly_transport() constructs a decorator on the url
629
656
        # for the server
638
665
    def test_get_readonly_url_http(self):
639
666
        from bzrlib.tests.http_server import HttpServer
640
667
        from bzrlib.transport import get_transport
 
668
        from bzrlib.transport.local import LocalURLServer
641
669
        from bzrlib.transport.http import HttpTransportBase
642
 
        self.transport_server = test_server.LocalURLServer
 
670
        self.transport_server = LocalURLServer
643
671
        self.transport_readonly_server = HttpServer
644
672
        # calling get_readonly_transport() gives us a HTTP server instance.
645
673
        url = self.get_readonly_url()
659
687
        self.assertRaises(AssertionError, self.assertIsDirectory, 'a_file', t)
660
688
        self.assertRaises(AssertionError, self.assertIsDirectory, 'not_here', t)
661
689
 
662
 
    def test_make_branch_builder(self):
663
 
        builder = self.make_branch_builder('dir')
664
 
        rev_id = builder.build_commit()
665
 
        self.failUnlessExists('dir')
666
 
        a_dir = bzrdir.BzrDir.open('dir')
667
 
        self.assertRaises(errors.NoWorkingTree, a_dir.open_workingtree)
668
 
        a_branch = a_dir.open_branch()
669
 
        builder_branch = builder.get_branch()
670
 
        self.assertEqual(a_branch.base, builder_branch.base)
671
 
        self.assertEqual((1, rev_id), builder_branch.last_revision_info())
672
 
        self.assertEqual((1, rev_id), a_branch.last_revision_info())
673
 
 
674
 
 
675
 
class TestTestCaseTransports(tests.TestCaseWithTransport):
 
690
 
 
691
class TestTestCaseTransports(TestCaseWithTransport):
676
692
 
677
693
    def setUp(self):
678
694
        super(TestTestCaseTransports, self).setUp()
679
 
        self.vfs_transport_factory = memory.MemoryServer
 
695
        self.vfs_transport_factory = MemoryServer
680
696
 
681
697
    def test_make_bzrdir_preserves_transport(self):
682
698
        t = self.get_transport()
683
699
        result_bzrdir = self.make_bzrdir('subdir')
684
 
        self.assertIsInstance(result_bzrdir.transport,
685
 
                              memory.MemoryTransport)
 
700
        self.assertIsInstance(result_bzrdir.transport, 
 
701
                              MemoryTransport)
686
702
        # should not be on disk, should only be in memory
687
703
        self.failIfExists('subdir')
688
704
 
689
705
 
690
 
class TestChrootedTest(tests.ChrootedTestCase):
 
706
class TestChrootedTest(ChrootedTestCase):
691
707
 
692
708
    def test_root_is_root(self):
693
709
        from bzrlib.transport import get_transport
696
712
        self.assertEqual(url, t.clone('..').base)
697
713
 
698
714
 
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):
 
715
class MockProgress(_BaseProgressBar):
 
716
    """Progress-bar standin that records calls.
 
717
 
 
718
    Useful for testing pb using code.
 
719
    """
 
720
 
 
721
    def __init__(self):
 
722
        _BaseProgressBar.__init__(self)
 
723
        self.calls = []
 
724
 
 
725
    def tick(self):
 
726
        self.calls.append(('tick',))
 
727
 
 
728
    def update(self, msg=None, current=None, total=None):
 
729
        self.calls.append(('update', msg, current, total))
 
730
 
 
731
    def clear(self):
 
732
        self.calls.append(('clear',))
 
733
 
 
734
    def note(self, msg, *args):
 
735
        self.calls.append(('note', msg, args))
 
736
 
 
737
 
 
738
class TestTestResult(TestCase):
720
739
 
721
740
    def check_timing(self, test_case, expected_re):
722
741
        result = bzrlib.tests.TextTestResult(self._log_file,
723
742
                descriptions=0,
724
743
                verbosity=1,
725
744
                )
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)
 
745
        test_case.run(result)
 
746
        timed_string = result._testTimeString(test_case)
730
747
        self.assertContainsRe(timed_string, expected_re)
731
748
 
732
749
    def test_test_reporting(self):
733
 
        class ShortDelayTestCase(tests.TestCase):
 
750
        class ShortDelayTestCase(TestCase):
734
751
            def test_short_delay(self):
735
752
                time.sleep(0.003)
736
753
            def test_short_benchmark(self):
737
754
                self.time(time.sleep, 0.003)
738
755
        self.check_timing(ShortDelayTestCase('test_short_delay'),
739
756
                          r"^ +[0-9]+ms$")
740
 
        # if a benchmark time is given, we now show just that time followed by
741
 
        # a star
 
757
        # if a benchmark time is given, we want a x of y style result.
742
758
        self.check_timing(ShortDelayTestCase('test_short_benchmark'),
743
 
                          r"^ +[0-9]+ms\*$")
 
759
                          r"^ +[0-9]+ms/ +[0-9]+ms$")
744
760
 
745
761
    def test_unittest_reporting_unittest_class(self):
746
762
        # getting the time from a non-bzrlib test works ok
749
765
                time.sleep(0.003)
750
766
        self.check_timing(ShortDelayTestCase('test_short_delay'),
751
767
                          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
 
 
 
768
        
758
769
    def test_assigned_benchmark_file_stores_date(self):
759
 
        self._patch_get_bzr_source_tree()
760
770
        output = StringIO()
761
771
        result = bzrlib.tests.TextTestResult(self._log_file,
762
772
                                        descriptions=0,
770
780
        self.assertContainsRe(output_string, "--date [0-9.]+")
771
781
 
772
782
    def test_benchhistory_records_test_times(self):
773
 
        self._patch_get_bzr_source_tree()
774
783
        result_stream = StringIO()
775
784
        result = bzrlib.tests.TextTestResult(
776
785
            self._log_file,
789
798
        self.assertContainsRe(lines[1],
790
799
            " *[0-9]+ms bzrlib.tests.test_selftest.TestTestResult"
791
800
            "._time_hello_world_encoding")
792
 
 
 
801
 
793
802
    def _time_hello_world_encoding(self):
794
803
        """Profile two sleep calls
795
 
 
 
804
        
796
805
        This is used to exercise the test framework.
797
806
        """
798
807
        self.time(unicode, 'hello', errors='replace')
816
825
        # execute the test, which should succeed and record profiles
817
826
        example_test_case.run(result)
818
827
        # lsprofile_something()
819
 
        # if this worked we want
 
828
        # if this worked we want 
820
829
        # LSProf output for <built in function unicode> (['hello'], {'errors': 'replace'})
821
830
        #    CallCount    Recursive    Total(ms)   Inline(ms) module:lineno(function)
822
831
        # (the lsprof header)
823
832
        # ... an arbitrary number of lines
824
833
        # and the function call which is time.sleep.
825
 
        #           1        0            ???         ???       ???(sleep)
 
834
        #           1        0            ???         ???       ???(sleep) 
826
835
        # and then repeated but with 'world', rather than 'hello'.
827
836
        # this should appear in the output stream of our test result.
828
837
        output = result_stream.getvalue()
837
846
 
838
847
    def test_known_failure(self):
839
848
        """A KnownFailure being raised should trigger several result actions."""
840
 
        class InstrumentedTestResult(tests.ExtendedTestResult):
841
 
            def stopTestRun(self): pass
842
 
            def startTests(self): pass
 
849
        class InstrumentedTestResult(ExtendedTestResult):
 
850
 
843
851
            def report_test_start(self, test): pass
844
 
            def report_known_failure(self, test, err=None, details=None):
845
 
                self._call = test, 'known failure'
 
852
            def report_known_failure(self, test, err):
 
853
                self._call = test, err
846
854
        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")
 
855
        def test_function():
 
856
            raise KnownFailure('failed!')
 
857
        test = unittest.FunctionTestCase(test_function)
851
858
        test.run(result)
852
859
        # it should invoke 'report_known_failure'.
853
860
        self.assertEqual(2, len(result._call))
854
 
        self.assertEqual(test.id(), result._call[0].id())
855
 
        self.assertEqual('known failure', result._call[1])
 
861
        self.assertEqual(test, result._call[0])
 
862
        self.assertEqual(KnownFailure, result._call[1][0])
 
863
        self.assertIsInstance(result._call[1][1], KnownFailure)
856
864
        # we dont introspec the traceback, if the rest is ok, it would be
857
865
        # exceptional for it not to be.
858
866
        # it should update the known_failure_count on the object.
875
883
        # (class, exception object, traceback)
876
884
        # KnownFailures dont get their tracebacks shown though, so we
877
885
        # can skip that.
878
 
        err = (tests.KnownFailure, tests.KnownFailure('foo'), None)
 
886
        err = (KnownFailure, KnownFailure('foo'), None)
879
887
        result.report_known_failure(test, err)
880
888
        output = result_stream.getvalue()[prefix:]
881
889
        lines = output.splitlines()
883
891
        self.assertEqual(lines[1], '    foo')
884
892
        self.assertEqual(2, len(lines))
885
893
 
 
894
    def test_text_report_known_failure(self):
 
895
        # text test output formatting
 
896
        pb = MockProgress()
 
897
        result = bzrlib.tests.TextTestResult(
 
898
            None,
 
899
            descriptions=0,
 
900
            verbosity=1,
 
901
            pb=pb,
 
902
            )
 
903
        test = self.get_passing_test()
 
904
        # this seeds the state to handle reporting the test.
 
905
        result.startTest(test)
 
906
        # the err parameter has the shape:
 
907
        # (class, exception object, traceback)
 
908
        # KnownFailures dont get their tracebacks shown though, so we
 
909
        # can skip that.
 
910
        err = (KnownFailure, KnownFailure('foo'), None)
 
911
        result.report_known_failure(test, err)
 
912
        self.assertEqual(
 
913
            [
 
914
            ('update', '[1 in 0s] passing_test', None, None),
 
915
            ('note', 'XFAIL: %s\n%s\n', ('passing_test', err[1]))
 
916
            ],
 
917
            pb.calls)
 
918
        # known_failures should be printed in the summary, so if we run a test
 
919
        # after there are some known failures, the update prefix should match
 
920
        # this.
 
921
        result.known_failure_count = 3
 
922
        test.run(result)
 
923
        self.assertEqual(
 
924
            [
 
925
            ('update', '[2 in 0s] passing_test', None, None),
 
926
            ],
 
927
            pb.calls[2:])
 
928
 
886
929
    def get_passing_test(self):
887
930
        """Return a test object that can't be run usefully."""
888
931
        def passing_test():
891
934
 
892
935
    def test_add_not_supported(self):
893
936
        """Test the behaviour of invoking addNotSupported."""
894
 
        class InstrumentedTestResult(tests.ExtendedTestResult):
895
 
            def stopTestRun(self): pass
896
 
            def startTests(self): pass
 
937
        class InstrumentedTestResult(ExtendedTestResult):
897
938
            def report_test_start(self, test): pass
898
939
            def report_unsupported(self, test, feature):
899
940
                self._call = test, feature
900
941
        result = InstrumentedTestResult(None, None, None, None)
901
942
        test = SampleTestCase('_test_pass')
902
 
        feature = tests.Feature()
 
943
        feature = Feature()
903
944
        result.startTest(test)
904
945
        result.addNotSupported(test, feature)
905
946
        # it should invoke 'report_unsupported'.
924
965
            verbosity=2,
925
966
            )
926
967
        test = self.get_passing_test()
927
 
        feature = tests.Feature()
 
968
        feature = Feature()
928
969
        result.startTest(test)
929
970
        prefix = len(result_stream.getvalue())
930
971
        result.report_unsupported(test, feature)
931
972
        output = result_stream.getvalue()[prefix:]
932
973
        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
 
 
 
974
        self.assertEqual(lines, ['NODEP                   0ms', "    The feature 'Feature' is not available."])
 
975
    
 
976
    def test_text_report_unsupported(self):
 
977
        # text test output formatting
 
978
        pb = MockProgress()
 
979
        result = bzrlib.tests.TextTestResult(
 
980
            None,
 
981
            descriptions=0,
 
982
            verbosity=1,
 
983
            pb=pb,
 
984
            )
 
985
        test = self.get_passing_test()
 
986
        feature = Feature()
 
987
        # this seeds the state to handle reporting the test.
 
988
        result.startTest(test)
 
989
        result.report_unsupported(test, feature)
 
990
        # no output on unsupported features
 
991
        self.assertEqual(
 
992
            [('update', '[1 in 0s] passing_test', None, None)
 
993
            ],
 
994
            pb.calls)
 
995
        # the number of missing features should be printed in the progress
 
996
        # summary, so check for that.
 
997
        result.unsupported = {'foo':0, 'bar':0}
 
998
        test.run(result)
 
999
        self.assertEqual(
 
1000
            [
 
1001
            ('update', '[2 in 0s, 2 missing] passing_test', None, None),
 
1002
            ],
 
1003
            pb.calls[1:])
 
1004
    
938
1005
    def test_unavailable_exception(self):
939
1006
        """An UnavailableFeature being raised should invoke addNotSupported."""
940
 
        class InstrumentedTestResult(tests.ExtendedTestResult):
941
 
            def stopTestRun(self): pass
942
 
            def startTests(self): pass
 
1007
        class InstrumentedTestResult(ExtendedTestResult):
 
1008
 
943
1009
            def report_test_start(self, test): pass
944
1010
            def addNotSupported(self, test, feature):
945
1011
                self._call = test, feature
946
1012
        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")
 
1013
        feature = Feature()
 
1014
        def test_function():
 
1015
            raise UnavailableFeature(feature)
 
1016
        test = unittest.FunctionTestCase(test_function)
952
1017
        test.run(result)
953
1018
        # it should invoke 'addNotSupported'.
954
1019
        self.assertEqual(2, len(result._call))
955
 
        self.assertEqual(test.id(), result._call[0].id())
 
1020
        self.assertEqual(test, result._call[0])
956
1021
        self.assertEqual(feature, result._call[1])
957
1022
        # and not count as an error
958
1023
        self.assertEqual(0, result.error_count)
965
1030
        result.addNotSupported(test, feature)
966
1031
        self.assertFalse(result.wasStrictlySuccessful())
967
1032
        self.assertEqual(None, result._extractBenchmarkTime(test))
968
 
 
 
1033
 
969
1034
    def test_strict_with_known_failure(self):
970
1035
        result = bzrlib.tests.TextTestResult(self._log_file, descriptions=0,
971
1036
                                             verbosity=1)
972
1037
        test = self.get_passing_test()
973
 
        err = (tests.KnownFailure, tests.KnownFailure('foo'), None)
974
 
        result.addExpectedFailure(test, err)
 
1038
        err = (KnownFailure, KnownFailure('foo'), None)
 
1039
        result._addKnownFailure(test, err)
975
1040
        self.assertFalse(result.wasStrictlySuccessful())
976
1041
        self.assertEqual(None, result._extractBenchmarkTime(test))
977
1042
 
983
1048
        self.assertTrue(result.wasStrictlySuccessful())
984
1049
        self.assertEqual(None, result._extractBenchmarkTime(test))
985
1050
 
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):
1001
 
 
1002
 
    def test_probe_passes(self):
1003
 
        """UnicodeFilenameFeature._probe passes."""
1004
 
        # We can't test much more than that because the behaviour depends
1005
 
        # on the platform.
1006
 
        tests.UnicodeFilenameFeature._probe()
1007
 
 
1008
 
 
1009
 
class TestRunner(tests.TestCase):
 
1051
 
 
1052
class TestRunner(TestCase):
1010
1053
 
1011
1054
    def dummy_test(self):
1012
1055
        pass
1016
1059
 
1017
1060
        This current saves and restores:
1018
1061
        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.
 
1062
        
 
1063
        There should be no tests in this file that use bzrlib.tests.TextTestRunner
 
1064
        without using this convenience method, because of our use of global state.
1023
1065
        """
1024
 
        old_root = tests.TestCaseInTempDir.TEST_ROOT
1025
 
        old_leak = tests.TestCase._first_thread_leaker_id
 
1066
        old_root = TestCaseInTempDir.TEST_ROOT
1026
1067
        try:
1027
 
            tests.TestCaseInTempDir.TEST_ROOT = None
1028
 
            tests.TestCase._first_thread_leaker_id = None
 
1068
            TestCaseInTempDir.TEST_ROOT = None
1029
1069
            return testrunner.run(test)
1030
1070
        finally:
1031
 
            tests.TestCaseInTempDir.TEST_ROOT = old_root
1032
 
            tests.TestCase._first_thread_leaker_id = old_leak
 
1071
            TestCaseInTempDir.TEST_ROOT = old_root
1033
1072
 
1034
1073
    def test_known_failure_failed_run(self):
1035
1074
        # run a test that generates a known failure which should be printed in
1036
1075
        # 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)
 
1076
        def known_failure_test():
 
1077
            raise KnownFailure('failed')
1040
1078
        test = unittest.TestSuite()
1041
 
        test.addTest(Test("known_failure_test"))
 
1079
        test.addTest(unittest.FunctionTestCase(known_failure_test))
1042
1080
        def failing_test():
1043
 
            self.fail('foo')
 
1081
            raise AssertionError('foo')
1044
1082
        test.addTest(unittest.FunctionTestCase(failing_test))
1045
1083
        stream = StringIO()
1046
 
        runner = tests.TextTestRunner(stream=stream)
 
1084
        runner = TextTestRunner(stream=stream)
1047
1085
        result = self.run_test_runner(runner, test)
1048
1086
        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
 
            )
 
1087
        self.assertEqual([
 
1088
            '',
 
1089
            '======================================================================',
 
1090
            'FAIL: unittest.FunctionTestCase (failing_test)',
 
1091
            '----------------------------------------------------------------------',
 
1092
            'Traceback (most recent call last):',
 
1093
            '    raise AssertionError(\'foo\')',
 
1094
            'AssertionError: foo',
 
1095
            '',
 
1096
            '----------------------------------------------------------------------',
 
1097
            '',
 
1098
            'FAILED (failures=1, known_failure_count=1)'],
 
1099
            lines[0:5] + lines[6:10] + lines[11:])
1063
1100
 
1064
1101
    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")
 
1102
        # run a test that generates a known failure which should be printed in the final output.
 
1103
        def known_failure_test():
 
1104
            raise KnownFailure('failed')
 
1105
        test = unittest.FunctionTestCase(known_failure_test)
1071
1106
        stream = StringIO()
1072
 
        runner = tests.TextTestRunner(stream=stream)
 
1107
        runner = TextTestRunner(stream=stream)
1073
1108
        result = self.run_test_runner(runner, test)
1074
1109
        self.assertContainsRe(stream.getvalue(),
1075
1110
            '\n'
1078
1113
            '\n'
1079
1114
            'OK \\(known_failures=1\\)\n')
1080
1115
 
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
1116
    def test_skipped_test(self):
1096
1117
        # run a test that is skipped, and check the suite as a whole still
1097
1118
        # succeeds.
1098
1119
        # 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")
 
1120
        def skipping_test():
 
1121
            raise TestSkipped('test intentionally skipped')
 
1122
 
 
1123
        runner = TextTestRunner(stream=self._log_file)
 
1124
        test = unittest.FunctionTestCase(skipping_test)
1104
1125
        result = self.run_test_runner(runner, test)
1105
1126
        self.assertTrue(result.wasSuccessful())
1106
1127
 
1107
1128
    def test_skipped_from_setup(self):
1108
1129
        calls = []
1109
 
        class SkippedSetupTest(tests.TestCase):
 
1130
        class SkippedSetupTest(TestCase):
1110
1131
 
1111
1132
            def setUp(self):
1112
1133
                calls.append('setUp')
1113
1134
                self.addCleanup(self.cleanup)
1114
 
                raise tests.TestSkipped('skipped setup')
 
1135
                raise TestSkipped('skipped setup')
1115
1136
 
1116
1137
            def test_skip(self):
1117
1138
                self.fail('test reached')
1119
1140
            def cleanup(self):
1120
1141
                calls.append('cleanup')
1121
1142
 
1122
 
        runner = tests.TextTestRunner(stream=self._log_file)
 
1143
        runner = TextTestRunner(stream=self._log_file)
1123
1144
        test = SkippedSetupTest('test_skip')
1124
1145
        result = self.run_test_runner(runner, test)
1125
1146
        self.assertTrue(result.wasSuccessful())
1128
1149
 
1129
1150
    def test_skipped_from_test(self):
1130
1151
        calls = []
1131
 
        class SkippedTest(tests.TestCase):
 
1152
        class SkippedTest(TestCase):
1132
1153
 
1133
1154
            def setUp(self):
1134
 
                tests.TestCase.setUp(self)
1135
1155
                calls.append('setUp')
1136
1156
                self.addCleanup(self.cleanup)
1137
1157
 
1138
1158
            def test_skip(self):
1139
 
                raise tests.TestSkipped('skipped test')
 
1159
                raise TestSkipped('skipped test')
1140
1160
 
1141
1161
            def cleanup(self):
1142
1162
                calls.append('cleanup')
1143
1163
 
1144
 
        runner = tests.TextTestRunner(stream=self._log_file)
 
1164
        runner = TextTestRunner(stream=self._log_file)
1145
1165
        test = SkippedTest('test_skip')
1146
1166
        result = self.run_test_runner(runner, test)
1147
1167
        self.assertTrue(result.wasSuccessful())
1150
1170
 
1151
1171
    def test_not_applicable(self):
1152
1172
        # 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')
 
1173
        def not_applicable_test():
 
1174
            from bzrlib.tests import TestNotApplicable
 
1175
            raise TestNotApplicable('this test never runs')
1156
1176
        out = StringIO()
1157
 
        runner = tests.TextTestRunner(stream=out, verbosity=2)
1158
 
        test = Test("not_applicable_test")
 
1177
        runner = TextTestRunner(stream=out, verbosity=2)
 
1178
        test = unittest.FunctionTestCase(not_applicable_test)
1159
1179
        result = self.run_test_runner(runner, test)
1160
1180
        self._log_file.write(out.getvalue())
1161
1181
        self.assertTrue(result.wasSuccessful())
1165
1185
        self.assertContainsRe(out.getvalue(),
1166
1186
                r'(?m)^    this test never runs')
1167
1187
 
 
1188
    def test_not_applicable_demo(self):
 
1189
        # just so you can see it in the test output
 
1190
        raise TestNotApplicable('this test is just a demonstation')
 
1191
 
1168
1192
    def test_unsupported_features_listed(self):
1169
1193
        """When unsupported features are encountered they are detailed."""
1170
 
        class Feature1(tests.Feature):
 
1194
        class Feature1(Feature):
1171
1195
            def _probe(self): return False
1172
 
        class Feature2(tests.Feature):
 
1196
        class Feature2(Feature):
1173
1197
            def _probe(self): return False
1174
1198
        # create sample tests
1175
1199
        test1 = SampleTestCase('_test_pass')
1180
1204
        test.addTest(test1)
1181
1205
        test.addTest(test2)
1182
1206
        stream = StringIO()
1183
 
        runner = tests.TextTestRunner(stream=stream)
 
1207
        runner = TextTestRunner(stream=stream)
1184
1208
        result = self.run_test_runner(runner, test)
1185
1209
        lines = stream.getvalue().splitlines()
1186
1210
        self.assertEqual([
1190
1214
            ],
1191
1215
            lines[-3:])
1192
1216
 
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
1217
    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()
 
1218
        # tests that the running the benchmark produces a history file
 
1219
        # containing a timestamp and the revision id of the bzrlib source which
 
1220
        # was tested.
 
1221
        workingtree = _get_bzr_source_tree()
1207
1222
        test = TestRunner('dummy_test')
1208
1223
        output = StringIO()
1209
 
        runner = tests.TextTestRunner(stream=self._log_file,
1210
 
                                      bench_history=output)
 
1224
        runner = TextTestRunner(stream=self._log_file, bench_history=output)
1211
1225
        result = self.run_test_runner(runner, test)
1212
1226
        output_string = output.getvalue()
1213
1227
        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):
 
1228
        if workingtree is not None:
 
1229
            revision_id = workingtree.get_parent_ids()[0]
 
1230
            self.assertEndsWith(output_string.rstrip(), revision_id)
 
1231
 
 
1232
    def assertLogDeleted(self, test):
 
1233
        log = test._get_log()
 
1234
        self.assertEqual("DELETED log file to reduce memory footprint", log)
 
1235
        self.assertEqual('', test._log_contents)
 
1236
        self.assertIs(None, test._log_file_name)
 
1237
 
 
1238
    def test_success_log_deleted(self):
 
1239
        """Successful tests have their log deleted"""
 
1240
 
 
1241
        class LogTester(TestCase):
 
1242
 
 
1243
            def test_success(self):
 
1244
                self.log('this will be removed\n')
 
1245
 
 
1246
        sio = cStringIO.StringIO()
 
1247
        runner = TextTestRunner(stream=sio)
 
1248
        test = LogTester('test_success')
 
1249
        result = self.run_test_runner(runner, test)
 
1250
 
 
1251
        self.assertLogDeleted(test)
 
1252
 
 
1253
    def test_skipped_log_deleted(self):
 
1254
        """Skipped tests have their log deleted"""
 
1255
 
 
1256
        class LogTester(TestCase):
 
1257
 
 
1258
            def test_skipped(self):
 
1259
                self.log('this will be removed\n')
 
1260
                raise tests.TestSkipped()
 
1261
 
 
1262
        sio = cStringIO.StringIO()
 
1263
        runner = TextTestRunner(stream=sio)
 
1264
        test = LogTester('test_skipped')
 
1265
        result = self.run_test_runner(runner, test)
 
1266
 
 
1267
        self.assertLogDeleted(test)
 
1268
 
 
1269
    def test_not_aplicable_log_deleted(self):
 
1270
        """Not applicable tests have their log deleted"""
 
1271
 
 
1272
        class LogTester(TestCase):
 
1273
 
 
1274
            def test_not_applicable(self):
 
1275
                self.log('this will be removed\n')
 
1276
                raise tests.TestNotApplicable()
 
1277
 
 
1278
        sio = cStringIO.StringIO()
 
1279
        runner = TextTestRunner(stream=sio)
 
1280
        test = LogTester('test_not_applicable')
 
1281
        result = self.run_test_runner(runner, test)
 
1282
 
 
1283
        self.assertLogDeleted(test)
 
1284
 
 
1285
    def test_known_failure_log_deleted(self):
 
1286
        """Know failure tests have their log deleted"""
 
1287
 
 
1288
        class LogTester(TestCase):
 
1289
 
 
1290
            def test_known_failure(self):
 
1291
                self.log('this will be removed\n')
 
1292
                raise tests.KnownFailure()
 
1293
 
 
1294
        sio = cStringIO.StringIO()
 
1295
        runner = TextTestRunner(stream=sio)
 
1296
        test = LogTester('test_known_failure')
 
1297
        result = self.run_test_runner(runner, test)
 
1298
 
 
1299
        self.assertLogDeleted(test)
 
1300
 
 
1301
    def test_fail_log_kept(self):
 
1302
        """Failed tests have their log kept"""
 
1303
 
 
1304
        class LogTester(TestCase):
 
1305
 
 
1306
            def test_fail(self):
 
1307
                self.log('this will be kept\n')
 
1308
                self.fail('this test fails')
 
1309
 
 
1310
        sio = cStringIO.StringIO()
 
1311
        runner = TextTestRunner(stream=sio)
 
1312
        test = LogTester('test_fail')
 
1313
        result = self.run_test_runner(runner, test)
 
1314
 
 
1315
        text = sio.getvalue()
 
1316
        self.assertContainsRe(text, 'this will be kept')
 
1317
        self.assertContainsRe(text, 'this test fails')
 
1318
 
 
1319
        log = test._get_log()
 
1320
        self.assertContainsRe(log, 'this will be kept')
 
1321
        self.assertEqual(log, test._log_contents)
 
1322
 
 
1323
    def test_error_log_kept(self):
 
1324
        """Tests with errors have their log kept"""
 
1325
 
 
1326
        class LogTester(TestCase):
 
1327
 
 
1328
            def test_error(self):
 
1329
                self.log('this will be kept\n')
 
1330
                raise ValueError('random exception raised')
 
1331
 
 
1332
        sio = cStringIO.StringIO()
 
1333
        runner = TextTestRunner(stream=sio)
 
1334
        test = LogTester('test_error')
 
1335
        result = self.run_test_runner(runner, test)
 
1336
 
 
1337
        text = sio.getvalue()
 
1338
        self.assertContainsRe(text, 'this will be kept')
 
1339
        self.assertContainsRe(text, 'random exception raised')
 
1340
 
 
1341
        log = test._get_log()
 
1342
        self.assertContainsRe(log, 'this will be kept')
 
1343
        self.assertEqual(log, test._log_contents)
 
1344
 
 
1345
 
 
1346
class SampleTestCase(TestCase):
1246
1347
 
1247
1348
    def _test_pass(self):
1248
1349
        pass
1249
1350
 
1250
 
class _TestException(Exception):
1251
 
    pass
1252
 
 
1253
 
 
1254
 
class TestTestCase(tests.TestCase):
 
1351
 
 
1352
class TestTestCase(TestCase):
1255
1353
    """Tests that test the core bzrlib TestCase."""
1256
1354
 
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
1355
    def test_debug_flags_sanitised(self):
1301
1356
        """The bzrlib debug flags should be sanitised by setUp."""
1302
 
        if 'allow_debug' in tests.selftest_debug_flags:
1303
 
            raise tests.TestNotApplicable(
1304
 
                '-Eallow_debug option prevents debug flag sanitisation')
1305
1357
        # we could set something and run a test that will check
1306
1358
        # it gets santised, but this is probably sufficient for now:
1307
1359
        # 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)
1312
 
 
1313
 
    def change_selftest_debug_flags(self, new_flags):
1314
 
        self.overrideAttr(tests, 'selftest_debug_flags', set(new_flags))
1315
 
 
1316
 
    def test_allow_debug_flag(self):
1317
 
        """The -Eallow_debug flag prevents bzrlib.debug.debug_flags from being
1318
 
        sanitised (i.e. cleared) before running a test.
1319
 
        """
1320
 
        self.change_selftest_debug_flags(set(['allow_debug']))
1321
 
        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)
1364
 
 
1365
 
    def test_debug_flags_restored(self):
1366
 
        """The bzrlib debug flags should be restored to their original state
1367
 
        after the test was run, even if allow_debug is set.
1368
 
        """
1369
 
        self.change_selftest_debug_flags(set(['allow_debug']))
1370
 
        # Now run a test that modifies debug.debug_flags.
1371
 
        bzrlib.debug.debug_flags = set(['original-state'])
1372
 
        class TestThatModifiesFlags(tests.TestCase):
1373
 
            def test_foo(self):
1374
 
                bzrlib.debug.debug_flags = set(['modified'])
1375
 
        test = TestThatModifiesFlags('test_foo')
1376
 
        test.run(self.make_test_result())
1377
 
        self.assertEqual(set(['original-state']), bzrlib.debug.debug_flags)
1378
 
 
1379
 
    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)
 
1360
        self.assertEqual(set(), bzrlib.debug.debug_flags)
1382
1361
 
1383
1362
    def inner_test(self):
1384
1363
        # the inner child test
1388
1367
        # the outer child test
1389
1368
        note("outer_start")
1390
1369
        self.inner_test = TestTestCase("inner_child")
1391
 
        result = self.make_test_result()
 
1370
        result = bzrlib.tests.TextTestResult(self._log_file,
 
1371
                                        descriptions=0,
 
1372
                                        verbosity=1)
1392
1373
        self.inner_test.run(result)
1393
1374
        note("outer finish")
1394
 
        self.addCleanup(osutils.delete_any, self._log_file_name)
1395
1375
 
1396
1376
    def test_trace_nesting(self):
1397
1377
        # this tests that each test case nests its trace facility correctly.
1399
1379
        # should setup a new log, log content to it, setup a child case (B),
1400
1380
        # which should log independently, then case (A) should log a trailer
1401
1381
        # and return.
1402
 
        # we do two nested children so that we can verify the state of the
 
1382
        # we do two nested children so that we can verify the state of the 
1403
1383
        # logs after the outer child finishes is correct, which a bad clean
1404
1384
        # up routine in tearDown might trigger a fault in our test with only
1405
1385
        # one child, we should instead see the bad result inside our test with
1407
1387
        # the outer child test
1408
1388
        original_trace = bzrlib.trace._trace_file
1409
1389
        outer_test = TestTestCase("outer_child")
1410
 
        result = self.make_test_result()
 
1390
        result = bzrlib.tests.TextTestResult(self._log_file,
 
1391
                                        descriptions=0,
 
1392
                                        verbosity=1)
1411
1393
        outer_test.run(result)
1412
1394
        self.assertEqual(original_trace, bzrlib.trace._trace_file)
1413
1395
 
1423
1405
        result = bzrlib.tests.VerboseTestResult(
1424
1406
            unittest._WritelnDecorator(output_stream),
1425
1407
            descriptions=0,
1426
 
            verbosity=2)
 
1408
            verbosity=2,
 
1409
            num_tests=sample_test.countTestCases())
1427
1410
        sample_test.run(result)
1428
1411
        self.assertContainsRe(
1429
1412
            output_stream.getvalue(),
1430
 
            r"\d+ms\*\n$")
 
1413
            r"\d+ms/ +\d+ms\n$")
1431
1414
 
1432
1415
    def test_hooks_sanitised(self):
1433
1416
        """The bzrlib hooks should be sanitised by setUp."""
1434
 
        # Note this test won't fail with hooks that the core library doesn't
1435
 
        # use - but it trigger with a plugin that adds hooks, so its still a
1436
 
        # useful warning in that case.
1437
1417
        self.assertEqual(bzrlib.branch.BranchHooks(),
1438
1418
            bzrlib.branch.Branch.hooks)
1439
1419
        self.assertEqual(bzrlib.smart.server.SmartServerHooks(),
1440
1420
            bzrlib.smart.server.SmartTCPServer.hooks)
1441
 
        self.assertEqual(bzrlib.commands.CommandHooks(),
1442
 
            bzrlib.commands.Command.hooks)
1443
1421
 
1444
1422
    def test__gather_lsprof_in_benchmarks(self):
1445
1423
        """When _gather_lsprof_in_benchmarks is on, accumulate profile data.
1446
 
 
 
1424
        
1447
1425
        Each self.time() call is individually and separately profiled.
1448
1426
        """
1449
1427
        self.requireFeature(test_lsprof.LSProfFeature)
1450
 
        # overrides the class member with an instance member so no cleanup
 
1428
        # overrides the class member with an instance member so no cleanup 
1451
1429
        # needed.
1452
1430
        self._gather_lsprof_in_benchmarks = True
1453
1431
        self.time(time.sleep, 0.000)
1457
1435
        self.assertEqual((time.sleep, (0.003,), {}), self._benchcalls[1][0])
1458
1436
        self.assertIsInstance(self._benchcalls[0][1], bzrlib.lsprof.Stats)
1459
1437
        self.assertIsInstance(self._benchcalls[1][1], bzrlib.lsprof.Stats)
1460
 
        del self._benchcalls[:]
1461
1438
 
1462
1439
    def test_knownFailure(self):
1463
1440
        """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)
 
1441
        self.assertRaises(KnownFailure, self.knownFailure, "A Failure")
1482
1442
 
1483
1443
    def test_requireFeature_available(self):
1484
1444
        """self.requireFeature(available) is a no-op."""
1485
 
        class Available(tests.Feature):
 
1445
        class Available(Feature):
1486
1446
            def _probe(self):return True
1487
1447
        feature = Available()
1488
1448
        self.requireFeature(feature)
1489
1449
 
1490
1450
    def test_requireFeature_unavailable(self):
1491
1451
        """self.requireFeature(unavailable) raises UnavailableFeature."""
1492
 
        class Unavailable(tests.Feature):
 
1452
        class Unavailable(Feature):
1493
1453
            def _probe(self):return False
1494
1454
        feature = Unavailable()
1495
 
        self.assertRaises(tests.UnavailableFeature,
1496
 
                          self.requireFeature, feature)
 
1455
        self.assertRaises(UnavailableFeature, self.requireFeature, feature)
1497
1456
 
1498
1457
    def test_run_no_parameters(self):
1499
1458
        test = SampleTestCase('_test_pass')
1500
1459
        test.run()
1501
 
 
 
1460
    
1502
1461
    def test_run_enabled_unittest_result(self):
1503
1462
        """Test we revert to regular behaviour when the test is enabled."""
1504
1463
        test = SampleTestCase('_test_pass')
1529
1488
        """Test disabled tests behaviour with support aware results."""
1530
1489
        test = SampleTestCase('_test_pass')
1531
1490
        class DisabledFeature(object):
1532
 
            def __eq__(self, other):
1533
 
                return isinstance(other, DisabledFeature)
1534
1491
            def available(self):
1535
1492
                return False
1536
1493
        the_feature = DisabledFeature()
1547
1504
                self.calls.append(('addNotSupported', test, feature))
1548
1505
        result = InstrumentedTestResult()
1549
1506
        test.run(result)
1550
 
        case = result.calls[0][1]
1551
1507
        self.assertEqual([
1552
 
            ('startTest', case),
1553
 
            ('addNotSupported', case, the_feature),
1554
 
            ('stopTest', case),
 
1508
            ('startTest', test),
 
1509
            ('addNotSupported', test, the_feature),
 
1510
            ('stopTest', test),
1555
1511
            ],
1556
1512
            result.calls)
1557
1513
 
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
 
    def test_assert_list_raises_on_generator(self):
1567
 
        def generator_which_will_raise():
1568
 
            # This will not raise until after the first yield
1569
 
            yield 1
1570
 
            raise _TestException()
1571
 
 
1572
 
        e = self.assertListRaises(_TestException, generator_which_will_raise)
1573
 
        self.assertIsInstance(e, _TestException)
1574
 
 
1575
 
        e = self.assertListRaises(Exception, generator_which_will_raise)
1576
 
        self.assertIsInstance(e, _TestException)
1577
 
 
1578
 
    def test_assert_list_raises_on_plain(self):
1579
 
        def plain_exception():
1580
 
            raise _TestException()
1581
 
            return []
1582
 
 
1583
 
        e = self.assertListRaises(_TestException, plain_exception)
1584
 
        self.assertIsInstance(e, _TestException)
1585
 
 
1586
 
        e = self.assertListRaises(Exception, plain_exception)
1587
 
        self.assertIsInstance(e, _TestException)
1588
 
 
1589
 
    def test_assert_list_raises_assert_wrong_exception(self):
1590
 
        class _NotTestException(Exception):
1591
 
            pass
1592
 
 
1593
 
        def wrong_exception():
1594
 
            raise _NotTestException()
1595
 
 
1596
 
        def wrong_exception_generator():
1597
 
            yield 1
1598
 
            yield 2
1599
 
            raise _NotTestException()
1600
 
 
1601
 
        # Wrong exceptions are not intercepted
1602
 
        self.assertRaises(_NotTestException,
1603
 
            self.assertListRaises, _TestException, wrong_exception)
1604
 
        self.assertRaises(_NotTestException,
1605
 
            self.assertListRaises, _TestException, wrong_exception_generator)
1606
 
 
1607
 
    def test_assert_list_raises_no_exception(self):
1608
 
        def success():
1609
 
            return []
1610
 
 
1611
 
        def success_generator():
1612
 
            yield 1
1613
 
            yield 2
1614
 
 
1615
 
        self.assertRaises(AssertionError,
1616
 
            self.assertListRaises, _TestException, success)
1617
 
 
1618
 
        self.assertRaises(AssertionError,
1619
 
            self.assertListRaises, _TestException, success_generator)
1620
 
 
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)))
 
1514
 
 
1515
@symbol_versioning.deprecated_function(zero_eleven)
1660
1516
def sample_deprecated_function():
1661
1517
    """A deprecated function to test applyDeprecated with."""
1662
1518
    return 2
1669
1525
class ApplyDeprecatedHelper(object):
1670
1526
    """A helper class for ApplyDeprecated tests."""
1671
1527
 
1672
 
    @deprecated_method(deprecated_in((0, 11, 0)))
 
1528
    @symbol_versioning.deprecated_method(zero_eleven)
1673
1529
    def sample_deprecated_method(self, param_one):
1674
1530
        """A deprecated method for testing with."""
1675
1531
        return param_one
1677
1533
    def sample_normal_method(self):
1678
1534
        """A undeprecated method."""
1679
1535
 
1680
 
    @deprecated_method(deprecated_in((0, 10, 0)))
 
1536
    @symbol_versioning.deprecated_method(zero_ten)
1681
1537
    def sample_nested_deprecation(self):
1682
1538
        return sample_deprecated_function()
1683
1539
 
1684
1540
 
1685
 
class TestExtraAssertions(tests.TestCase):
 
1541
class TestExtraAssertions(TestCase):
1686
1542
    """Tests for new test assertions in bzrlib test suite"""
1687
1543
 
1688
1544
    def test_assert_isinstance(self):
1689
1545
        self.assertIsInstance(2, int)
1690
1546
        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'>")
 
1547
        self.assertRaises(AssertionError, self.assertIsInstance, None, int)
1694
1548
        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
1549
 
1701
1550
    def test_assertEndsWith(self):
1702
1551
        self.assertEndsWith('foo', 'oo')
1703
1552
        self.assertRaises(AssertionError, self.assertEndsWith, 'o', 'oo')
1704
1553
 
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
1554
    def test_applyDeprecated_not_deprecated(self):
1721
1555
        sample_object = ApplyDeprecatedHelper()
1722
1556
        # calling an undeprecated callable raises an assertion
1723
 
        self.assertRaises(AssertionError, self.applyDeprecated,
1724
 
            deprecated_in((0, 11, 0)),
 
1557
        self.assertRaises(AssertionError, self.applyDeprecated, zero_eleven,
1725
1558
            sample_object.sample_normal_method)
1726
 
        self.assertRaises(AssertionError, self.applyDeprecated,
1727
 
            deprecated_in((0, 11, 0)),
 
1559
        self.assertRaises(AssertionError, self.applyDeprecated, zero_eleven,
1728
1560
            sample_undeprecated_function, "a param value")
1729
1561
        # calling a deprecated callable (function or method) with the wrong
1730
1562
        # expected deprecation fails.
1731
 
        self.assertRaises(AssertionError, self.applyDeprecated,
1732
 
            deprecated_in((0, 10, 0)),
 
1563
        self.assertRaises(AssertionError, self.applyDeprecated, zero_ten,
1733
1564
            sample_object.sample_deprecated_method, "a param value")
1734
 
        self.assertRaises(AssertionError, self.applyDeprecated,
1735
 
            deprecated_in((0, 10, 0)),
 
1565
        self.assertRaises(AssertionError, self.applyDeprecated, zero_ten,
1736
1566
            sample_deprecated_function)
1737
1567
        # calling a deprecated callable (function or method) with the right
1738
1568
        # expected deprecation returns the functions result.
1739
 
        self.assertEqual("a param value",
1740
 
            self.applyDeprecated(deprecated_in((0, 11, 0)),
 
1569
        self.assertEqual("a param value", self.applyDeprecated(zero_eleven,
1741
1570
            sample_object.sample_deprecated_method, "a param value"))
1742
 
        self.assertEqual(2, self.applyDeprecated(deprecated_in((0, 11, 0)),
 
1571
        self.assertEqual(2, self.applyDeprecated(zero_eleven,
1743
1572
            sample_deprecated_function))
1744
1573
        # calling a nested deprecation with the wrong deprecation version
1745
 
        # fails even if a deeper nested function was deprecated with the
 
1574
        # fails even if a deeper nested function was deprecated with the 
1746
1575
        # supplied version.
1747
1576
        self.assertRaises(AssertionError, self.applyDeprecated,
1748
 
            deprecated_in((0, 11, 0)), sample_object.sample_nested_deprecation)
 
1577
            zero_eleven, sample_object.sample_nested_deprecation)
1749
1578
        # calling a nested deprecation with the right deprecation value
1750
1579
        # returns the calls result.
1751
 
        self.assertEqual(2, self.applyDeprecated(deprecated_in((0, 10, 0)),
 
1580
        self.assertEqual(2, self.applyDeprecated(zero_ten,
1752
1581
            sample_object.sample_nested_deprecation))
1753
1582
 
1754
1583
    def test_callDeprecated(self):
1755
1584
        def testfunc(be_deprecated, result=None):
1756
1585
            if be_deprecated is True:
1757
 
                symbol_versioning.warn('i am deprecated', DeprecationWarning,
 
1586
                symbol_versioning.warn('i am deprecated', DeprecationWarning, 
1758
1587
                                       stacklevel=1)
1759
1588
            return result
1760
1589
        result = self.callDeprecated(['i am deprecated'], testfunc, True)
1765
1594
        self.callDeprecated([], testfunc, be_deprecated=False)
1766
1595
 
1767
1596
 
1768
 
class TestWarningTests(tests.TestCase):
 
1597
class TestWarningTests(TestCase):
1769
1598
    """Tests for calling methods that raise warnings."""
1770
1599
 
1771
1600
    def test_callCatchWarnings(self):
1781
1610
        self.assertEquals("this is your last warning", str(w0))
1782
1611
 
1783
1612
 
1784
 
class TestConvenienceMakers(tests.TestCaseWithTransport):
 
1613
class TestConvenienceMakers(TestCaseWithTransport):
1785
1614
    """Test for the make_* convenience functions."""
1786
1615
 
1787
1616
    def test_make_branch_and_tree_with_format(self):
1799
1628
        tree = self.make_branch_and_memory_tree('a')
1800
1629
        self.assertIsInstance(tree, bzrlib.memorytree.MemoryTree)
1801
1630
 
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://'))
 
1631
 
 
1632
class TestSFTPMakeBranchAndTree(TestCaseWithSFTPServer):
 
1633
 
 
1634
    def test_make_tree_for_sftp_branch(self):
 
1635
        """Transports backed by local directories create local trees."""
 
1636
 
1808
1637
        tree = self.make_branch_and_tree('t1')
1809
1638
        base = tree.bzrdir.root_transport.base
1810
 
        self.assertStartsWith(base, 'file://')
 
1639
        self.failIf(base.startswith('sftp'),
 
1640
                'base %r is on sftp but should be local' % base)
1811
1641
        self.assertEquals(tree.bzrdir.root_transport,
1812
1642
                tree.branch.bzrdir.root_transport)
1813
1643
        self.assertEquals(tree.bzrdir.root_transport,
1814
1644
                tree.branch.repository.bzrdir.root_transport)
1815
1645
 
1816
1646
 
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):
 
1647
class TestSelftest(TestCase):
1835
1648
    """Tests of bzrlib.tests.selftest."""
1836
1649
 
1837
1650
    def test_selftest_benchmark_parameter_invokes_test_suite__benchmark__(self):
1838
1651
        factory_called = []
1839
1652
        def factory():
1840
1653
            factory_called.append(True)
1841
 
            return TestUtil.TestSuite()
 
1654
            return TestSuite()
1842
1655
        out = StringIO()
1843
1656
        err = StringIO()
1844
 
        self.apply_redirected(out, err, None, bzrlib.tests.selftest,
 
1657
        self.apply_redirected(out, err, None, bzrlib.tests.selftest, 
1845
1658
            test_suite_factory=factory)
1846
1659
        self.assertEqual([True], factory_called)
1847
1660
 
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
 
1661
 
 
1662
class TestKnownFailure(TestCase):
 
1663
 
 
1664
    def test_known_failure(self):
 
1665
        """Check that KnownFailure is defined appropriately."""
 
1666
        # a KnownFailure is an assertion error for compatability with unaware
 
1667
        # runners.
 
1668
        self.assertIsInstance(KnownFailure(""), AssertionError)
 
1669
 
 
1670
    def test_expect_failure(self):
 
1671
        try:
 
1672
            self.expectFailure("Doomed to failure", self.assertTrue, False)
 
1673
        except KnownFailure, e:
 
1674
            self.assertEqual('Doomed to failure', e.args[0])
 
1675
        try:
 
1676
            self.expectFailure("Doomed to failure", self.assertTrue, True)
 
1677
        except AssertionError, e:
 
1678
            self.assertEqual('Unexpected success.  Should have failed:'
 
1679
                             ' Doomed to failure', e.args[0])
2181
1680
        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):
 
1681
            self.fail('Assertion not raised')
 
1682
 
 
1683
 
 
1684
class TestFeature(TestCase):
2361
1685
 
2362
1686
    def test_caching(self):
2363
1687
        """Feature._probe is called by the feature at most once."""
2364
 
        class InstrumentedFeature(tests.Feature):
 
1688
        class InstrumentedFeature(Feature):
2365
1689
            def __init__(self):
2366
 
                super(InstrumentedFeature, self).__init__()
 
1690
                Feature.__init__(self)
2367
1691
                self.calls = []
2368
1692
            def _probe(self):
2369
1693
                self.calls.append('_probe')
2376
1700
 
2377
1701
    def test_named_str(self):
2378
1702
        """Feature.__str__ should thunk to feature_name()."""
2379
 
        class NamedFeature(tests.Feature):
 
1703
        class NamedFeature(Feature):
2380
1704
            def feature_name(self):
2381
1705
                return 'symlinks'
2382
1706
        feature = NamedFeature()
2384
1708
 
2385
1709
    def test_default_str(self):
2386
1710
        """Feature.__str__ should default to __class__.__name__."""
2387
 
        class NamedFeature(tests.Feature):
 
1711
        class NamedFeature(Feature):
2388
1712
            pass
2389
1713
        feature = NamedFeature()
2390
1714
        self.assertEqual('NamedFeature', str(feature))
2391
1715
 
2392
1716
 
2393
 
class TestUnavailableFeature(tests.TestCase):
 
1717
class TestUnavailableFeature(TestCase):
2394
1718
 
2395
1719
    def test_access_feature(self):
2396
 
        feature = tests.Feature()
2397
 
        exception = tests.UnavailableFeature(feature)
 
1720
        feature = Feature()
 
1721
        exception = UnavailableFeature(feature)
2398
1722
        self.assertIs(feature, exception.args[0])
2399
1723
 
2400
1724
 
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):
 
1725
class TestSelftestFiltering(TestCase):
2435
1726
 
2436
1727
    def setUp(self):
2437
 
        tests.TestCase.setUp(self)
2438
1728
        self.suite = TestUtil.TestSuite()
2439
1729
        self.loader = TestUtil.TestLoader()
2440
 
        self.suite.addTest(self.loader.loadTestsFromModule(
2441
 
            sys.modules['bzrlib.tests.test_selftest']))
 
1730
        self.suite.addTest(self.loader.loadTestsFromModuleNames([
 
1731
            'bzrlib.tests.test_selftest']))
2442
1732
        self.all_names = _test_ids(self.suite)
2443
1733
 
2444
1734
    def test_condition_id_re(self):
2445
1735
        test_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.'
2446
1736
            'test_condition_id_re')
2447
 
        filtered_suite = tests.filter_suite_by_condition(
2448
 
            self.suite, tests.condition_id_re('test_condition_id_re'))
 
1737
        filtered_suite = filter_suite_by_condition(self.suite,
 
1738
            condition_id_re('test_condition_id_re'))
2449
1739
        self.assertEqual([test_name], _test_ids(filtered_suite))
2450
1740
 
2451
1741
    def test_condition_id_in_list(self):
2452
1742
        test_names = ['bzrlib.tests.test_selftest.TestSelftestFiltering.'
2453
1743
                      'test_condition_id_in_list']
2454
1744
        id_list = tests.TestIdList(test_names)
2455
 
        filtered_suite = tests.filter_suite_by_condition(
 
1745
        filtered_suite = filter_suite_by_condition(
2456
1746
            self.suite, tests.condition_id_in_list(id_list))
2457
1747
        my_pattern = 'TestSelftestFiltering.*test_condition_id_in_list'
2458
 
        re_filtered = tests.filter_suite_by_re(self.suite, my_pattern)
 
1748
        re_filtered = filter_suite_by_re(self.suite, my_pattern)
2459
1749
        self.assertEqual(_test_ids(re_filtered), _test_ids(filtered_suite))
2460
1750
 
2461
 
    def test_condition_id_startswith(self):
2462
 
        klass = 'bzrlib.tests.test_selftest.TestSelftestFiltering.'
2463
 
        start1 = klass + 'test_condition_id_starts'
2464
 
        start2 = klass + 'test_condition_id_in'
2465
 
        test_names = [ klass + 'test_condition_id_in_list',
2466
 
                      klass + 'test_condition_id_startswith',
2467
 
                     ]
2468
 
        filtered_suite = tests.filter_suite_by_condition(
2469
 
            self.suite, tests.condition_id_startswith([start1, start2]))
2470
 
        self.assertEqual(test_names, _test_ids(filtered_suite))
2471
 
 
2472
1751
    def test_condition_isinstance(self):
2473
 
        filtered_suite = tests.filter_suite_by_condition(
2474
 
            self.suite, tests.condition_isinstance(self.__class__))
 
1752
        filtered_suite = filter_suite_by_condition(self.suite,
 
1753
            condition_isinstance(self.__class__))
2475
1754
        class_pattern = 'bzrlib.tests.test_selftest.TestSelftestFiltering.'
2476
 
        re_filtered = tests.filter_suite_by_re(self.suite, class_pattern)
 
1755
        re_filtered = filter_suite_by_re(self.suite, class_pattern)
2477
1756
        self.assertEqual(_test_ids(re_filtered), _test_ids(filtered_suite))
2478
1757
 
2479
1758
    def test_exclude_tests_by_condition(self):
2480
1759
        excluded_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.'
2481
1760
            'test_exclude_tests_by_condition')
2482
 
        filtered_suite = tests.exclude_tests_by_condition(self.suite,
 
1761
        filtered_suite = exclude_tests_by_condition(self.suite,
2483
1762
            lambda x:x.id() == excluded_name)
2484
1763
        self.assertEqual(len(self.all_names) - 1,
2485
1764
            filtered_suite.countTestCases())
2490
1769
 
2491
1770
    def test_exclude_tests_by_re(self):
2492
1771
        self.all_names = _test_ids(self.suite)
2493
 
        filtered_suite = tests.exclude_tests_by_re(self.suite,
2494
 
                                                   'exclude_tests_by_re')
 
1772
        filtered_suite = exclude_tests_by_re(self.suite, 'exclude_tests_by_re')
2495
1773
        excluded_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.'
2496
1774
            'test_exclude_tests_by_re')
2497
1775
        self.assertEqual(len(self.all_names) - 1,
2504
1782
    def test_filter_suite_by_condition(self):
2505
1783
        test_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.'
2506
1784
            'test_filter_suite_by_condition')
2507
 
        filtered_suite = tests.filter_suite_by_condition(self.suite,
 
1785
        filtered_suite = filter_suite_by_condition(self.suite,
2508
1786
            lambda x:x.id() == test_name)
2509
1787
        self.assertEqual([test_name], _test_ids(filtered_suite))
2510
1788
 
2511
1789
    def test_filter_suite_by_re(self):
2512
 
        filtered_suite = tests.filter_suite_by_re(self.suite,
2513
 
                                                  'test_filter_suite_by_r')
 
1790
        filtered_suite = filter_suite_by_re(self.suite, 'test_filter_suite_by_r')
2514
1791
        filtered_names = _test_ids(filtered_suite)
2515
1792
        self.assertEqual(filtered_names, ['bzrlib.tests.test_selftest.'
2516
1793
            'TestSelftestFiltering.test_filter_suite_by_re'])
2526
1803
            ['bzrlib.tests.test_selftest.'
2527
1804
             'TestSelftestFiltering.test_filter_suite_by_id_list'])
2528
1805
 
2529
 
    def test_filter_suite_by_id_startswith(self):
2530
 
        # By design this test may fail if another test is added whose name also
2531
 
        # begins with one of the start value used.
2532
 
        klass = 'bzrlib.tests.test_selftest.TestSelftestFiltering.'
2533
 
        start1 = klass + 'test_filter_suite_by_id_starts'
2534
 
        start2 = klass + 'test_filter_suite_by_id_li'
2535
 
        test_list = [klass + 'test_filter_suite_by_id_list',
2536
 
                     klass + 'test_filter_suite_by_id_startswith',
2537
 
                     ]
2538
 
        filtered_suite = tests.filter_suite_by_id_startswith(
2539
 
            self.suite, [start1, start2])
2540
 
        self.assertEqual(
2541
 
            test_list,
2542
 
            _test_ids(filtered_suite),
2543
 
            )
2544
 
 
2545
1806
    def test_preserve_input(self):
2546
1807
        # 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("@#$"))
 
1808
        self.assertTrue(self.suite is preserve_input(self.suite))
 
1809
        self.assertTrue("@#$" is preserve_input("@#$"))
2549
1810
 
2550
1811
    def test_randomize_suite(self):
2551
 
        randomized_suite = tests.randomize_suite(self.suite)
 
1812
        randomized_suite = randomize_suite(self.suite)
2552
1813
        # randomizing should not add or remove test names.
2553
1814
        self.assertEqual(set(_test_ids(self.suite)),
2554
1815
                         set(_test_ids(randomized_suite)))
2562
1823
        # necessarily.)
2563
1824
        self.assertEqual(len(self.all_names), len(_test_ids(randomized_suite)))
2564
1825
 
2565
 
    def test_split_suit_by_condition(self):
2566
 
        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)
2569
 
        filtered_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.'
2570
 
            'test_filter_suite_by_re')
2571
 
        self.assertEqual([filtered_name], _test_ids(split_suite[0]))
2572
 
        self.assertFalse(filtered_name in _test_ids(split_suite[1]))
2573
 
        remaining_names = list(self.all_names)
2574
 
        remaining_names.remove(filtered_name)
2575
 
        self.assertEqual(remaining_names, _test_ids(split_suite[1]))
2576
 
 
2577
1826
    def test_split_suit_by_re(self):
2578
1827
        self.all_names = _test_ids(self.suite)
2579
 
        split_suite = tests.split_suite_by_re(self.suite,
2580
 
                                              'test_filter_suite_by_r')
 
1828
        split_suite = split_suite_by_re(self.suite, 'test_filter_suite_by_r')
2581
1829
        filtered_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.'
2582
1830
            'test_filter_suite_by_re')
2583
1831
        self.assertEqual([filtered_name], _test_ids(split_suite[0]))
2587
1835
        self.assertEqual(remaining_names, _test_ids(split_suite[1]))
2588
1836
 
2589
1837
 
2590
 
class TestCheckInventoryShape(tests.TestCaseWithTransport):
 
1838
class TestCheckInventoryShape(TestCaseWithTransport):
2591
1839
 
2592
1840
    def test_check_inventory_shape(self):
2593
1841
        files = ['a', 'b/', 'b/c']
2601
1849
            tree.unlock()
2602
1850
 
2603
1851
 
2604
 
class TestBlackboxSupport(tests.TestCase):
 
1852
class TestBlackboxSupport(TestCase):
2605
1853
    """Tests for testsuite blackbox features."""
2606
1854
 
2607
1855
    def test_run_bzr_failure_not_caught(self):
2615
1863
        # the test framework
2616
1864
        self.assertEquals('always fails', str(e))
2617
1865
        # check that there's no traceback in the test log
2618
 
        self.assertNotContainsRe(self.get_log(), r'Traceback')
 
1866
        self.assertNotContainsRe(self._get_log(keep_log_file=True),
 
1867
            r'Traceback')
2619
1868
 
2620
1869
    def test_run_bzr_user_error_caught(self):
2621
1870
        # Running bzr in blackbox mode, normal/expected/user errors should be
2622
1871
        # caught in the regular way and turned into an error message plus exit
2623
1872
        # 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)
 
1873
        out, err = self.run_bzr(["log", "/nonexistantpath"], retcode=3)
2630
1874
        self.assertEqual(out, '')
2631
1875
        self.assertContainsRe(err,
2632
1876
            'bzr: ERROR: Not a branch: ".*nonexistantpath/".\n')
2633
1877
 
2634
1878
 
2635
 
class TestTestLoader(tests.TestCase):
 
1879
class TestTestLoader(TestCase):
2636
1880
    """Tests for the test loader."""
2637
1881
 
2638
1882
    def _get_loader_and_module(self):
2639
1883
        """Gets a TestLoader and a module with one test in it."""
2640
1884
        loader = TestUtil.TestLoader()
2641
1885
        module = {}
2642
 
        class Stub(tests.TestCase):
 
1886
        class Stub(TestCase):
2643
1887
            def test_foo(self):
2644
1888
                pass
2645
1889
        class MyModule(object):
2658
1902
        # load_tests do not need that :)
2659
1903
        def load_tests(self, standard_tests, module, loader):
2660
1904
            result = loader.suiteClass()
2661
 
            for test in tests.iter_suite_tests(standard_tests):
 
1905
            for test in iter_suite_tests(standard_tests):
2662
1906
                result.addTests([test, test])
2663
1907
            return result
2664
1908
        # add a load_tests() method which multiplies the tests from the module.
2683
1927
 
2684
1928
    def _create_suite(self, test_id_list):
2685
1929
 
2686
 
        class Stub(tests.TestCase):
 
1930
        class Stub(TestCase):
2687
1931
            def test_foo(self):
2688
1932
                pass
2689
1933
 
2699
1943
 
2700
1944
    def _test_ids(self, test_suite):
2701
1945
        """Get the ids for the tests in a test suite."""
2702
 
        return [t.id() for t in tests.iter_suite_tests(test_suite)]
 
1946
        return [t.id() for t in iter_suite_tests(test_suite)]
2703
1947
 
2704
1948
    def test_empty_list(self):
2705
1949
        id_list = self._create_id_list([])
2731
1975
        self.assertTrue(id_list.refers_to('mod.class'))
2732
1976
        self.assertTrue(id_list.refers_to('mod.class.meth'))
2733
1977
 
 
1978
    def test_test_suite(self):
 
1979
        # This test is slow, so we do a single test with one test in each
 
1980
        # category
 
1981
        test_list = [
 
1982
            # testmod_names
 
1983
            'bzrlib.tests.blackbox.test_branch.TestBranch.test_branch',
 
1984
            'bzrlib.tests.test_selftest.TestTestIdList.test_test_suite',
 
1985
            # transport implementations
 
1986
            'bzrlib.tests.test_transport_implementations.TransportTests'
 
1987
            '.test_abspath(LocalURLServer)',
 
1988
            # modules_to_doctest
 
1989
            'bzrlib.timestamp.format_highres_date',
 
1990
            # plugins can't be tested that way since selftest may be run with
 
1991
            # --no-plugins
 
1992
            ]
 
1993
        suite = tests.test_suite(test_list)
 
1994
        self.assertEquals(test_list, _test_ids(suite))
 
1995
 
2734
1996
    def test_test_suite_matches_id_list_with_unknown(self):
2735
1997
        loader = TestUtil.TestLoader()
2736
1998
        suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler')
2744
2006
        loader = TestUtil.TestLoader()
2745
2007
        suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler')
2746
2008
        dupes = loader.suiteClass()
2747
 
        for test in tests.iter_suite_tests(suite):
 
2009
        for test in iter_suite_tests(suite):
2748
2010
            dupes.addTest(test)
2749
2011
            dupes.addTest(test) # Add it again
2750
2012
 
2756
2018
                          duplicates)
2757
2019
 
2758
2020
 
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
2021
class TestLoadTestIdList(tests.TestCaseInTempDir):
2838
2022
 
2839
2023
    def _create_test_list_file(self, file_name, content):
2877
2061
    def test_load_tests(self):
2878
2062
        test_list = ['bzrlib.tests.test_sampler.DemoTest.test_nothing']
2879
2063
        loader = self._create_loader(test_list)
 
2064
 
2880
2065
        suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler')
2881
2066
        self.assertEquals(test_list, _test_ids(suite))
2882
2067
 
2883
2068
    def test_exclude_tests(self):
2884
2069
        test_list = ['bogus']
2885
2070
        loader = self._create_loader(test_list)
2886
 
        suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler')
2887
 
        self.assertEquals([], _test_ids(suite))
2888
 
 
2889
 
 
2890
 
class TestFilteredByNameStartTestLoader(tests.TestCase):
2891
 
 
2892
 
    def _create_loader(self, name_start):
2893
 
        def needs_module(name):
2894
 
            return name.startswith(name_start) or name_start.startswith(name)
2895
 
        loader = TestUtil.FilteredByModuleTestLoader(needs_module)
2896
 
        return loader
2897
 
 
2898
 
    def test_load_tests(self):
2899
 
        test_list = ['bzrlib.tests.test_sampler.DemoTest.test_nothing']
2900
 
        loader = self._create_loader('bzrlib.tests.test_samp')
2901
 
 
2902
 
        suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler')
2903
 
        self.assertEquals(test_list, _test_ids(suite))
2904
 
 
2905
 
    def test_load_tests_inside_module(self):
2906
 
        test_list = ['bzrlib.tests.test_sampler.DemoTest.test_nothing']
2907
 
        loader = self._create_loader('bzrlib.tests.test_sampler.Demo')
2908
 
 
2909
 
        suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler')
2910
 
        self.assertEquals(test_list, _test_ids(suite))
2911
 
 
2912
 
    def test_exclude_tests(self):
2913
 
        test_list = ['bogus']
2914
 
        loader = self._create_loader('bogus')
2915
 
 
2916
 
        suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler')
2917
 
        self.assertEquals([], _test_ids(suite))
2918
 
 
2919
 
 
2920
 
class TestTestPrefixRegistry(tests.TestCase):
2921
 
 
2922
 
    def _get_registry(self):
2923
 
        tp_registry = tests.TestPrefixAliasRegistry()
2924
 
        return tp_registry
2925
 
 
2926
 
    def test_register_new_prefix(self):
2927
 
        tpr = self._get_registry()
2928
 
        tpr.register('foo', 'fff.ooo.ooo')
2929
 
        self.assertEquals('fff.ooo.ooo', tpr.get('foo'))
2930
 
 
2931
 
    def test_register_existing_prefix(self):
2932
 
        tpr = self._get_registry()
2933
 
        tpr.register('bar', 'bbb.aaa.rrr')
2934
 
        tpr.register('bar', 'bBB.aAA.rRR')
2935
 
        self.assertEquals('bbb.aaa.rrr', tpr.get('bar'))
2936
 
        self.assertThat(self.get_log(),
2937
 
            DocTestMatches("...bar...bbb.aaa.rrr...BB.aAA.rRR", ELLIPSIS))
2938
 
 
2939
 
    def test_get_unknown_prefix(self):
2940
 
        tpr = self._get_registry()
2941
 
        self.assertRaises(KeyError, tpr.get, 'I am not a prefix')
2942
 
 
2943
 
    def test_resolve_prefix(self):
2944
 
        tpr = self._get_registry()
2945
 
        tpr.register('bar', 'bb.aa.rr')
2946
 
        self.assertEquals('bb.aa.rr', tpr.resolve_alias('bar'))
2947
 
 
2948
 
    def test_resolve_unknown_alias(self):
2949
 
        tpr = self._get_registry()
2950
 
        self.assertRaises(errors.BzrCommandError,
2951
 
                          tpr.resolve_alias, 'I am not a prefix')
2952
 
 
2953
 
    def test_predefined_prefixes(self):
2954
 
        tpr = tests.test_prefix_alias_registry
2955
 
        self.assertEquals('bzrlib', tpr.resolve_alias('bzrlib'))
2956
 
        self.assertEquals('bzrlib.doc', tpr.resolve_alias('bd'))
2957
 
        self.assertEquals('bzrlib.utils', tpr.resolve_alias('bu'))
2958
 
        self.assertEquals('bzrlib.tests', tpr.resolve_alias('bt'))
2959
 
        self.assertEquals('bzrlib.tests.blackbox', tpr.resolve_alias('bb'))
2960
 
        self.assertEquals('bzrlib.plugins', tpr.resolve_alias('bp'))
2961
 
 
2962
 
 
2963
 
class TestRunSuite(tests.TestCase):
2964
 
 
2965
 
    def test_runner_class(self):
2966
 
        """run_suite accepts and uses a runner_class keyword argument."""
2967
 
        class Stub(tests.TestCase):
2968
 
            def test_foo(self):
2969
 
                pass
2970
 
        suite = Stub("test_foo")
2971
 
        calls = []
2972
 
        class MyRunner(tests.TextTestRunner):
2973
 
            def run(self, test):
2974
 
                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)
 
2071
 
 
2072
        suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler')
 
2073
        self.assertEquals([], _test_ids(suite))