/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1553.5.19 by Martin Pool
Run lockdir doctests
1
# Copyright (C) 2005, 2006 by Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
608 by Martin Pool
- Split selftests out into a new module and start changing them
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
608 by Martin Pool
- Split selftests out into a new module and start changing them
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
608 by Martin Pool
- Split selftests out into a new module and start changing them
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
609 by Martin Pool
- cleanup test code
17
1535 by Martin Pool
todo idea from John
18
# TODO: Perhaps there should be an API to find out if bzr running under the
19
# test suite -- some plugins might want to avoid making intrusive changes if
20
# this is the case.  However, we want behaviour under to test to diverge as
21
# little as possible, so this should be used rarely if it's added at all.
22
# (Suggestion from j-a-meinel, 2005-11-24)
23
1553.5.68 by Martin Pool
Add new TestCaseWithTransport.assertIsDirectory() and tests
24
# NOTE: Some classes in here use camelCaseNaming() rather than
25
# underscore_naming().  That's for consistency with unittest; it's not the
26
# general style of bzrlib.  Please continue that consistency when adding e.g.
27
# new assertFoo() methods.
28
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
29
import codecs
1185.1.29 by Robert Collins
merge merge tweaks from aaron, which includes latest .dev
30
from cStringIO import StringIO
1185.16.16 by Martin Pool
- add TestCase.assertEqualDiffs helper
31
import difflib
1740.6.1 by Martin Pool
Remove Scratch objects used by doctests
32
import doctest
1185.16.16 by Martin Pool
- add TestCase.assertEqualDiffs helper
33
import errno
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
34
import logging
35
import os
1185.16.16 by Martin Pool
- add TestCase.assertEqualDiffs helper
36
import re
1752.1.1 by Aaron Bentley
Add run_bzr_external
37
import shlex
1530.1.17 by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible.
38
import stat
1752.1.1 by Aaron Bentley
Add run_bzr_external
39
from subprocess import Popen, PIPE
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
40
import sys
1185.16.16 by Martin Pool
- add TestCase.assertEqualDiffs helper
41
import tempfile
42
import unittest
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
43
import time
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
44
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
45
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
46
import bzrlib.branch
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
47
import bzrlib.bzrdir as bzrdir
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
48
import bzrlib.commands
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
49
import bzrlib.bundle.serializer
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
50
import bzrlib.errors as errors
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
51
import bzrlib.inventory
1185.67.6 by Aaron Bentley
Added tests and fixes for LockableFiles.put_utf8(); imported IterableFile
52
import bzrlib.iterablefile
1553.5.19 by Martin Pool
Run lockdir doctests
53
import bzrlib.lockdir
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
54
try:
55
    import bzrlib.lsprof
56
except ImportError:
57
    # lsprof not available
58
    pass
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
59
from bzrlib.merge import merge_inner
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
60
import bzrlib.merge3
61
import bzrlib.osutils
62
import bzrlib.osutils as osutils
63
import bzrlib.plugin
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
64
import bzrlib.progress as progress
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
65
from bzrlib.revision import common_ancestor
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
66
import bzrlib.store
1910.2.9 by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API
67
from bzrlib import symbol_versioning
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
68
import bzrlib.trace
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
69
from bzrlib.transport import get_transport
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
70
import bzrlib.transport
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
71
from bzrlib.transport.local import LocalRelpathServer
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
72
from bzrlib.transport.readonly import ReadonlyServer
1185.43.1 by Martin Pool
Remove direct logging calls from selftest
73
from bzrlib.trace import mutter
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
74
from bzrlib.tests import TestUtil
75
from bzrlib.tests.TestUtil import (
76
                          TestSuite,
77
                          TestLoader,
78
                          )
1514 by Robert Collins
Unbreak self.build_tree_shape in tests.
79
from bzrlib.tests.treeshape import build_tree_contents
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
80
import bzrlib.urlutils as urlutils
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
81
from bzrlib.workingtree import WorkingTree, WorkingTreeFormat2
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
82
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
83
default_transport = LocalRelpathServer
84
855 by Martin Pool
- Patch from John to allow plugins to add their own tests.
85
MODULES_TO_TEST = []
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
86
MODULES_TO_DOCTEST = [
87
                      bzrlib.branch,
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
88
                      bzrlib.bundle.serializer,
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
89
                      bzrlib.commands,
90
                      bzrlib.errors,
91
                      bzrlib.inventory,
1185.67.6 by Aaron Bentley
Added tests and fixes for LockableFiles.put_utf8(); imported IterableFile
92
                      bzrlib.iterablefile,
1553.5.19 by Martin Pool
Run lockdir doctests
93
                      bzrlib.lockdir,
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
94
                      bzrlib.merge3,
1545.1.2 by Denys Duchier
order MODULES_TO_DOCTEST alphabetically
95
                      bzrlib.option,
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
96
                      bzrlib.osutils,
1910.16.2 by Andrew Bennetts
Reduce transport code duplication by creating a '_combine_paths' method to Transport.
97
                      bzrlib.store,
98
                      bzrlib.transport,
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
99
                      ]
1185.82.7 by John Arbash Meinel
Adding patches.py into bzrlib, including the tests into the test suite.
100
101
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
102
def packages_to_test():
1530.2.1 by Robert Collins
Start tests for api usage.
103
    """Return a list of packages to test.
104
105
    The packages are not globally imported so that import failures are
106
    triggered when running selftest, not when importing the command.
107
    """
108
    import bzrlib.doc
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
109
    import bzrlib.tests.blackbox
1534.4.23 by Robert Collins
Move branch implementations tests into a package.
110
    import bzrlib.tests.branch_implementations
1534.4.39 by Robert Collins
Basic BzrDir support.
111
    import bzrlib.tests.bzrdir_implementations
1534.1.29 by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
112
    import bzrlib.tests.interrepository_implementations
1563.2.12 by Robert Collins
Checkpointing: created InterObject to factor out common inter object worker code, added InterVersionedFile and tests to allow making join work between any versionedfile.
113
    import bzrlib.tests.interversionedfile_implementations
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
114
    import bzrlib.tests.intertree_implementations
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
115
    import bzrlib.tests.repository_implementations
1563.2.21 by Robert Collins
Smoke test for RevisionStore factories creating revision stores.
116
    import bzrlib.tests.revisionstore_implementations
1852.6.1 by Robert Collins
Start tree implementation tests.
117
    import bzrlib.tests.tree_implementations
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
118
    import bzrlib.tests.workingtree_implementations
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
119
    return [
1530.2.1 by Robert Collins
Start tests for api usage.
120
            bzrlib.doc,
1551.2.6 by Aaron Bentley
Restored blackbox tests [recommit]
121
            bzrlib.tests.blackbox,
1534.4.23 by Robert Collins
Move branch implementations tests into a package.
122
            bzrlib.tests.branch_implementations,
1534.4.39 by Robert Collins
Basic BzrDir support.
123
            bzrlib.tests.bzrdir_implementations,
1534.1.29 by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
124
            bzrlib.tests.interrepository_implementations,
1563.2.12 by Robert Collins
Checkpointing: created InterObject to factor out common inter object worker code, added InterVersionedFile and tests to allow making join work between any versionedfile.
125
            bzrlib.tests.interversionedfile_implementations,
1852.8.3 by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case.
126
            bzrlib.tests.intertree_implementations,
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
127
            bzrlib.tests.repository_implementations,
1563.2.21 by Robert Collins
Smoke test for RevisionStore factories creating revision stores.
128
            bzrlib.tests.revisionstore_implementations,
1852.6.1 by Robert Collins
Start tree implementation tests.
129
            bzrlib.tests.tree_implementations,
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
130
            bzrlib.tests.workingtree_implementations,
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
131
            ]
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
132
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
133
134
class _MyResult(unittest._TextTestResult):
1185.43.2 by Martin Pool
Nicer display of verbose test results and progress
135
    """Custom TestResult.
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
136
1185.33.54 by Martin Pool
[merge] test renames and other fixes (John)
137
    Shows output in a different format, including displaying runtime for tests.
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
138
    """
1185.62.21 by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test.
139
    stop_early = False
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
140
    
1819.1.1 by Carl Friedrich Bolz
(lifeless, cfbolz, hpk): Give the test result object an optional benchmark
141
    def __init__(self, stream, descriptions, verbosity, pb=None,
142
                 bench_history=None):
1819.1.8 by Martin Pool
Improved reporting of bzrlib revision_id
143
        """Construct new TestResult.
144
145
        :param bench_history: Optionally, a writable file object to accumulate
146
            benchmark results.
147
        """
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
148
        unittest._TextTestResult.__init__(self, stream, descriptions, verbosity)
149
        self.pb = pb
1819.1.1 by Carl Friedrich Bolz
(lifeless, cfbolz, hpk): Give the test result object an optional benchmark
150
        if bench_history is not None:
1819.1.8 by Martin Pool
Improved reporting of bzrlib revision_id
151
            from bzrlib.version import _get_bzr_source_tree
152
            src_tree = _get_bzr_source_tree()
153
            if src_tree:
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
154
                try:
155
                    revision_id = src_tree.get_parent_ids()[0]
156
                except IndexError:
157
                    # XXX: if this is a brand new tree, do the same as if there
158
                    # is no branch.
159
                    revision_id = ''
1819.1.8 by Martin Pool
Improved reporting of bzrlib revision_id
160
            else:
161
                # XXX: If there's no branch, what should we do?
162
                revision_id = ''
1819.1.4 by Jan Balster
save the revison id for every benchmark run in .perf-history
163
            bench_history.write("--date %s %s\n" % (time.time(), revision_id))
1819.1.3 by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history
164
        self._bench_history = bench_history
1707.2.3 by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool).
165
    
1707.2.4 by Robert Collins
Teach the bzrlib TestCase to report the time take by calls to self.time as benchmark time, allowing granular reporting of time during benchmarks. See bzrlib.benchmarks.bench_add. (Robert Collins, Martin Pool)
166
    def extractBenchmarkTime(self, testCase):
1707.2.3 by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool).
167
        """Add a benchmark time for the current test case."""
1707.2.4 by Robert Collins
Teach the bzrlib TestCase to report the time take by calls to self.time as benchmark time, allowing granular reporting of time during benchmarks. See bzrlib.benchmarks.bench_add. (Robert Collins, Martin Pool)
168
        self._benchmarkTime = getattr(testCase, "_benchtime", None)
1707.2.3 by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool).
169
    
170
    def _elapsedTestTimeString(self):
171
        """Return a time string for the overall time the current test has taken."""
172
        return self._formatTime(time.time() - self._start_time)
173
174
    def _testTimeString(self):
175
        if self._benchmarkTime is not None:
176
            return "%s/%s" % (
177
                self._formatTime(self._benchmarkTime),
178
                self._elapsedTestTimeString())
179
        else:
1707.2.4 by Robert Collins
Teach the bzrlib TestCase to report the time take by calls to self.time as benchmark time, allowing granular reporting of time during benchmarks. See bzrlib.benchmarks.bench_add. (Robert Collins, Martin Pool)
180
            return "      %s" % self._elapsedTestTimeString()
1707.2.3 by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool).
181
182
    def _formatTime(self, seconds):
183
        """Format seconds as milliseconds with leading spaces."""
184
        return "%5dms" % (1000 * seconds)
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
185
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
186
    def _ellipsise_unimportant_words(self, a_string, final_width,
187
                                   keep_start=False):
1707.2.3 by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool).
188
        """Add ellipses (sp?) for overly long strings.
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
189
        
190
        :param keep_start: If true preserve the start of a_string rather
191
                           than the end of it.
192
        """
193
        if keep_start:
194
            if len(a_string) > final_width:
195
                result = a_string[:final_width-3] + '...'
196
            else:
197
                result = a_string
198
        else:
199
            if len(a_string) > final_width:
200
                result = '...' + a_string[3-final_width:]
201
            else:
202
                result = a_string
203
        return result.ljust(final_width)
204
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
205
    def startTest(self, test):
206
        unittest.TestResult.startTest(self, test)
1185.31.17 by John Arbash Meinel
Shorten test names in verbose mode in a logical way. Removed bzrlib.selftest prefix
207
        # In a short description, the important words are in
208
        # the beginning, but in an id, the important words are
209
        # at the end
1185.33.54 by Martin Pool
[merge] test renames and other fixes (John)
210
        SHOW_DESCRIPTIONS = False
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
211
212
        if not self.showAll and self.dots and self.pb is not None:
213
            final_width = 13
214
        else:
215
            final_width = osutils.terminal_width()
1707.2.4 by Robert Collins
Teach the bzrlib TestCase to report the time take by calls to self.time as benchmark time, allowing granular reporting of time during benchmarks. See bzrlib.benchmarks.bench_add. (Robert Collins, Martin Pool)
216
            final_width = final_width - 15 - 8
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
217
        what = None
218
        if SHOW_DESCRIPTIONS:
219
            what = test.shortDescription()
220
            if what:
221
                what = self._ellipsise_unimportant_words(what, final_width, keep_start=True)
222
        if what is None:
223
            what = test.id()
224
            if what.startswith('bzrlib.tests.'):
225
                what = what[13:]
226
            what = self._ellipsise_unimportant_words(what, final_width)
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
227
        if self.showAll:
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
228
            self.stream.write(what)
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
229
        elif self.dots and self.pb is not None:
230
            self.pb.update(what, self.testsRun - 1, None)
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
231
        self.stream.flush()
1707.2.3 by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool).
232
        self._recordTestStartTime()
233
234
    def _recordTestStartTime(self):
235
        """Record that a test has started."""
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
236
        self._start_time = time.time()
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
237
238
    def addError(self, test, err):
1185.33.95 by Martin Pool
New TestSkipped facility, and tests for it.
239
        if isinstance(err[1], TestSkipped):
240
            return self.addSkipped(test, err)    
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
241
        unittest.TestResult.addError(self, test, err)
1707.2.4 by Robert Collins
Teach the bzrlib TestCase to report the time take by calls to self.time as benchmark time, allowing granular reporting of time during benchmarks. See bzrlib.benchmarks.bench_add. (Robert Collins, Martin Pool)
242
        self.extractBenchmarkTime(test)
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
243
        if self.showAll:
1707.2.3 by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool).
244
            self.stream.writeln("ERROR %s" % self._testTimeString())
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
245
        elif self.dots and self.pb is None:
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
246
            self.stream.write('E')
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
247
        elif self.dots:
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
248
            self.pb.update(self._ellipsise_unimportant_words('ERROR', 13), self.testsRun, None)
1864.3.1 by John Arbash Meinel
Print out when a test fails in non verbose mode, run transport tests later
249
            self.pb.note(self._ellipsise_unimportant_words(
250
                            test.id() + ': ERROR',
251
                            osutils.terminal_width()))
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
252
        self.stream.flush()
1185.62.21 by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test.
253
        if self.stop_early:
254
            self.stop()
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
255
256
    def addFailure(self, test, err):
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
257
        unittest.TestResult.addFailure(self, test, err)
1707.2.4 by Robert Collins
Teach the bzrlib TestCase to report the time take by calls to self.time as benchmark time, allowing granular reporting of time during benchmarks. See bzrlib.benchmarks.bench_add. (Robert Collins, Martin Pool)
258
        self.extractBenchmarkTime(test)
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
259
        if self.showAll:
1707.2.3 by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool).
260
            self.stream.writeln(" FAIL %s" % self._testTimeString())
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
261
        elif self.dots and self.pb is None:
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
262
            self.stream.write('F')
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
263
        elif self.dots:
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
264
            self.pb.update(self._ellipsise_unimportant_words('FAIL', 13), self.testsRun, None)
1864.3.1 by John Arbash Meinel
Print out when a test fails in non verbose mode, run transport tests later
265
            self.pb.note(self._ellipsise_unimportant_words(
266
                            test.id() + ': FAIL',
267
                            osutils.terminal_width()))
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
268
        self.stream.flush()
1185.62.21 by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test.
269
        if self.stop_early:
270
            self.stop()
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
271
272
    def addSuccess(self, test):
1707.2.4 by Robert Collins
Teach the bzrlib TestCase to report the time take by calls to self.time as benchmark time, allowing granular reporting of time during benchmarks. See bzrlib.benchmarks.bench_add. (Robert Collins, Martin Pool)
273
        self.extractBenchmarkTime(test)
1819.1.3 by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history
274
        if self._bench_history is not None:
275
            if self._benchmarkTime is not None:
276
                self._bench_history.write("%s %s\n" % (
277
                    self._formatTime(self._benchmarkTime),
278
                    test.id()))
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
279
        if self.showAll:
1707.2.3 by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool).
280
            self.stream.writeln('   OK %s' % self._testTimeString())
1728.1.3 by Robert Collins
Guard benchcalls with a getattr, and update test_selftest for the new output.
281
            for bench_called, stats in getattr(test, '_benchcalls', []):
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
282
                self.stream.writeln('LSProf output for %s(%s, %s)' % bench_called)
283
                stats.pprint(file=self.stream)
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
284
        elif self.dots and self.pb is None:
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
285
            self.stream.write('~')
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
286
        elif self.dots:
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
287
            self.pb.update(self._ellipsise_unimportant_words('OK', 13), self.testsRun, None)
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
288
        self.stream.flush()
289
        unittest.TestResult.addSuccess(self, test)
290
1185.33.96 by Martin Pool
Fix up display of reasons why tests were skipped.
291
    def addSkipped(self, test, skip_excinfo):
1707.2.4 by Robert Collins
Teach the bzrlib TestCase to report the time take by calls to self.time as benchmark time, allowing granular reporting of time during benchmarks. See bzrlib.benchmarks.bench_add. (Robert Collins, Martin Pool)
292
        self.extractBenchmarkTime(test)
1185.33.95 by Martin Pool
New TestSkipped facility, and tests for it.
293
        if self.showAll:
1707.2.3 by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool).
294
            print >>self.stream, ' SKIP %s' % self._testTimeString()
1185.33.96 by Martin Pool
Fix up display of reasons why tests were skipped.
295
            print >>self.stream, '     %s' % skip_excinfo[1]
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
296
        elif self.dots and self.pb is None:
1185.33.95 by Martin Pool
New TestSkipped facility, and tests for it.
297
            self.stream.write('S')
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
298
        elif self.dots:
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
299
            self.pb.update(self._ellipsise_unimportant_words('SKIP', 13), self.testsRun, None)
1185.33.95 by Martin Pool
New TestSkipped facility, and tests for it.
300
        self.stream.flush()
301
        # seems best to treat this as success from point-of-view of unittest
302
        # -- it actually does nothing so it barely matters :)
1711.7.9 by John Arbash Meinel
call tearDown() when tests are skipped
303
        try:
304
            test.tearDown()
305
        except KeyboardInterrupt:
306
            raise
307
        except:
308
            self.addError(test, test.__exc_info())
309
        else:
310
            unittest.TestResult.addSuccess(self, test)
1185.33.95 by Martin Pool
New TestSkipped facility, and tests for it.
311
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
312
    def printErrorList(self, flavour, errors):
313
        for test, err in errors:
314
            self.stream.writeln(self.separator1)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
315
            self.stream.writeln("%s: %s" % (flavour, self.getDescription(test)))
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
316
            if getattr(test, '_get_log', None) is not None:
1185.33.95 by Martin Pool
New TestSkipped facility, and tests for it.
317
                print >>self.stream
318
                print >>self.stream, \
1530.1.3 by Robert Collins
transport implementations now tested consistently.
319
                        ('vvvv[log from %s]' % test.id()).ljust(78,'-')
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
320
                print >>self.stream, test._get_log()
1185.33.95 by Martin Pool
New TestSkipped facility, and tests for it.
321
                print >>self.stream, \
1530.1.3 by Robert Collins
transport implementations now tested consistently.
322
                        ('^^^^[log from %s]' % test.id()).ljust(78,'-')
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
323
            self.stream.writeln(self.separator2)
324
            self.stream.writeln("%s" % err)
325
326
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
327
class TextTestRunner(object):
1185.16.58 by mbp at sourcefrog
- run all selftests by default
328
    stop_on_failure = False
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
329
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
330
    def __init__(self,
331
                 stream=sys.stderr,
332
                 descriptions=0,
333
                 verbosity=1,
334
                 keep_output=False,
1819.1.2 by Carl Friedrich Bolz
(lifeless, cfbolz, hpk): Add a benchmark output parameter to TextTestRunner.
335
                 pb=None,
336
                 bench_history=None):
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
337
        self.stream = unittest._WritelnDecorator(stream)
338
        self.descriptions = descriptions
339
        self.verbosity = verbosity
340
        self.keep_output = keep_output
341
        self.pb = pb
1819.1.2 by Carl Friedrich Bolz
(lifeless, cfbolz, hpk): Add a benchmark output parameter to TextTestRunner.
342
        self._bench_history = bench_history
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
343
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
344
    def _makeResult(self):
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
345
        result = _MyResult(self.stream,
346
                           self.descriptions,
347
                           self.verbosity,
1819.1.2 by Carl Friedrich Bolz
(lifeless, cfbolz, hpk): Add a benchmark output parameter to TextTestRunner.
348
                           pb=self.pb,
349
                           bench_history=self._bench_history)
1185.62.21 by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test.
350
        result.stop_early = self.stop_on_failure
1185.16.58 by mbp at sourcefrog
- run all selftests by default
351
        return result
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
352
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
353
    def run(self, test):
354
        "Run the given test case or test suite."
355
        result = self._makeResult()
356
        startTime = time.time()
357
        if self.pb is not None:
358
            self.pb.update('Running tests', 0, test.countTestCases())
359
        test.run(result)
360
        stopTime = time.time()
361
        timeTaken = stopTime - startTime
362
        result.printErrors()
363
        self.stream.writeln(result.separator2)
364
        run = result.testsRun
365
        self.stream.writeln("Ran %d test%s in %.3fs" %
366
                            (run, run != 1 and "s" or "", timeTaken))
367
        self.stream.writeln()
368
        if not result.wasSuccessful():
369
            self.stream.write("FAILED (")
370
            failed, errored = map(len, (result.failures, result.errors))
371
            if failed:
372
                self.stream.write("failures=%d" % failed)
373
            if errored:
374
                if failed: self.stream.write(", ")
375
                self.stream.write("errors=%d" % errored)
376
            self.stream.writeln(")")
377
        else:
378
            self.stream.writeln("OK")
379
        if self.pb is not None:
380
            self.pb.update('Cleaning up', 0, 1)
381
        # This is still a little bogus, 
382
        # but only a little. Folk not using our testrunner will
383
        # have to delete their temp directories themselves.
1534.11.4 by Robert Collins
Merge from mainline.
384
        test_root = TestCaseInTempDir.TEST_ROOT
1534.11.6 by Robert Collins
Adjust test-of-tests to accomodate the global state of TEST_ROOT.
385
        if result.wasSuccessful() or not self.keep_output:
1534.11.4 by Robert Collins
Merge from mainline.
386
            if test_root is not None:
1685.1.80 by Wouter van Heyst
more code cleanup
387
                # If LANG=C we probably have created some bogus paths
388
                # which rmtree(unicode) will fail to delete
389
                # so make sure we are using rmtree(str) to delete everything
1711.4.9 by John Arbash Meinel
In general, python on win32 needs to use the unicode os api, because bytestream stuff just doesn't work.
390
                # except on win32, where rmtree(str) will fail
391
                # since it doesn't have the property of byte-stream paths
392
                # (they are either ascii or mbcs)
393
                if sys.platform == 'win32':
394
                    # make sure we are using the unicode win32 api
395
                    test_root = unicode(test_root)
396
                else:
397
                    test_root = test_root.encode(
398
                        sys.getfilesystemencoding())
399
                osutils.rmtree(test_root)
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
400
        else:
1534.11.6 by Robert Collins
Adjust test-of-tests to accomodate the global state of TEST_ROOT.
401
            if self.pb is not None:
402
                self.pb.note("Failed tests working directories are in '%s'\n",
403
                             test_root)
404
            else:
405
                self.stream.writeln(
406
                    "Failed tests working directories are in '%s'\n" %
407
                    test_root)
408
        TestCaseInTempDir.TEST_ROOT = None
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
409
        if self.pb is not None:
410
            self.pb.clear()
411
        return result
412
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
413
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
414
def iter_suite_tests(suite):
415
    """Return all tests in a suite, recursing through nested suites"""
416
    for item in suite._tests:
417
        if isinstance(item, unittest.TestCase):
418
            yield item
419
        elif isinstance(item, unittest.TestSuite):
420
            for r in iter_suite_tests(item):
421
                yield r
422
        else:
423
            raise Exception('unknown object %r inside test suite %r'
424
                            % (item, suite))
425
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
426
427
class TestSkipped(Exception):
428
    """Indicates that a test was intentionally skipped, rather than failing."""
429
430
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
431
class CommandFailed(Exception):
432
    pass
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
433
1185.85.8 by John Arbash Meinel
Adding wrapper for sys.stdout so we can set the output encoding. Adding tests that 'bzr log' handles multiple encodings properly
434
435
class StringIOWrapper(object):
436
    """A wrapper around cStringIO which just adds an encoding attribute.
437
    
438
    Internally we can check sys.stdout to see what the output encoding
439
    should be. However, cStringIO has no encoding attribute that we can
440
    set. So we wrap it instead.
441
    """
442
    encoding='ascii'
443
    _cstring = None
444
445
    def __init__(self, s=None):
446
        if s is not None:
447
            self.__dict__['_cstring'] = StringIO(s)
448
        else:
449
            self.__dict__['_cstring'] = StringIO()
450
451
    def __getattr__(self, name, getattr=getattr):
452
        return getattr(self.__dict__['_cstring'], name)
453
454
    def __setattr__(self, name, val):
455
        if name == 'encoding':
456
            self.__dict__['encoding'] = val
457
        else:
458
            return setattr(self._cstring, name, val)
459
460
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
461
class TestCase(unittest.TestCase):
462
    """Base class for bzr unit tests.
463
    
464
    Tests that need access to disk resources should subclass 
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
465
    TestCaseInTempDir not TestCase.
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
466
467
    Error and debug log messages are redirected from their usual
468
    location into a temporary file, the contents of which can be
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
469
    retrieved by _get_log().  We use a real OS file, not an in-memory object,
470
    so that it can also capture file IO.  When the test completes this file
471
    is read into memory and removed from disk.
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
472
       
473
    There are also convenience functions to invoke bzr's command-line
1185.16.108 by mbp at sourcefrog
Add TestCase.addCleanup method.
474
    routine, and to build and check bzr trees.
475
   
476
    In addition to the usual method of overriding tearDown(), this class also
477
    allows subclasses to register functions into the _cleanups list, which is
478
    run in order as the object is torn down.  It's less likely this will be
479
    accidentally overlooked.
480
    """
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
481
1185.16.14 by Martin Pool
- make TestCase._get_log work even if setup was aborted
482
    _log_file_name = None
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
483
    _log_contents = ''
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
484
    # record lsprof data when performing benchmark calls.
485
    _gather_lsprof_in_benchmarks = False
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
486
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
487
    def __init__(self, methodName='testMethod'):
488
        super(TestCase, self).__init__(methodName)
489
        self._cleanups = []
490
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
491
    def setUp(self):
492
        unittest.TestCase.setUp(self)
1185.16.110 by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks
493
        self._cleanEnvironment()
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
494
        bzrlib.trace.disable_default_logging()
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
495
        self._startLogFile()
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
496
        self._benchcalls = []
1707.2.4 by Robert Collins
Teach the bzrlib TestCase to report the time take by calls to self.time as benchmark time, allowing granular reporting of time during benchmarks. See bzrlib.benchmarks.bench_add. (Robert Collins, Martin Pool)
497
        self._benchtime = None
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
498
1185.16.16 by Martin Pool
- add TestCase.assertEqualDiffs helper
499
    def _ndiff_strings(self, a, b):
1185.16.67 by Martin Pool
- assertEqualDiff handles strings without trailing newline
500
        """Return ndiff between two strings containing lines.
501
        
502
        A trailing newline is added if missing to make the strings
503
        print properly."""
504
        if b and b[-1] != '\n':
505
            b += '\n'
506
        if a and a[-1] != '\n':
507
            a += '\n'
1185.16.21 by Martin Pool
- tweak diff shown by assertEqualDiff
508
        difflines = difflib.ndiff(a.splitlines(True),
509
                                  b.splitlines(True),
510
                                  linejunk=lambda x: False,
511
                                  charjunk=lambda x: False)
512
        return ''.join(difflines)
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
513
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
514
    def assertEqualDiff(self, a, b, message=None):
1185.16.16 by Martin Pool
- add TestCase.assertEqualDiffs helper
515
        """Assert two texts are equal, if not raise an exception.
516
        
517
        This is intended for use with multi-line strings where it can 
518
        be hard to find the differences by eye.
519
        """
520
        # TODO: perhaps override assertEquals to call this for strings?
521
        if a == b:
522
            return
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
523
        if message is None:
524
            message = "texts not equal:\n"
525
        raise AssertionError(message + 
1185.16.16 by Martin Pool
- add TestCase.assertEqualDiffs helper
526
                             self._ndiff_strings(a, b))      
1185.31.40 by John Arbash Meinel
Added osutils.mkdtemp()
527
        
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
528
    def assertEqualMode(self, mode, mode_test):
529
        self.assertEqual(mode, mode_test,
530
                         'mode mismatch %o != %o' % (mode, mode_test))
531
1185.31.40 by John Arbash Meinel
Added osutils.mkdtemp()
532
    def assertStartsWith(self, s, prefix):
533
        if not s.startswith(prefix):
534
            raise AssertionError('string %r does not start with %r' % (s, prefix))
535
536
    def assertEndsWith(self, s, suffix):
1692.3.1 by Robert Collins
Fix push to work with just a branch, no need for a working tree.
537
        """Asserts that s ends with suffix."""
538
        if not s.endswith(suffix):
1185.31.40 by John Arbash Meinel
Added osutils.mkdtemp()
539
            raise AssertionError('string %r does not end with %r' % (s, suffix))
1185.16.42 by Martin Pool
- Add assertContainsRe
540
541
    def assertContainsRe(self, haystack, needle_re):
542
        """Assert that a contains something matching a regular expression."""
543
        if not re.search(needle_re, haystack):
544
            raise AssertionError('pattern "%s" not found in "%s"'
545
                    % (needle_re, haystack))
1442.1.70 by Robert Collins
Add assertFileEqual to TestCaseInTempDir.
546
1185.84.3 by Aaron Bentley
Hide diffs for old revisions in bundles
547
    def assertNotContainsRe(self, haystack, needle_re):
548
        """Assert that a does not match a regular expression"""
549
        if re.search(needle_re, haystack):
550
            raise AssertionError('pattern "%s" found in "%s"'
551
                    % (needle_re, haystack))
552
1553.5.3 by Martin Pool
[patch] Rename TestCase.AssertSubset to assertSubset for consistency (Jan Hudec)
553
    def assertSubset(self, sublist, superlist):
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
554
        """Assert that every entry in sublist is present in superlist."""
555
        missing = []
556
        for entry in sublist:
557
            if entry not in superlist:
558
                missing.append(entry)
559
        if len(missing) > 0:
560
            raise AssertionError("value(s) %r not present in container %r" % 
561
                                 (missing, superlist))
562
1185.68.1 by Aaron Bentley
test transactions
563
    def assertIs(self, left, right):
564
        if not (left is right):
565
            raise AssertionError("%r is not %r." % (left, right))
566
1530.1.21 by Robert Collins
Review feedback fixes.
567
    def assertTransportMode(self, transport, path, mode):
1530.1.17 by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible.
568
        """Fail if a path does not have mode mode.
569
        
1651.1.3 by Martin Pool
Use transport._can_roundtrip_unix_modebits to decide whether to check transport results
570
        If modes are not supported on this transport, the assertion is ignored.
1530.1.17 by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible.
571
        """
1651.1.3 by Martin Pool
Use transport._can_roundtrip_unix_modebits to decide whether to check transport results
572
        if not transport._can_roundtrip_unix_modebits():
1530.1.17 by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible.
573
            return
574
        path_stat = transport.stat(path)
575
        actual_mode = stat.S_IMODE(path_stat.st_mode)
576
        self.assertEqual(mode, actual_mode,
577
            'mode of %r incorrect (%o != %o)' % (path, mode, actual_mode))
578
1540.3.22 by Martin Pool
[patch] Add TestCase.assertIsInstance
579
    def assertIsInstance(self, obj, kls):
580
        """Fail if obj is not an instance of kls"""
581
        if not isinstance(obj, kls):
1666.1.6 by Robert Collins
Make knit the default format.
582
            self.fail("%r is an instance of %s rather than %s" % (
583
                obj, obj.__class__, kls))
1540.3.22 by Martin Pool
[patch] Add TestCase.assertIsInstance
584
1982.3.2 by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable
585
    def _capture_warnings(self, a_callable, *args, **kwargs):
586
        """A helper for callDeprecated and applyDeprecated.
1910.2.9 by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API
587
1982.3.2 by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable
588
        :param a_callable: A callable to call.
1910.2.9 by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API
589
        :param args: The positional arguments for the callable
590
        :param kwargs: The keyword arguments for the callable
1982.3.2 by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable
591
        :return: A tuple (warnings, result). result is the result of calling
592
            a_callable(*args, **kwargs).
1910.2.9 by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API
593
        """
594
        local_warnings = []
595
        def capture_warnings(msg, cls, stacklevel=None):
1982.3.2 by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable
596
            # we've hooked into a deprecation specific callpath,
597
            # only deprecations should getting sent via it.
1910.2.9 by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API
598
            self.assertEqual(cls, DeprecationWarning)
599
            local_warnings.append(msg)
1982.3.2 by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable
600
        original_warning_method = symbol_versioning.warn
1910.2.9 by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API
601
        symbol_versioning.set_warning_method(capture_warnings)
602
        try:
1982.3.2 by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable
603
            result = a_callable(*args, **kwargs)
1910.2.9 by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API
604
        finally:
1982.3.2 by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable
605
            symbol_versioning.set_warning_method(original_warning_method)
606
        return (local_warnings, result)
607
608
    def applyDeprecated(self, deprecation_format, a_callable, *args, **kwargs):
609
        """Call a deprecated callable without warning the user.
610
611
        :param deprecation_format: The deprecation format that the callable
612
            should have been deprecated with. This is the same type as the 
613
            parameter to deprecated_method/deprecated_function. If the 
614
            callable is not deprecated with this format, an assertion error
615
            will be raised.
616
        :param a_callable: A callable to call. This may be a bound method or
617
            a regular function. It will be called with *args and **kwargs.
618
        :param args: The positional arguments for the callable
619
        :param kwargs: The keyword arguments for the callable
620
        :return: The result of a_callable(*args, **kwargs)
621
        """
622
        call_warnings, result = self._capture_warnings(a_callable,
623
            *args, **kwargs)
624
        expected_first_warning = symbol_versioning.deprecation_string(
625
            a_callable, deprecation_format)
626
        if len(call_warnings) == 0:
1982.3.3 by Robert Collins
Change raise AssertionError to self.fail in the new applyDeprecated test support method.
627
            self.fail("No assertion generated by call to %s" %
1982.3.2 by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable
628
                a_callable)
629
        self.assertEqual(expected_first_warning, call_warnings[0])
630
        return result
631
632
    def callDeprecated(self, expected, callable, *args, **kwargs):
633
        """Assert that a callable is deprecated in a particular way.
634
635
        This is a very precise test for unusual requirements. The 
636
        applyDeprecated helper function is probably more suited for most tests
637
        as it allows you to simply specify the deprecation format being used
638
        and will ensure that that is issued for the function being called.
639
640
        :param expected: a list of the deprecation warnings expected, in order
641
        :param callable: The callable to call
642
        :param args: The positional arguments for the callable
643
        :param kwargs: The keyword arguments for the callable
644
        """
645
        call_warnings, result = self._capture_warnings(callable,
646
            *args, **kwargs)
647
        self.assertEqual(expected, call_warnings)
1910.2.9 by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API
648
        return result
649
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
650
    def _startLogFile(self):
651
        """Send bzr and test log messages to a temporary file.
652
653
        The file is removed as the test is torn down.
654
        """
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
655
        fileno, name = tempfile.mkstemp(suffix='.log', prefix='testbzr')
1948.1.9 by John Arbash Meinel
Change mutter() so that it doesn't try so hard to write out perfect utf8, instead, rather than using a utf8 file, it changes unicode to utf8 manually
656
        self._log_file = os.fdopen(fileno, 'w+')
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
657
        self._log_nonce = bzrlib.trace.enable_test_log(self._log_file)
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
658
        self._log_file_name = name
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
659
        self.addCleanup(self._finishLogFile)
660
661
    def _finishLogFile(self):
662
        """Finished with the log file.
663
664
        Read contents into memory, close, and delete.
665
        """
1711.7.10 by John Arbash Meinel
Nothing to clean up if self._log_file is None
666
        if self._log_file is None:
667
            return
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
668
        bzrlib.trace.disable_test_log(self._log_nonce)
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
669
        self._log_file.seek(0)
670
        self._log_contents = self._log_file.read()
1185.16.122 by Martin Pool
[patch] Close test log file before deleting, needed on Windows
671
        self._log_file.close()
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
672
        os.remove(self._log_file_name)
673
        self._log_file = self._log_file_name = None
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
674
1185.16.108 by mbp at sourcefrog
Add TestCase.addCleanup method.
675
    def addCleanup(self, callable):
676
        """Arrange to run a callable when this case is torn down.
677
678
        Callables are run in the reverse of the order they are registered, 
679
        ie last-in first-out.
680
        """
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
681
        if callable in self._cleanups:
682
            raise ValueError("cleanup function %r already registered on %s" 
683
                    % (callable, self))
1185.16.108 by mbp at sourcefrog
Add TestCase.addCleanup method.
684
        self._cleanups.append(callable)
685
1185.16.110 by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks
686
    def _cleanEnvironment(self):
1185.38.3 by John Arbash Meinel
Refactored environment cleaning code
687
        new_env = {
688
            'HOME': os.getcwd(),
689
            'APPDATA': os.getcwd(),
1861.4.1 by Matthieu Moy
BZREMAIL renamed to BZR_EMAIL.
690
            'BZR_EMAIL': None,
1912.2.1 by Adeodato Simó
Clear $BZREMAIL in tests, not only the newer $BZR_EMAIL, since the
691
            'BZREMAIL': None, # may still be present in the environment
1185.38.3 by John Arbash Meinel
Refactored environment cleaning code
692
            'EMAIL': None,
1963.1.6 by John Arbash Meinel
Use the new helper function in a few places
693
            'BZR_PROGRESS_BAR': None,
1185.38.3 by John Arbash Meinel
Refactored environment cleaning code
694
        }
1185.38.4 by John Arbash Meinel
Making old_env a private member
695
        self.__old_env = {}
1185.16.110 by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks
696
        self.addCleanup(self._restoreEnvironment)
1185.38.3 by John Arbash Meinel
Refactored environment cleaning code
697
        for name, value in new_env.iteritems():
698
            self._captureVar(name, value)
699
700
    def _captureVar(self, name, newvalue):
1963.1.6 by John Arbash Meinel
Use the new helper function in a few places
701
        """Set an environment variable, and reset it when finished."""
702
        self.__old_env[name] = osutils.set_or_unset_env(name, newvalue)
1185.38.2 by John Arbash Meinel
[patch] Aaron Bentley's HOME fix.
703
1185.16.110 by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks
704
    def _restoreEnvironment(self):
1185.38.4 by John Arbash Meinel
Making old_env a private member
705
        for name, value in self.__old_env.iteritems():
1963.1.6 by John Arbash Meinel
Use the new helper function in a few places
706
            osutils.set_or_unset_env(name, value)
1185.16.110 by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks
707
708
    def tearDown(self):
1185.16.108 by mbp at sourcefrog
Add TestCase.addCleanup method.
709
        self._runCleanups()
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
710
        unittest.TestCase.tearDown(self)
711
1707.2.4 by Robert Collins
Teach the bzrlib TestCase to report the time take by calls to self.time as benchmark time, allowing granular reporting of time during benchmarks. See bzrlib.benchmarks.bench_add. (Robert Collins, Martin Pool)
712
    def time(self, callable, *args, **kwargs):
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
713
        """Run callable and accrue the time it takes to the benchmark time.
714
        
715
        If lsprofiling is enabled (i.e. by --lsprof-time to bzr selftest) then
716
        this will cause lsprofile statistics to be gathered and stored in
717
        self._benchcalls.
718
        """
1707.2.4 by Robert Collins
Teach the bzrlib TestCase to report the time take by calls to self.time as benchmark time, allowing granular reporting of time during benchmarks. See bzrlib.benchmarks.bench_add. (Robert Collins, Martin Pool)
719
        if self._benchtime is None:
720
            self._benchtime = 0
721
        start = time.time()
722
        try:
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
723
            if not self._gather_lsprof_in_benchmarks:
724
                return callable(*args, **kwargs)
725
            else:
726
                # record this benchmark
727
                ret, stats = bzrlib.lsprof.profile(callable, *args, **kwargs)
728
                stats.sort()
729
                self._benchcalls.append(((callable, args, kwargs), stats))
730
                return ret
1707.2.4 by Robert Collins
Teach the bzrlib TestCase to report the time take by calls to self.time as benchmark time, allowing granular reporting of time during benchmarks. See bzrlib.benchmarks.bench_add. (Robert Collins, Martin Pool)
731
        finally:
732
            self._benchtime += time.time() - start
733
1185.16.108 by mbp at sourcefrog
Add TestCase.addCleanup method.
734
    def _runCleanups(self):
735
        """Run registered cleanup functions. 
736
737
        This should only be called from TestCase.tearDown.
738
        """
1541 by Martin Pool
doc
739
        # TODO: Perhaps this should keep running cleanups even if 
740
        # one of them fails?
1185.33.74 by Martin Pool
pychecker cleanups
741
        for cleanup_fn in reversed(self._cleanups):
742
            cleanup_fn()
1185.16.108 by mbp at sourcefrog
Add TestCase.addCleanup method.
743
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
744
    def log(self, *args):
1185.43.1 by Martin Pool
Remove direct logging calls from selftest
745
        mutter(*args)
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
746
747
    def _get_log(self):
748
        """Return as a string the log for this test"""
1185.16.14 by Martin Pool
- make TestCase._get_log work even if setup was aborted
749
        if self._log_file_name:
750
            return open(self._log_file_name).read()
751
        else:
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
752
            return self._log_contents
1185.43.1 by Martin Pool
Remove direct logging calls from selftest
753
        # TODO: Delete the log after it's been read in
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
754
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
755
    def capture(self, cmd, retcode=0):
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
756
        """Shortcut that splits cmd into words, runs, and returns stdout"""
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
757
        return self.run_bzr_captured(cmd.split(), retcode=retcode)[0]
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
758
1685.1.52 by John Arbash Meinel
[merge] bzr.dev 1704
759
    def run_bzr_captured(self, argv, retcode=0, encoding=None, stdin=None):
1185.22.7 by Michael Ellerman
Fix error in run_bzr_captured() doco
760
        """Invoke bzr and return (stdout, stderr).
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
761
762
        Useful for code that wants to check the contents of the
763
        output, the way error messages are presented, etc.
764
765
        This should be the main method for tests that want to exercise the
766
        overall behavior of the bzr application (rather than a unit test
767
        or a functional test of the library.)
768
769
        Much of the old code runs bzr by forking a new copy of Python, but
770
        that is slower, harder to debug, and generally not necessary.
771
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
772
        This runs bzr through the interface that catches and reports
773
        errors, and with logging set to something approximating the
774
        default, so that error reporting can be checked.
775
1185.85.8 by John Arbash Meinel
Adding wrapper for sys.stdout so we can set the output encoding. Adding tests that 'bzr log' handles multiple encodings properly
776
        :param argv: arguments to invoke bzr
777
        :param retcode: expected return code, or None for don't-care.
778
        :param encoding: encoding for sys.stdout and sys.stderr
1687.1.2 by Robert Collins
Add stdin parameter to run_bzr and run_bzr_captured.
779
        :param stdin: A string to be used as stdin for the command.
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
780
        """
1185.85.8 by John Arbash Meinel
Adding wrapper for sys.stdout so we can set the output encoding. Adding tests that 'bzr log' handles multiple encodings properly
781
        if encoding is None:
782
            encoding = bzrlib.user_encoding
1687.1.2 by Robert Collins
Add stdin parameter to run_bzr and run_bzr_captured.
783
        if stdin is not None:
784
            stdin = StringIO(stdin)
1185.85.8 by John Arbash Meinel
Adding wrapper for sys.stdout so we can set the output encoding. Adding tests that 'bzr log' handles multiple encodings properly
785
        stdout = StringIOWrapper()
786
        stderr = StringIOWrapper()
787
        stdout.encoding = encoding
788
        stderr.encoding = encoding
789
1185.85.72 by John Arbash Meinel
Fix some of the tests.
790
        self.log('run bzr: %r', argv)
1185.43.5 by Martin Pool
Update log message quoting
791
        # FIXME: don't call into logging here
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
792
        handler = logging.StreamHandler(stderr)
793
        handler.setLevel(logging.INFO)
794
        logger = logging.getLogger('')
795
        logger.addHandler(handler)
1692.3.3 by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory.
796
        old_ui_factory = bzrlib.ui.ui_factory
797
        bzrlib.ui.ui_factory = bzrlib.tests.blackbox.TestUIFactory(
798
            stdout=stdout,
799
            stderr=stderr)
1687.1.11 by Robert Collins
Teach TestCase.run_bzr_captured about the ui factories.
800
        bzrlib.ui.ui_factory.stdin = stdin
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
801
        try:
1687.1.2 by Robert Collins
Add stdin parameter to run_bzr and run_bzr_captured.
802
            result = self.apply_redirected(stdin, stdout, stderr,
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
803
                                           bzrlib.commands.run_bzr_catch_errors,
804
                                           argv)
805
        finally:
806
            logger.removeHandler(handler)
1692.3.3 by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory.
807
            bzrlib.ui.ui_factory = old_ui_factory
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
808
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
809
        out = stdout.getvalue()
810
        err = stderr.getvalue()
811
        if out:
1185.85.72 by John Arbash Meinel
Fix some of the tests.
812
            self.log('output:\n%r', out)
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
813
        if err:
1185.85.72 by John Arbash Meinel
Fix some of the tests.
814
            self.log('errors:\n%r', err)
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
815
        if retcode is not None:
1685.1.2 by John Arbash Meinel
Re-enabling the non_ascii tests after fixing trace.py, bzr ignore also does the right thing now
816
            self.assertEquals(retcode, result)
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
817
        return out, err
818
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
819
    def run_bzr(self, *args, **kwargs):
1119 by Martin Pool
doc
820
        """Invoke bzr, as if it were run from the command line.
821
822
        This should be the main method for tests that want to exercise the
823
        overall behavior of the bzr application (rather than a unit test
824
        or a functional test of the library.)
825
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
826
        This sends the stdout/stderr results into the test's log,
827
        where it may be useful for debugging.  See also run_captured.
1687.1.2 by Robert Collins
Add stdin parameter to run_bzr and run_bzr_captured.
828
829
        :param stdin: A string to be used as stdin for the command.
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
830
        """
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
831
        retcode = kwargs.pop('retcode', 0)
1185.85.8 by John Arbash Meinel
Adding wrapper for sys.stdout so we can set the output encoding. Adding tests that 'bzr log' handles multiple encodings properly
832
        encoding = kwargs.pop('encoding', None)
1687.1.2 by Robert Collins
Add stdin parameter to run_bzr and run_bzr_captured.
833
        stdin = kwargs.pop('stdin', None)
1685.1.52 by John Arbash Meinel
[merge] bzr.dev 1704
834
        return self.run_bzr_captured(args, retcode=retcode, encoding=encoding, stdin=stdin)
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
835
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
836
    def run_bzr_decode(self, *args, **kwargs):
1963.2.1 by Robey Pointer
remove usage of has_key()
837
        if 'encoding' in kwargs:
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
838
            encoding = kwargs['encoding']
839
        else:
840
            encoding = bzrlib.user_encoding
841
        return self.run_bzr(*args, **kwargs)[0].decode(encoding)
842
1711.2.70 by John Arbash Meinel
Add run_bzr_errors alongside run_bzr, to make it easy to check the right error is occurring.
843
    def run_bzr_error(self, error_regexes, *args, **kwargs):
1711.2.71 by John Arbash Meinel
Default to retcode=3, and add a test for run_bzr_error
844
        """Run bzr, and check that stderr contains the supplied regexes
845
        
1711.7.11 by John Arbash Meinel
Clean up the documentation for run_bzr_error on Martin's suggestion.
846
        :param error_regexes: Sequence of regular expressions which 
847
            must each be found in the error output. The relative ordering
848
            is not enforced.
849
        :param args: command-line arguments for bzr
850
        :param kwargs: Keyword arguments which are interpreted by run_bzr
851
            This function changes the default value of retcode to be 3,
852
            since in most cases this is run when you expect bzr to fail.
1711.2.71 by John Arbash Meinel
Default to retcode=3, and add a test for run_bzr_error
853
        :return: (out, err) The actual output of running the command (in case you
854
                 want to do more inspection)
1711.7.11 by John Arbash Meinel
Clean up the documentation for run_bzr_error on Martin's suggestion.
855
856
        Examples of use:
857
            # Make sure that commit is failing because there is nothing to do
858
            self.run_bzr_error(['no changes to commit'],
859
                               'commit', '-m', 'my commit comment')
860
            # Make sure --strict is handling an unknown file, rather than
861
            # giving us the 'nothing to do' error
862
            self.build_tree(['unknown'])
863
            self.run_bzr_error(['Commit refused because there are unknown files'],
864
                               'commit', '--strict', '-m', 'my commit comment')
1711.2.71 by John Arbash Meinel
Default to retcode=3, and add a test for run_bzr_error
865
        """
866
        kwargs.setdefault('retcode', 3)
1711.2.70 by John Arbash Meinel
Add run_bzr_errors alongside run_bzr, to make it easy to check the right error is occurring.
867
        out, err = self.run_bzr(*args, **kwargs)
868
        for regex in error_regexes:
869
            self.assertContainsRe(err, regex)
1711.2.71 by John Arbash Meinel
Default to retcode=3, and add a test for run_bzr_error
870
        return out, err
1711.2.70 by John Arbash Meinel
Add run_bzr_errors alongside run_bzr, to make it easy to check the right error is occurring.
871
1752.1.6 by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring
872
    def run_bzr_subprocess(self, *args, **kwargs):
873
        """Run bzr in a subprocess for testing.
874
875
        This starts a new Python interpreter and runs bzr in there. 
876
        This should only be used for tests that have a justifiable need for
877
        this isolation: e.g. they are testing startup time, or signal
878
        handling, or early startup code, etc.  Subprocess code can't be 
879
        profiled or debugged so easily.
1752.1.7 by Aaron Bentley
Stop using shlex in run_bzr_subprocess
880
881
        :param retcode: The status code that is expected.  Defaults to 0.  If
1963.1.1 by John Arbash Meinel
run_bzr_subprocess() can take an env_changes parameter
882
            None is supplied, the status code is not checked.
883
        :param env_changes: A dictionary which lists changes to environment
884
            variables. A value of None will unset the env variable.
885
            The values must be strings. The change will only occur in the
886
            child, so you don't need to fix the environment after running.
1963.1.11 by John Arbash Meinel
Add a universal_newlines flag to run_bzr_subprocess, so we can be line-ending independent for tests
887
        :param universal_newlines: Convert CRLF => LF
1752.1.6 by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring
888
        """
1963.1.2 by John Arbash Meinel
Cleanups suggested by Martin, add test that env_changes can remove an env variable
889
        env_changes = kwargs.get('env_changes', {})
1963.1.7 by John Arbash Meinel
Switch to directly setting the env, and cleaning it up. So that it works on all platforms
890
891
        old_env = {}
892
1963.1.2 by John Arbash Meinel
Cleanups suggested by Martin, add test that env_changes can remove an env variable
893
        def cleanup_environment():
894
            for env_var, value in env_changes.iteritems():
1963.1.7 by John Arbash Meinel
Switch to directly setting the env, and cleaning it up. So that it works on all platforms
895
                old_env[env_var] = osutils.set_or_unset_env(env_var, value)
896
897
        def restore_environment():
898
            for env_var, value in old_env.iteritems():
899
                osutils.set_or_unset_env(env_var, value)
1963.1.1 by John Arbash Meinel
run_bzr_subprocess() can take an env_changes parameter
900
1752.1.1 by Aaron Bentley
Add run_bzr_external
901
        bzr_path = os.path.dirname(os.path.dirname(bzrlib.__file__))+'/bzr'
1960.5.1 by Robert Collins
The bzr selftest was failing on installed versions due to a bug in a new
902
        if not os.path.isfile(bzr_path):
903
            # We are probably installed. Assume sys.argv is the right file
904
            bzr_path = sys.argv[0]
1752.1.1 by Aaron Bentley
Add run_bzr_external
905
        args = list(args)
1963.1.7 by John Arbash Meinel
Switch to directly setting the env, and cleaning it up. So that it works on all platforms
906
907
        try:
908
            # win32 subprocess doesn't support preexec_fn
909
            # so we will avoid using it on all platforms, just to
910
            # make sure the code path is used, and we don't break on win32
911
            cleanup_environment()
912
            process = Popen([sys.executable, bzr_path]+args,
913
                             stdout=PIPE, stderr=PIPE)
914
        finally:
915
            restore_environment()
916
            
1752.1.1 by Aaron Bentley
Add run_bzr_external
917
        out = process.stdout.read()
918
        err = process.stderr.read()
1963.1.11 by John Arbash Meinel
Add a universal_newlines flag to run_bzr_subprocess, so we can be line-ending independent for tests
919
920
        if kwargs.get('universal_newlines', False):
921
            out = out.replace('\r\n', '\n')
922
            err = err.replace('\r\n', '\n')
923
1752.1.1 by Aaron Bentley
Add run_bzr_external
924
        retcode = process.wait()
1752.1.6 by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring
925
        supplied_retcode = kwargs.get('retcode', 0)
1752.1.1 by Aaron Bentley
Add run_bzr_external
926
        if supplied_retcode is not None:
2002.1.1 by John Arbash Meinel
Add more verbose output when run_bzr_subprocess fails
927
            if supplied_retcode != retcode:
928
                mutter('Output of bzr %s:\n%s', args, out)
929
                mutter('Error for bzr %s:\n%s', args, err)
930
                self.fail('Command bzr %s failed with retcode %s != %s'
931
                          % (args, supplied_retcode, retcode))
1752.1.1 by Aaron Bentley
Add run_bzr_external
932
        return [out, err]
933
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
934
    def check_inventory_shape(self, inv, shape):
1291 by Martin Pool
- add test for moving files between directories
935
        """Compare an inventory to a list of expected names.
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
936
937
        Fail if they are not precisely equal.
938
        """
939
        extras = []
940
        shape = list(shape)             # copy
941
        for path, ie in inv.entries():
942
            name = path.replace('\\', '/')
943
            if ie.kind == 'dir':
944
                name = name + '/'
945
            if name in shape:
946
                shape.remove(name)
947
            else:
948
                extras.append(name)
949
        if shape:
950
            self.fail("expected paths not found in inventory: %r" % shape)
951
        if extras:
952
            self.fail("unexpected paths found in inventory: %r" % extras)
953
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
954
    def apply_redirected(self, stdin=None, stdout=None, stderr=None,
955
                         a_callable=None, *args, **kwargs):
956
        """Call callable with redirected std io pipes.
957
958
        Returns the return code."""
959
        if not callable(a_callable):
960
            raise ValueError("a_callable must be callable.")
961
        if stdin is None:
962
            stdin = StringIO("")
963
        if stdout is None:
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
964
            if getattr(self, "_log_file", None) is not None:
974.1.70 by Aaron Bentley
Fixed selftest spewage (Brian M. Carlson)
965
                stdout = self._log_file
966
            else:
967
                stdout = StringIO()
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
968
        if stderr is None:
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
969
            if getattr(self, "_log_file", None is not None):
974.1.70 by Aaron Bentley
Fixed selftest spewage (Brian M. Carlson)
970
                stderr = self._log_file
971
            else:
972
                stderr = StringIO()
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
973
        real_stdin = sys.stdin
974
        real_stdout = sys.stdout
975
        real_stderr = sys.stderr
976
        try:
977
            sys.stdout = stdout
978
            sys.stderr = stderr
979
            sys.stdin = stdin
1160 by Martin Pool
- tiny refactoring
980
            return a_callable(*args, **kwargs)
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
981
        finally:
982
            sys.stdout = real_stdout
983
            sys.stderr = real_stderr
984
            sys.stdin = real_stdin
985
1979.2.1 by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
986
    @symbol_versioning.deprecated_method(symbol_versioning.zero_eleven)
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
987
    def merge(self, branch_from, wt_to):
988
        """A helper for tests to do a ui-less merge.
989
990
        This should move to the main library when someone has time to integrate
991
        it in.
992
        """
993
        # minimal ui-less merge.
994
        wt_to.branch.fetch(branch_from)
995
        base_rev = common_ancestor(branch_from.last_revision(),
996
                                   wt_to.branch.last_revision(),
997
                                   wt_to.branch.repository)
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
998
        merge_inner(wt_to.branch, branch_from.basis_tree(),
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
999
                    wt_to.branch.repository.revision_tree(base_rev),
1000
                    this_tree=wt_to)
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
1001
        wt_to.add_parent_tree_id(branch_from.last_revision())
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1002
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
1003
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
1004
BzrTestBase = TestCase
1005
1006
     
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
1007
class TestCaseInTempDir(TestCase):
1008
    """Derived class that runs a test within a temporary directory.
1009
1010
    This is useful for tests that need to create a branch, etc.
1011
1012
    The directory is created in a slightly complex way: for each
1013
    Python invocation, a new temporary top-level directory is created.
1014
    All test cases create their own directory within that.  If the
1015
    tests complete successfully, the directory is removed.
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
1016
1017
    InTempDir is an old alias for FunctionalTestCase.
1018
    """
1019
1020
    TEST_ROOT = None
1021
    _TEST_NAME = 'test'
1022
    OVERRIDE_PYTHON = 'python'
1023
1024
    def check_file_contents(self, filename, expect):
1025
        self.log("check contents of file %s" % filename)
1026
        contents = file(filename, 'r').read()
1027
        if contents != expect:
1028
            self.log("expected: %r" % expect)
1029
            self.log("actually: %r" % contents)
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
1030
            self.fail("contents of %s not as expected" % filename)
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
1031
1032
    def _make_test_root(self):
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
1033
        if TestCaseInTempDir.TEST_ROOT is not None:
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
1034
            return
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1035
        i = 0
1036
        while True:
1185.16.147 by Martin Pool
[patch] Test base directory must be unicode (from Alexander)
1037
            root = u'test%04d.tmp' % i
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1038
            try:
1039
                os.mkdir(root)
1040
            except OSError, e:
1041
                if e.errno == errno.EEXIST:
1042
                    i += 1
1043
                    continue
1044
                else:
1045
                    raise
1046
            # successfully created
1185.31.37 by John Arbash Meinel
Switched os.path.abspath and os.path.realpath to osutils.* (still passes on cygwin)
1047
            TestCaseInTempDir.TEST_ROOT = osutils.abspath(root)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1048
            break
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
1049
        # make a fake bzr directory there to prevent any tests propagating
1050
        # up onto the source directory's real branch
1534.1.29 by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
1051
        bzrdir.BzrDir.create_standalone_workingtree(TestCaseInTempDir.TEST_ROOT)
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
1052
1053
    def setUp(self):
1185.16.110 by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks
1054
        super(TestCaseInTempDir, self).setUp()
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
1055
        self._make_test_root()
1185.16.110 by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks
1056
        _currentdir = os.getcwdu()
1551.6.2 by Aaron Bentley
Added explanatory comment
1057
        # shorten the name, to avoid test failures due to path length
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1058
        short_id = self.id().replace('bzrlib.tests.', '') \
1551.6.3 by Aaron Bentley
Updated from dev
1059
                   .replace('__main__.', '')[-100:]
1540.3.20 by Martin Pool
Construct unique test directory names even when test ids recurr
1060
        # it's possible the same test class is run several times for
1061
        # parameterized tests, so make sure the names don't collide.  
1062
        i = 0
1063
        while True:
1064
            if i > 0:
1065
                candidate_dir = '%s/%s.%d' % (self.TEST_ROOT, short_id, i)
1066
            else:
1067
                candidate_dir = '%s/%s' % (self.TEST_ROOT, short_id)
1068
            if os.path.exists(candidate_dir):
1069
                i = i + 1
1070
                continue
1071
            else:
1987.1.1 by John Arbash Meinel
Update the test suite to put HOME in a different directory
1072
                os.mkdir(candidate_dir)
1073
                self.test_home_dir = candidate_dir + '/home'
1074
                os.mkdir(self.test_home_dir)
1075
                self.test_dir = candidate_dir + '/work'
1540.3.20 by Martin Pool
Construct unique test directory names even when test ids recurr
1076
                os.mkdir(self.test_dir)
1077
                os.chdir(self.test_dir)
1078
                break
1987.1.1 by John Arbash Meinel
Update the test suite to put HOME in a different directory
1079
        os.environ['HOME'] = self.test_home_dir
1080
        os.environ['APPDATA'] = self.test_home_dir
1185.16.110 by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks
1081
        def _leaveDirectory():
1082
            os.chdir(_currentdir)
1083
        self.addCleanup(_leaveDirectory)
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
1084
        
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1085
    def build_tree(self, shape, line_endings='native', transport=None):
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
1086
        """Build a test tree according to a pattern.
1087
1088
        shape is a sequence of file specifications.  If the final
1089
        character is '/', a directory is created.
1090
1755.3.1 by Robert Collins
Tune the time to build our kernel_like tree : make LocalTransport.put faster, AtomicFile faster, LocalTransport.append faster.
1091
        This assumes that all the elements in the tree being built are new.
1092
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
1093
        This doesn't add anything to a branch.
1185.38.7 by John Arbash Meinel
Updated build_tree to use fixed line-endings for tests which read the file contents and compare
1094
        :param line_endings: Either 'binary' or 'native'
1095
                             in binary mode, exact contents are written
1096
                             in native mode, the line endings match the
1097
                             default platform endings.
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1098
1099
        :param transport: A transport to write to, for building trees on 
1100
                          VFS's. If the transport is readonly or None,
1101
                          "." is opened automatically.
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
1102
        """
1755.3.1 by Robert Collins
Tune the time to build our kernel_like tree : make LocalTransport.put faster, AtomicFile faster, LocalTransport.append faster.
1103
        # It's OK to just create them using forward slashes on windows.
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1104
        if transport is None or transport.is_readonly():
1553.5.9 by Martin Pool
Add TestCaseWithTransport.get_transport and get_readonly_transport
1105
            transport = get_transport(".")
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
1106
        for name in shape:
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
1107
            self.assert_(isinstance(name, basestring))
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
1108
            if name[-1] == '/':
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
1109
                transport.mkdir(urlutils.escape(name[:-1]))
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
1110
            else:
1185.38.7 by John Arbash Meinel
Updated build_tree to use fixed line-endings for tests which read the file contents and compare
1111
                if line_endings == 'binary':
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1112
                    end = '\n'
1185.38.7 by John Arbash Meinel
Updated build_tree to use fixed line-endings for tests which read the file contents and compare
1113
                elif line_endings == 'native':
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1114
                    end = os.linesep
1185.38.7 by John Arbash Meinel
Updated build_tree to use fixed line-endings for tests which read the file contents and compare
1115
                else:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1116
                    raise errors.BzrError('Invalid line ending request %r' % (line_endings,))
1185.85.76 by John Arbash Meinel
Adding an InvalidURL so transports can report they expect utf-8 quoted paths. Updated tests
1117
                content = "contents of %s%s" % (name.encode('utf-8'), end)
1755.3.8 by John Arbash Meinel
Fix comments about why we do the things we do
1118
                # Technically 'put()' is the right command. However, put
1119
                # uses an AtomicFile, which requires an extra rename into place
1120
                # As long as the files didn't exist in the past, append() will
1121
                # do the same thing as put()
1122
                # On jam's machine, make_kernel_like_tree is:
1755.3.10 by John Arbash Meinel
Update the timing stats
1123
                #   put:    4.5-7.5s (averaging 6s)
1124
                #   append: 2.9-4.5s
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
1125
                #   put_non_atomic: 2.9-4.5s
1126
                transport.put_bytes_non_atomic(urlutils.escape(name), content)
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
1127
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
1128
    def build_tree_contents(self, shape):
1514 by Robert Collins
Unbreak self.build_tree_shape in tests.
1129
        build_tree_contents(shape)
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
1130
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
1131
    def failUnlessExists(self, path):
1132
        """Fail unless path, which may be abs or relative, exists."""
1448 by Robert Collins
revert symlinks correctly
1133
        self.failUnless(osutils.lexists(path))
1185.31.40 by John Arbash Meinel
Added osutils.mkdtemp()
1134
1135
    def failIfExists(self, path):
1136
        """Fail if path, which may be abs or relative, exists."""
1137
        self.failIf(osutils.lexists(path))
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
1138
        
1442.1.70 by Robert Collins
Add assertFileEqual to TestCaseInTempDir.
1139
    def assertFileEqual(self, content, path):
1140
        """Fail if path does not contain 'content'."""
1141
        self.failUnless(osutils.lexists(path))
1685.1.31 by John Arbash Meinel
Adding tests for the rest of the _win32 functions.
1142
        # TODO: jam 20060427 Shouldn't this be 'rb'?
1442.1.70 by Robert Collins
Add assertFileEqual to TestCaseInTempDir.
1143
        self.assertEqualDiff(content, open(path, 'r').read())
1185.31.40 by John Arbash Meinel
Added osutils.mkdtemp()
1144
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
1145
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
1146
class TestCaseWithTransport(TestCaseInTempDir):
1147
    """A test case that provides get_url and get_readonly_url facilities.
1148
1149
    These back onto two transport servers, one for readonly access and one for
1150
    read write access.
1151
1152
    If no explicit class is provided for readonly access, a
1153
    ReadonlyTransportDecorator is used instead which allows the use of non disk
1154
    based read write transports.
1155
1156
    If an explicit class is provided for readonly access, that server and the 
1157
    readwrite one must both define get_url() as resolving to os.getcwd().
1158
    """
1159
1160
    def __init__(self, methodName='testMethod'):
1161
        super(TestCaseWithTransport, self).__init__(methodName)
1162
        self.__readonly_server = None
1163
        self.__server = None
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1164
        self.transport_server = default_transport
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
1165
        self.transport_readonly_server = None
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
1166
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
1167
    def get_readonly_url(self, relpath=None):
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
1168
        """Get a URL for the readonly transport.
1169
1170
        This will either be backed by '.' or a decorator to the transport 
1171
        used by self.get_url()
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
1172
        relpath provides for clients to get a path relative to the base url.
1173
        These should only be downwards relative, not upwards.
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
1174
        """
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1175
        base = self.get_readonly_server().get_url()
1176
        if relpath is not None:
1177
            if not base.endswith('/'):
1178
                base = base + '/'
1179
            base = base + relpath
1180
        return base
1181
1182
    def get_readonly_server(self):
1183
        """Get the server instance for the readonly transport
1184
1185
        This is useful for some tests with specific servers to do diagnostics.
1186
        """
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
1187
        if self.__readonly_server is None:
1188
            if self.transport_readonly_server is None:
1189
                # readonly decorator requested
1190
                # bring up the server
1191
                self.get_url()
1192
                self.__readonly_server = ReadonlyServer()
1193
                self.__readonly_server.setUp(self.__server)
1194
            else:
1195
                self.__readonly_server = self.transport_readonly_server()
1196
                self.__readonly_server.setUp()
1197
            self.addCleanup(self.__readonly_server.tearDown)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1198
        return self.__readonly_server
1199
1200
    def get_server(self):
1201
        """Get the read/write server instance.
1202
1203
        This is useful for some tests with specific servers that need
1204
        diagnostics.
1205
        """
1206
        if self.__server is None:
1207
            self.__server = self.transport_server()
1208
            self.__server.setUp()
1209
            self.addCleanup(self.__server.tearDown)
1210
        return self.__server
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
1211
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
1212
    def get_url(self, relpath=None):
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
1213
        """Get a URL (or maybe a path) for the readwrite transport.
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
1214
1215
        This will either be backed by '.' or to an equivalent non-file based
1216
        facility.
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
1217
        relpath provides for clients to get a path relative to the base url.
1218
        These should only be downwards relative, not upwards.
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
1219
        """
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1220
        base = self.get_server().get_url()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1221
        if relpath is not None and relpath != '.':
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
1222
            if not base.endswith('/'):
1223
                base = base + '/'
1910.13.5 by Andrew Bennetts
Fix TestCaseWithTransport.get_url so that e.g. test_nonascii passes.
1224
            # XXX: Really base should be a url; we did after all call
1225
            # get_url()!  But sometimes it's just a path (from
1226
            # LocalAbspathServer), and it'd be wrong to append urlescaped data
1227
            # to a non-escaped local path.
1228
            if base.startswith('./') or base.startswith('/'):
1229
                base += relpath
1230
            else:
1231
                base += urlutils.escape(relpath)
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
1232
        return base
1233
1553.5.9 by Martin Pool
Add TestCaseWithTransport.get_transport and get_readonly_transport
1234
    def get_transport(self):
1235
        """Return a writeable transport for the test scratch space"""
1236
        t = get_transport(self.get_url())
1237
        self.assertFalse(t.is_readonly())
1238
        return t
1239
1240
    def get_readonly_transport(self):
1241
        """Return a readonly transport for the test scratch space
1242
        
1243
        This can be used to test that operations which should only need
1244
        readonly access in fact do not try to write.
1245
        """
1246
        t = get_transport(self.get_readonly_url())
1247
        self.assertTrue(t.is_readonly())
1248
        return t
1249
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1250
    def make_branch(self, relpath, format=None):
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1251
        """Create a branch on the transport at relpath."""
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1252
        repo = self.make_repository(relpath, format=format)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1253
        return repo.bzrdir.create_branch()
1254
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1255
    def make_bzrdir(self, relpath, format=None):
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1256
        try:
1910.13.1 by Andrew Bennetts
Make make_bzrdir preserve the transport.
1257
            # might be a relative or absolute path
1258
            maybe_a_url = self.get_url(relpath)
1910.13.4 by Andrew Bennetts
Do slightly less splitting.
1259
            segments = maybe_a_url.rsplit('/', 1)
1910.13.1 by Andrew Bennetts
Make make_bzrdir preserve the transport.
1260
            t = get_transport(maybe_a_url)
1910.13.4 by Andrew Bennetts
Do slightly less splitting.
1261
            if len(segments) > 1 and segments[-1] not in ('', '.'):
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1262
                try:
1910.13.1 by Andrew Bennetts
Make make_bzrdir preserve the transport.
1263
                    t.mkdir('.')
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1264
                except errors.FileExists:
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1265
                    pass
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1266
            if format is None:
1910.13.1 by Andrew Bennetts
Make make_bzrdir preserve the transport.
1267
                format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
1268
            return format.initialize_on_transport(t)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1269
        except errors.UninitializableFormat:
1684.1.4 by Martin Pool
(patch) better warnings when tests are skipped (Alexander)
1270
            raise TestSkipped("Format %s is not initializable." % format)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1271
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1272
    def make_repository(self, relpath, shared=False, format=None):
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1273
        """Create a repository on our default transport at relpath."""
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1274
        made_control = self.make_bzrdir(relpath, format=format)
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
1275
        return made_control.create_repository(shared=shared)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1276
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1277
    def make_branch_and_tree(self, relpath, format=None):
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1278
        """Create a branch on the transport and a tree locally.
1279
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
1280
        If the transport is not a LocalTransport, the Tree can't be created on
1281
        the transport.  In that case the working tree is created in the local
1282
        directory, and the returned tree's branch and repository will also be
1283
        accessed locally.
1284
1285
        This will fail if the original default transport for this test
1286
        case wasn't backed by the working directory, as the branch won't
1287
        be on disk for us to open it.  
1288
1289
        :param format: The BzrDirFormat.
1290
        :returns: the WorkingTree.
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1291
        """
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1292
        # TODO: always use the local disk path for the working tree,
1293
        # this obviously requires a format that supports branch references
1294
        # so check for that by checking bzrdir.BzrDirFormat.get_default_format()
1295
        # RBC 20060208
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1296
        b = self.make_branch(relpath, format=format)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1297
        try:
1298
            return b.bzrdir.create_workingtree()
1299
        except errors.NotLocalUrl:
1910.14.1 by Andrew Bennetts
Fix to make_branch_and_tree's behavior when used with an sftp transport.
1300
            # We can only make working trees locally at the moment.  If the
1301
            # transport can't support them, then reopen the branch on a local
1302
            # transport, and create the working tree there.  
1303
            #
1304
            # Possibly we should instead keep
1305
            # the non-disk-backed branch and create a local checkout?
1306
            bd = bzrdir.BzrDir.open(relpath)
1307
            return bd.create_workingtree()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1308
1553.5.68 by Martin Pool
Add new TestCaseWithTransport.assertIsDirectory() and tests
1309
    def assertIsDirectory(self, relpath, transport):
1310
        """Assert that relpath within transport is a directory.
1311
1312
        This may not be possible on all transports; in that case it propagates
1313
        a TransportNotPossible.
1314
        """
1315
        try:
1316
            mode = transport.stat(relpath).st_mode
1317
        except errors.NoSuchFile:
1318
            self.fail("path %s is not a directory; no such file"
1319
                      % (relpath))
1320
        if not stat.S_ISDIR(mode):
1321
            self.fail("path %s is not a directory; has mode %#o"
1322
                      % (relpath, mode))
1323
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
1324
1534.4.31 by Robert Collins
cleanedup test_outside_wt
1325
class ChrootedTestCase(TestCaseWithTransport):
1326
    """A support class that provides readonly urls outside the local namespace.
1327
1328
    This is done by checking if self.transport_server is a MemoryServer. if it
1329
    is then we are chrooted already, if it is not then an HttpServer is used
1330
    for readonly urls.
1331
1332
    TODO RBC 20060127: make this an option to TestCaseWithTransport so it can
1333
                       be used without needed to redo it when a different 
1334
                       subclass is in use ?
1335
    """
1336
1337
    def setUp(self):
1338
        super(ChrootedTestCase, self).setUp()
1339
        if not self.transport_server == bzrlib.transport.memory.MemoryServer:
1340
            self.transport_readonly_server = bzrlib.transport.http.HttpServer
1341
1342
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1343
def filter_suite_by_re(suite, pattern):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1344
    result = TestUtil.TestSuite()
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1345
    filter_re = re.compile(pattern)
1346
    for test in iter_suite_tests(suite):
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1347
        if filter_re.search(test.id()):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1348
            result.addTest(test)
1349
    return result
1350
1351
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1352
def run_suite(suite, name='test', verbose=False, pattern=".*",
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1353
              stop_on_failure=False, keep_output=False,
1819.1.3 by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history
1354
              transport=None, lsprof_timed=None, bench_history=None):
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
1355
    TestCaseInTempDir._TEST_NAME = name
1728.1.1 by Robert Collins
(rbc)Merge in benchmark --lsprof-timed lsprofiling feature. (Robert Collins, Martin Pool).
1356
    TestCase._gather_lsprof_in_benchmarks = lsprof_timed
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
1357
    if verbose:
1358
        verbosity = 2
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
1359
        pb = None
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
1360
    else:
1361
        verbosity = 1
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
1362
        pb = progress.ProgressBar()
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
1363
    runner = TextTestRunner(stream=sys.stdout,
1364
                            descriptions=0,
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
1365
                            verbosity=verbosity,
1366
                            keep_output=keep_output,
1819.1.3 by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history
1367
                            pb=pb,
1368
                            bench_history=bench_history)
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1369
    runner.stop_on_failure=stop_on_failure
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1370
    if pattern != '.*':
1371
        suite = filter_suite_by_re(suite, pattern)
1372
    result = runner.run(suite)
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
1373
    return result.wasSuccessful()
1374
1375
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1376
def selftest(verbose=False, pattern=".*", stop_on_failure=True,
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1377
             keep_output=False,
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1378
             transport=None,
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1379
             test_suite_factory=None,
1819.1.3 by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history
1380
             lsprof_timed=None,
1381
             bench_history=None):
1204 by Martin Pool
doc
1382
    """Run the whole test suite under the enhanced runner"""
1904.2.5 by Martin Pool
Fix format warning inside test suite and add test
1383
    # XXX: Very ugly way to do this...
1384
    # Disable warning about old formats because we don't want it to disturb
1385
    # any blackbox tests.
1386
    from bzrlib import repository
1387
    repository._deprecation_warning_done = True
1388
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1389
    global default_transport
1390
    if transport is None:
1391
        transport = default_transport
1392
    old_transport = default_transport
1393
    default_transport = transport
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1394
    try:
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1395
        if test_suite_factory is None:
1396
            suite = test_suite()
1397
        else:
1398
            suite = test_suite_factory()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1399
        return run_suite(suite, 'testbzr', verbose=verbose, pattern=pattern,
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1400
                     stop_on_failure=stop_on_failure, keep_output=keep_output,
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1401
                     transport=transport,
1819.1.3 by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history
1402
                     lsprof_timed=lsprof_timed,
1403
                     bench_history=bench_history)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1404
    finally:
1405
        default_transport = old_transport
1406
1092.1.17 by Robert Collins
remove TEST_CLASSES dead code and provide a bzrlib.test_suite() convenience method
1407
1408
def test_suite():
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1409
    """Build and return TestSuite for the whole of bzrlib.
1410
    
1411
    This function can be replaced if you need to change the default test
1412
    suite on a global basis, but it is not encouraged.
1413
    """
1740.6.1 by Martin Pool
Remove Scratch objects used by doctests
1414
    testmod_names = [
1518 by Robert Collins
Merge from mbp.
1415
                   'bzrlib.tests.test_ancestry',
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1416
                   'bzrlib.tests.test_api',
1755.3.6 by John Arbash Meinel
Add a test suite for Atomic File, and clean it up so that it really does set the mode properly.
1417
                   'bzrlib.tests.test_atomicfile',
1518 by Robert Collins
Merge from mbp.
1418
                   'bzrlib.tests.test_bad_files',
1419
                   'bzrlib.tests.test_branch',
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
1420
                   'bzrlib.tests.test_bundle',
1534.4.39 by Robert Collins
Basic BzrDir support.
1421
                   'bzrlib.tests.test_bzrdir',
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
1422
                   'bzrlib.tests.test_cache_utf8',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1423
                   'bzrlib.tests.test_command',
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1424
                   'bzrlib.tests.test_commit',
1425
                   'bzrlib.tests.test_commit_merge',
1426
                   'bzrlib.tests.test_config',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1427
                   'bzrlib.tests.test_conflicts',
1551.3.11 by Aaron Bentley
Merge from Robert
1428
                   'bzrlib.tests.test_decorators',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1429
                   'bzrlib.tests.test_diff',
1551.3.11 by Aaron Bentley
Merge from Robert
1430
                   'bzrlib.tests.test_doc_generate',
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1431
                   'bzrlib.tests.test_errors',
1185.80.5 by John Arbash Meinel
Changing the escaping just a little bit. Now we can handle unicode characters.
1432
                   'bzrlib.tests.test_escaped_store',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1433
                   'bzrlib.tests.test_fetch',
1518 by Robert Collins
Merge from mbp.
1434
                   'bzrlib.tests.test_gpg',
1435
                   'bzrlib.tests.test_graph',
1436
                   'bzrlib.tests.test_hashcache',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1437
                   'bzrlib.tests.test_http',
1786.1.8 by John Arbash Meinel
[merge] Johan Rydberg test updates
1438
                   'bzrlib.tests.test_http_response',
1518 by Robert Collins
Merge from mbp.
1439
                   'bzrlib.tests.test_identitymap',
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
1440
                   'bzrlib.tests.test_ignores',
1518 by Robert Collins
Merge from mbp.
1441
                   'bzrlib.tests.test_inv',
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1442
                   'bzrlib.tests.test_knit',
1996.1.1 by John Arbash Meinel
Adding a ScopeReplacer class, which can replace itself on demand
1443
                   'bzrlib.tests.test_lazy_import',
1553.5.12 by Martin Pool
New LockDir locking mechanism
1444
                   'bzrlib.tests.test_lockdir',
1185.67.4 by Aaron Bentley
Throw if we try to write to a LockableFiles with no write lock
1445
                   'bzrlib.tests.test_lockable_files',
1518 by Robert Collins
Merge from mbp.
1446
                   'bzrlib.tests.test_log',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1447
                   'bzrlib.tests.test_merge',
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1448
                   'bzrlib.tests.test_merge3',
1518 by Robert Collins
Merge from mbp.
1449
                   'bzrlib.tests.test_merge_core',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1450
                   'bzrlib.tests.test_missing',
1518 by Robert Collins
Merge from mbp.
1451
                   'bzrlib.tests.test_msgeditor',
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1452
                   'bzrlib.tests.test_nonascii',
1518 by Robert Collins
Merge from mbp.
1453
                   'bzrlib.tests.test_options',
1185.50.20 by John Arbash Meinel
merge permissions branch, also fixup tests so they are lined up with bzr.dev to help prevent conflicts.
1454
                   'bzrlib.tests.test_osutils',
1558.15.6 by Aaron Bentley
Added more tests
1455
                   'bzrlib.tests.test_patch',
1185.82.9 by John Arbash Meinel
Moving patches testing into main test suite.
1456
                   'bzrlib.tests.test_patches',
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
1457
                   'bzrlib.tests.test_permissions',
1515 by Robert Collins
* Plugins with the same name in different directories in the bzr plugin
1458
                   'bzrlib.tests.test_plugins',
1551.2.27 by Aaron Bentley
Got propogation under test
1459
                   'bzrlib.tests.test_progress',
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
1460
                   'bzrlib.tests.test_reconcile',
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1461
                   'bzrlib.tests.test_repository',
1551.8.15 by Aaron Bentley
bug #54172: handle new directories properly in revert
1462
                   'bzrlib.tests.test_revert',
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1463
                   'bzrlib.tests.test_revision',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1464
                   'bzrlib.tests.test_revisionnamespaces',
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
1465
                   'bzrlib.tests.test_revisiontree',
1185.47.1 by Martin Pool
[broken] start converting basic_io to more rfc822-like format
1466
                   'bzrlib.tests.test_rio',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1467
                   'bzrlib.tests.test_sampler',
1185.51.1 by Martin Pool
Better message when failing to import a test suite.
1468
                   'bzrlib.tests.test_selftest',
1185.33.89 by Martin Pool
[patch] add a selftest test that the setup build script works (Alexander Belchenko)
1469
                   'bzrlib.tests.test_setup',
1185.50.20 by John Arbash Meinel
merge permissions branch, also fixup tests so they are lined up with bzr.dev to help prevent conflicts.
1470
                   'bzrlib.tests.test_sftp_transport',
1952.1.2 by John Arbash Meinel
Rename test_aftp_transport to test_ftp_tranpsport
1471
                   'bzrlib.tests.test_ftp_transport',
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1472
                   'bzrlib.tests.test_smart_add',
1522 by Robert Collins
Test for the number of uses of self.working_tree() in branch.py
1473
                   'bzrlib.tests.test_source',
1551.6.19 by Aaron Bentley
Fix pending merge status on empty trees
1474
                   'bzrlib.tests.test_status',
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1475
                   'bzrlib.tests.test_store',
1534.2.1 by Robert Collins
Implement deprecated_method
1476
                   'bzrlib.tests.test_symbol_versioning',
1518 by Robert Collins
Merge from mbp.
1477
                   'bzrlib.tests.test_testament',
1558.15.1 by Aaron Bentley
Add text_file function
1478
                   'bzrlib.tests.test_textfile',
1551.6.7 by Aaron Bentley
Implemented two-way merge, refactored weave merge
1479
                   'bzrlib.tests.test_textmerge',
1518 by Robert Collins
Merge from mbp.
1480
                   'bzrlib.tests.test_trace',
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1481
                   'bzrlib.tests.test_transactions',
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1482
                   'bzrlib.tests.test_transform',
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1483
                   'bzrlib.tests.test_transport',
1852.8.2 by Robert Collins
Add InterTree class to represent InterTree operations.
1484
                   'bzrlib.tests.test_tree',
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1485
                   'bzrlib.tests.test_tsort',
1666.1.2 by Robert Collins
Fix race condition between end of stream and end of file with tuned_gzip.
1486
                   'bzrlib.tests.test_tuned_gzip',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1487
                   'bzrlib.tests.test_ui',
1488
                   'bzrlib.tests.test_upgrade',
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
1489
                   'bzrlib.tests.test_urlutils',
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
1490
                   'bzrlib.tests.test_versionedfile',
1819.1.8 by Martin Pool
Improved reporting of bzrlib revision_id
1491
                   'bzrlib.tests.test_version',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1492
                   'bzrlib.tests.test_weave',
1493
                   'bzrlib.tests.test_whitebox',
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1494
                   'bzrlib.tests.test_workingtree',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1495
                   'bzrlib.tests.test_xml',
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1496
                   ]
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1497
    test_transport_implementations = [
1711.3.2 by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions
1498
        'bzrlib.tests.test_transport_implementations',
1499
        'bzrlib.tests.test_read_bundle',
1500
        ]
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1501
    suite = TestUtil.TestSuite()
1707.2.2 by Robert Collins
Start on bench_add, an add benchtest.
1502
    loader = TestUtil.TestLoader()
1864.3.1 by John Arbash Meinel
Print out when a test fails in non verbose mode, run transport tests later
1503
    suite.addTest(loader.loadTestsFromModuleNames(testmod_names))
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1504
    from bzrlib.transport import TransportTestProviderAdapter
1505
    adapter = TransportTestProviderAdapter()
1534.4.23 by Robert Collins
Move branch implementations tests into a package.
1506
    adapt_modules(test_transport_implementations, adapter, loader, suite)
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
1507
    for package in packages_to_test():
1508
        suite.addTest(package.test_suite())
855 by Martin Pool
- Patch from John to allow plugins to add their own tests.
1509
    for m in MODULES_TO_TEST:
1185.51.1 by Martin Pool
Better message when failing to import a test suite.
1510
        suite.addTest(loader.loadTestsFromModule(m))
1740.6.1 by Martin Pool
Remove Scratch objects used by doctests
1511
    for m in MODULES_TO_DOCTEST:
1512
        suite.addTest(doctest.DocTestSuite(m))
1516 by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a
1513
    for name, plugin in bzrlib.plugin.all_plugins().items():
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1514
        if getattr(plugin, 'test_suite', None) is not None:
1516 by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a
1515
            suite.addTest(plugin.test_suite())
1092.1.17 by Robert Collins
remove TEST_CLASSES dead code and provide a bzrlib.test_suite() convenience method
1516
    return suite
764 by Martin Pool
- log messages from a particular test are printed if that test fails
1517
1185.51.1 by Martin Pool
Better message when failing to import a test suite.
1518
1534.4.23 by Robert Collins
Move branch implementations tests into a package.
1519
def adapt_modules(mods_list, adapter, loader, suite):
1520
    """Adapt the modules in mods_list using adapter and add to suite."""
1707.2.2 by Robert Collins
Start on bench_add, an add benchtest.
1521
    for test in iter_suite_tests(loader.loadTestsFromModuleNames(mods_list)):
1522
        suite.addTests(adapter.adapt(test))