/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
608 by Martin Pool
- Split selftests out into a new module and start changing them
2
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.
7
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.
12
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
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
67
import bzrlib.trace
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
68
from bzrlib.transport import get_transport
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
69
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.
70
from bzrlib.transport.local import LocalRelpathServer
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
71
from bzrlib.transport.readonly import ReadonlyServer
1185.43.1 by Martin Pool
Remove direct logging calls from selftest
72
from bzrlib.trace import mutter
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
73
from bzrlib.tests import TestUtil
74
from bzrlib.tests.TestUtil import (
75
                          TestSuite,
76
                          TestLoader,
77
                          )
1514 by Robert Collins
Unbreak self.build_tree_shape in tests.
78
from bzrlib.tests.treeshape import build_tree_contents
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
79
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.
80
from bzrlib.workingtree import WorkingTree, WorkingTreeFormat2
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
81
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.
82
default_transport = LocalRelpathServer
83
855 by Martin Pool
- Patch from John to allow plugins to add their own tests.
84
MODULES_TO_TEST = []
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
85
MODULES_TO_DOCTEST = [
86
                      bzrlib.branch,
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
87
                      bzrlib.bundle.serializer,
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
88
                      bzrlib.commands,
89
                      bzrlib.errors,
90
                      bzrlib.inventory,
1185.67.6 by Aaron Bentley
Added tests and fixes for LockableFiles.put_utf8(); imported IterableFile
91
                      bzrlib.iterablefile,
1553.5.19 by Martin Pool
Run lockdir doctests
92
                      bzrlib.lockdir,
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
93
                      bzrlib.merge3,
1545.1.2 by Denys Duchier
order MODULES_TO_DOCTEST alphabetically
94
                      bzrlib.option,
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
95
                      bzrlib.osutils,
1545.1.2 by Denys Duchier
order MODULES_TO_DOCTEST alphabetically
96
                      bzrlib.store
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
97
                      ]
1185.82.7 by John Arbash Meinel
Adding patches.py into bzrlib, including the tests into the test suite.
98
99
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
100
def packages_to_test():
1530.2.1 by Robert Collins
Start tests for api usage.
101
    """Return a list of packages to test.
102
103
    The packages are not globally imported so that import failures are
104
    triggered when running selftest, not when importing the command.
105
    """
106
    import bzrlib.doc
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
107
    import bzrlib.tests.blackbox
1534.4.23 by Robert Collins
Move branch implementations tests into a package.
108
    import bzrlib.tests.branch_implementations
1534.4.39 by Robert Collins
Basic BzrDir support.
109
    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.
110
    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.
111
    import bzrlib.tests.interversionedfile_implementations
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
112
    import bzrlib.tests.repository_implementations
1563.2.21 by Robert Collins
Smoke test for RevisionStore factories creating revision stores.
113
    import bzrlib.tests.revisionstore_implementations
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
114
    import bzrlib.tests.workingtree_implementations
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
115
    return [
1530.2.1 by Robert Collins
Start tests for api usage.
116
            bzrlib.doc,
1551.2.6 by Aaron Bentley
Restored blackbox tests [recommit]
117
            bzrlib.tests.blackbox,
1534.4.23 by Robert Collins
Move branch implementations tests into a package.
118
            bzrlib.tests.branch_implementations,
1534.4.39 by Robert Collins
Basic BzrDir support.
119
            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.
120
            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.
121
            bzrlib.tests.interversionedfile_implementations,
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
122
            bzrlib.tests.repository_implementations,
1563.2.21 by Robert Collins
Smoke test for RevisionStore factories creating revision stores.
123
            bzrlib.tests.revisionstore_implementations,
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
124
            bzrlib.tests.workingtree_implementations,
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
125
            ]
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
126
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
127
128
class _MyResult(unittest._TextTestResult):
1185.43.2 by Martin Pool
Nicer display of verbose test results and progress
129
    """Custom TestResult.
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
130
1185.33.54 by Martin Pool
[merge] test renames and other fixes (John)
131
    Shows output in a different format, including displaying runtime for tests.
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
132
    """
1185.62.21 by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test.
133
    stop_early = False
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
134
    
135
    def __init__(self, stream, descriptions, verbosity, pb=None):
136
        unittest._TextTestResult.__init__(self, stream, descriptions, verbosity)
137
        self.pb = pb
1707.2.3 by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool).
138
    
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)
139
    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).
140
        """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)
141
        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).
142
    
143
    def _elapsedTestTimeString(self):
144
        """Return a time string for the overall time the current test has taken."""
145
        return self._formatTime(time.time() - self._start_time)
146
147
    def _testTimeString(self):
148
        if self._benchmarkTime is not None:
149
            return "%s/%s" % (
150
                self._formatTime(self._benchmarkTime),
151
                self._elapsedTestTimeString())
152
        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)
153
            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).
154
155
    def _formatTime(self, seconds):
156
        """Format seconds as milliseconds with leading spaces."""
157
        return "%5dms" % (1000 * seconds)
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
158
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
159
    def _ellipsise_unimportant_words(self, a_string, final_width,
160
                                   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).
161
        """Add ellipses (sp?) for overly long strings.
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
162
        
163
        :param keep_start: If true preserve the start of a_string rather
164
                           than the end of it.
165
        """
166
        if keep_start:
167
            if len(a_string) > final_width:
168
                result = a_string[:final_width-3] + '...'
169
            else:
170
                result = a_string
171
        else:
172
            if len(a_string) > final_width:
173
                result = '...' + a_string[3-final_width:]
174
            else:
175
                result = a_string
176
        return result.ljust(final_width)
177
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
178
    def startTest(self, test):
179
        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
180
        # In a short description, the important words are in
181
        # the beginning, but in an id, the important words are
182
        # at the end
1185.33.54 by Martin Pool
[merge] test renames and other fixes (John)
183
        SHOW_DESCRIPTIONS = False
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
184
185
        if not self.showAll and self.dots and self.pb is not None:
186
            final_width = 13
187
        else:
188
            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)
189
            final_width = final_width - 15 - 8
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
190
        what = None
191
        if SHOW_DESCRIPTIONS:
192
            what = test.shortDescription()
193
            if what:
194
                what = self._ellipsise_unimportant_words(what, final_width, keep_start=True)
195
        if what is None:
196
            what = test.id()
197
            if what.startswith('bzrlib.tests.'):
198
                what = what[13:]
199
            what = self._ellipsise_unimportant_words(what, final_width)
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
200
        if self.showAll:
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
201
            self.stream.write(what)
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
202
        elif self.dots and self.pb is not None:
203
            self.pb.update(what, self.testsRun - 1, None)
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
204
        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).
205
        self._recordTestStartTime()
206
207
    def _recordTestStartTime(self):
208
        """Record that a test has started."""
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
209
        self._start_time = time.time()
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
210
211
    def addError(self, test, err):
1185.33.95 by Martin Pool
New TestSkipped facility, and tests for it.
212
        if isinstance(err[1], TestSkipped):
213
            return self.addSkipped(test, err)    
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
214
        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)
215
        self.extractBenchmarkTime(test)
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
216
        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).
217
            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.
218
        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.
219
            self.stream.write('E')
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
220
        elif self.dots:
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
221
            self.pb.update(self._ellipsise_unimportant_words('ERROR', 13), self.testsRun, None)
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
222
        self.stream.flush()
1185.62.21 by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test.
223
        if self.stop_early:
224
            self.stop()
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
225
226
    def addFailure(self, test, err):
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
227
        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)
228
        self.extractBenchmarkTime(test)
1185.1.58 by Robert Collins
make selftest -v show the elapsed time for each test run.
229
        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).
230
            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.
231
        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.
232
            self.stream.write('F')
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
233
        elif self.dots:
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
234
            self.pb.update(self._ellipsise_unimportant_words('FAIL', 13), self.testsRun, None)
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
235
        self.stream.flush()
1185.62.21 by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test.
236
        if self.stop_early:
237
            self.stop()
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
238
239
    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)
240
        self.extractBenchmarkTime(test)
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
241
        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).
242
            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.
243
            for bench_called, stats in getattr(test, '_benchcalls', []):
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
244
                self.stream.writeln('LSProf output for %s(%s, %s)' % bench_called)
245
                stats.pprint(file=self.stream)
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
246
        elif self.dots and self.pb is None:
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
247
            self.stream.write('~')
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
248
        elif self.dots:
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
249
            self.pb.update(self._ellipsise_unimportant_words('OK', 13), self.testsRun, None)
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
250
        self.stream.flush()
251
        unittest.TestResult.addSuccess(self, test)
252
1185.33.96 by Martin Pool
Fix up display of reasons why tests were skipped.
253
    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)
254
        self.extractBenchmarkTime(test)
1185.33.95 by Martin Pool
New TestSkipped facility, and tests for it.
255
        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).
256
            print >>self.stream, ' SKIP %s' % self._testTimeString()
1185.33.96 by Martin Pool
Fix up display of reasons why tests were skipped.
257
            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.
258
        elif self.dots and self.pb is None:
1185.33.95 by Martin Pool
New TestSkipped facility, and tests for it.
259
            self.stream.write('S')
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
260
        elif self.dots:
1534.11.3 by Robert Collins
Show test names and status in the progress bar.
261
            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.
262
        self.stream.flush()
263
        # seems best to treat this as success from point-of-view of unittest
264
        # -- it actually does nothing so it barely matters :)
1711.4.36 by John Arbash Meinel
cherrypick accepted win32 fixes: call tearDown for skipped tests, update docs for run_bzr_error
265
        try:
266
            test.tearDown()
267
        except KeyboardInterrupt:
268
            raise
269
        except:
270
            self.addError(test, test.__exc_info())
271
        else:
272
            unittest.TestResult.addSuccess(self, test)
1185.33.95 by Martin Pool
New TestSkipped facility, and tests for it.
273
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
274
    def printErrorList(self, flavour, errors):
275
        for test, err in errors:
276
            self.stream.writeln(self.separator1)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
277
            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.
278
            if getattr(test, '_get_log', None) is not None:
1185.33.95 by Martin Pool
New TestSkipped facility, and tests for it.
279
                print >>self.stream
280
                print >>self.stream, \
1530.1.3 by Robert Collins
transport implementations now tested consistently.
281
                        ('vvvv[log from %s]' % test.id()).ljust(78,'-')
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
282
                print >>self.stream, test._get_log()
1185.33.95 by Martin Pool
New TestSkipped facility, and tests for it.
283
                print >>self.stream, \
1530.1.3 by Robert Collins
transport implementations now tested consistently.
284
                        ('^^^^[log from %s]' % test.id()).ljust(78,'-')
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
285
            self.stream.writeln(self.separator2)
286
            self.stream.writeln("%s" % err)
287
288
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
289
class TextTestRunner(object):
1185.16.58 by mbp at sourcefrog
- run all selftests by default
290
    stop_on_failure = False
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
291
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
292
    def __init__(self,
293
                 stream=sys.stderr,
294
                 descriptions=0,
295
                 verbosity=1,
296
                 keep_output=False,
297
                 pb=None):
298
        self.stream = unittest._WritelnDecorator(stream)
299
        self.descriptions = descriptions
300
        self.verbosity = verbosity
301
        self.keep_output = keep_output
302
        self.pb = pb
303
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
304
    def _makeResult(self):
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
305
        result = _MyResult(self.stream,
306
                           self.descriptions,
307
                           self.verbosity,
308
                           pb=self.pb)
1185.62.21 by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test.
309
        result.stop_early = self.stop_on_failure
1185.16.58 by mbp at sourcefrog
- run all selftests by default
310
        return result
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
311
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
312
    def run(self, test):
313
        "Run the given test case or test suite."
314
        result = self._makeResult()
315
        startTime = time.time()
316
        if self.pb is not None:
317
            self.pb.update('Running tests', 0, test.countTestCases())
318
        test.run(result)
319
        stopTime = time.time()
320
        timeTaken = stopTime - startTime
321
        result.printErrors()
322
        self.stream.writeln(result.separator2)
323
        run = result.testsRun
324
        self.stream.writeln("Ran %d test%s in %.3fs" %
325
                            (run, run != 1 and "s" or "", timeTaken))
326
        self.stream.writeln()
327
        if not result.wasSuccessful():
328
            self.stream.write("FAILED (")
329
            failed, errored = map(len, (result.failures, result.errors))
330
            if failed:
331
                self.stream.write("failures=%d" % failed)
332
            if errored:
333
                if failed: self.stream.write(", ")
334
                self.stream.write("errors=%d" % errored)
335
            self.stream.writeln(")")
336
        else:
337
            self.stream.writeln("OK")
338
        if self.pb is not None:
339
            self.pb.update('Cleaning up', 0, 1)
340
        # This is still a little bogus, 
341
        # but only a little. Folk not using our testrunner will
342
        # have to delete their temp directories themselves.
1534.11.4 by Robert Collins
Merge from mainline.
343
        test_root = TestCaseInTempDir.TEST_ROOT
1534.11.6 by Robert Collins
Adjust test-of-tests to accomodate the global state of TEST_ROOT.
344
        if result.wasSuccessful() or not self.keep_output:
1534.11.4 by Robert Collins
Merge from mainline.
345
            if test_root is not None:
1685.1.80 by Wouter van Heyst
more code cleanup
346
                # If LANG=C we probably have created some bogus paths
347
                # which rmtree(unicode) will fail to delete
348
                # 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.
349
                # except on win32, where rmtree(str) will fail
350
                # since it doesn't have the property of byte-stream paths
351
                # (they are either ascii or mbcs)
352
                if sys.platform == 'win32':
353
                    # make sure we are using the unicode win32 api
354
                    test_root = unicode(test_root)
355
                else:
356
                    test_root = test_root.encode(
357
                        sys.getfilesystemencoding())
358
                osutils.rmtree(test_root)
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
359
        else:
1534.11.6 by Robert Collins
Adjust test-of-tests to accomodate the global state of TEST_ROOT.
360
            if self.pb is not None:
361
                self.pb.note("Failed tests working directories are in '%s'\n",
362
                             test_root)
363
            else:
364
                self.stream.writeln(
365
                    "Failed tests working directories are in '%s'\n" %
366
                    test_root)
367
        TestCaseInTempDir.TEST_ROOT = None
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
368
        if self.pb is not None:
369
            self.pb.clear()
370
        return result
371
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
372
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
373
def iter_suite_tests(suite):
374
    """Return all tests in a suite, recursing through nested suites"""
375
    for item in suite._tests:
376
        if isinstance(item, unittest.TestCase):
377
            yield item
378
        elif isinstance(item, unittest.TestSuite):
379
            for r in iter_suite_tests(item):
380
                yield r
381
        else:
382
            raise Exception('unknown object %r inside test suite %r'
383
                            % (item, suite))
384
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
385
386
class TestSkipped(Exception):
387
    """Indicates that a test was intentionally skipped, rather than failing."""
388
    # XXX: Not used yet
389
390
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
391
class CommandFailed(Exception):
392
    pass
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
393
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
394
395
class StringIOWrapper(object):
396
    """A wrapper around cStringIO which just adds an encoding attribute.
397
    
398
    Internally we can check sys.stdout to see what the output encoding
399
    should be. However, cStringIO has no encoding attribute that we can
400
    set. So we wrap it instead.
401
    """
402
    encoding='ascii'
403
    _cstring = None
404
405
    def __init__(self, s=None):
406
        if s is not None:
407
            self.__dict__['_cstring'] = StringIO(s)
408
        else:
409
            self.__dict__['_cstring'] = StringIO()
410
411
    def __getattr__(self, name, getattr=getattr):
412
        return getattr(self.__dict__['_cstring'], name)
413
414
    def __setattr__(self, name, val):
415
        if name == 'encoding':
416
            self.__dict__['encoding'] = val
417
        else:
418
            return setattr(self._cstring, name, val)
419
420
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
421
class TestCase(unittest.TestCase):
422
    """Base class for bzr unit tests.
423
    
424
    Tests that need access to disk resources should subclass 
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
425
    TestCaseInTempDir not TestCase.
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
426
427
    Error and debug log messages are redirected from their usual
428
    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.
429
    retrieved by _get_log().  We use a real OS file, not an in-memory object,
430
    so that it can also capture file IO.  When the test completes this file
431
    is read into memory and removed from disk.
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
432
       
433
    There are also convenience functions to invoke bzr's command-line
1185.16.108 by mbp at sourcefrog
Add TestCase.addCleanup method.
434
    routine, and to build and check bzr trees.
435
   
436
    In addition to the usual method of overriding tearDown(), this class also
437
    allows subclasses to register functions into the _cleanups list, which is
438
    run in order as the object is torn down.  It's less likely this will be
439
    accidentally overlooked.
440
    """
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
441
1185.16.14 by Martin Pool
- make TestCase._get_log work even if setup was aborted
442
    _log_file_name = None
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
443
    _log_contents = ''
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
444
    # record lsprof data when performing benchmark calls.
445
    _gather_lsprof_in_benchmarks = False
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
446
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
447
    def __init__(self, methodName='testMethod'):
448
        super(TestCase, self).__init__(methodName)
449
        self._cleanups = []
450
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
451
    def setUp(self):
452
        unittest.TestCase.setUp(self)
1185.16.110 by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks
453
        self._cleanEnvironment()
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
454
        bzrlib.trace.disable_default_logging()
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
455
        self._startLogFile()
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
456
        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)
457
        self._benchtime = None
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
458
1185.16.16 by Martin Pool
- add TestCase.assertEqualDiffs helper
459
    def _ndiff_strings(self, a, b):
1185.16.67 by Martin Pool
- assertEqualDiff handles strings without trailing newline
460
        """Return ndiff between two strings containing lines.
461
        
462
        A trailing newline is added if missing to make the strings
463
        print properly."""
464
        if b and b[-1] != '\n':
465
            b += '\n'
466
        if a and a[-1] != '\n':
467
            a += '\n'
1185.16.21 by Martin Pool
- tweak diff shown by assertEqualDiff
468
        difflines = difflib.ndiff(a.splitlines(True),
469
                                  b.splitlines(True),
470
                                  linejunk=lambda x: False,
471
                                  charjunk=lambda x: False)
472
        return ''.join(difflines)
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
473
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.
474
    def assertEqualDiff(self, a, b, message=None):
1185.16.16 by Martin Pool
- add TestCase.assertEqualDiffs helper
475
        """Assert two texts are equal, if not raise an exception.
476
        
477
        This is intended for use with multi-line strings where it can 
478
        be hard to find the differences by eye.
479
        """
480
        # TODO: perhaps override assertEquals to call this for strings?
481
        if a == b:
482
            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.
483
        if message is None:
484
            message = "texts not equal:\n"
485
        raise AssertionError(message + 
1185.16.16 by Martin Pool
- add TestCase.assertEqualDiffs helper
486
                             self._ndiff_strings(a, b))      
1185.31.40 by John Arbash Meinel
Added osutils.mkdtemp()
487
        
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.
488
    def assertEqualMode(self, mode, mode_test):
489
        self.assertEqual(mode, mode_test,
490
                         'mode mismatch %o != %o' % (mode, mode_test))
491
1185.31.40 by John Arbash Meinel
Added osutils.mkdtemp()
492
    def assertStartsWith(self, s, prefix):
493
        if not s.startswith(prefix):
494
            raise AssertionError('string %r does not start with %r' % (s, prefix))
495
496
    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.
497
        """Asserts that s ends with suffix."""
498
        if not s.endswith(suffix):
1185.31.40 by John Arbash Meinel
Added osutils.mkdtemp()
499
            raise AssertionError('string %r does not end with %r' % (s, suffix))
1185.16.42 by Martin Pool
- Add assertContainsRe
500
501
    def assertContainsRe(self, haystack, needle_re):
502
        """Assert that a contains something matching a regular expression."""
503
        if not re.search(needle_re, haystack):
504
            raise AssertionError('pattern "%s" not found in "%s"'
505
                    % (needle_re, haystack))
1442.1.70 by Robert Collins
Add assertFileEqual to TestCaseInTempDir.
506
1185.84.3 by Aaron Bentley
Hide diffs for old revisions in bundles
507
    def assertNotContainsRe(self, haystack, needle_re):
508
        """Assert that a does not match a regular expression"""
509
        if re.search(needle_re, haystack):
510
            raise AssertionError('pattern "%s" found in "%s"'
511
                    % (needle_re, haystack))
512
1553.5.3 by Martin Pool
[patch] Rename TestCase.AssertSubset to assertSubset for consistency (Jan Hudec)
513
    def assertSubset(self, sublist, superlist):
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
514
        """Assert that every entry in sublist is present in superlist."""
515
        missing = []
516
        for entry in sublist:
517
            if entry not in superlist:
518
                missing.append(entry)
519
        if len(missing) > 0:
520
            raise AssertionError("value(s) %r not present in container %r" % 
521
                                 (missing, superlist))
522
1185.68.1 by Aaron Bentley
test transactions
523
    def assertIs(self, left, right):
524
        if not (left is right):
525
            raise AssertionError("%r is not %r." % (left, right))
526
1530.1.21 by Robert Collins
Review feedback fixes.
527
    def assertTransportMode(self, transport, path, mode):
1530.1.17 by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible.
528
        """Fail if a path does not have mode mode.
529
        
1651.1.3 by Martin Pool
Use transport._can_roundtrip_unix_modebits to decide whether to check transport results
530
        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.
531
        """
1651.1.3 by Martin Pool
Use transport._can_roundtrip_unix_modebits to decide whether to check transport results
532
        if not transport._can_roundtrip_unix_modebits():
1530.1.17 by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible.
533
            return
534
        path_stat = transport.stat(path)
535
        actual_mode = stat.S_IMODE(path_stat.st_mode)
536
        self.assertEqual(mode, actual_mode,
537
            'mode of %r incorrect (%o != %o)' % (path, mode, actual_mode))
538
1540.3.22 by Martin Pool
[patch] Add TestCase.assertIsInstance
539
    def assertIsInstance(self, obj, kls):
540
        """Fail if obj is not an instance of kls"""
541
        if not isinstance(obj, kls):
1666.1.6 by Robert Collins
Make knit the default format.
542
            self.fail("%r is an instance of %s rather than %s" % (
543
                obj, obj.__class__, kls))
1540.3.22 by Martin Pool
[patch] Add TestCase.assertIsInstance
544
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
545
    def _startLogFile(self):
546
        """Send bzr and test log messages to a temporary file.
547
548
        The file is removed as the test is torn down.
549
        """
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
550
        fileno, name = tempfile.mkstemp(suffix='.log', prefix='testbzr')
1185.52.1 by James Henstridge
Don't encode unicode messages to UTF-8 in mutter() (the stream writer does it).
551
        encoder, decoder, stream_reader, stream_writer = codecs.lookup('UTF-8')
552
        self._log_file = stream_writer(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.
553
        self._log_nonce = bzrlib.trace.enable_test_log(self._log_file)
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
554
        self._log_file_name = name
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
555
        self.addCleanup(self._finishLogFile)
556
557
    def _finishLogFile(self):
558
        """Finished with the log file.
559
560
        Read contents into memory, close, and delete.
561
        """
1711.4.36 by John Arbash Meinel
cherrypick accepted win32 fixes: call tearDown for skipped tests, update docs for run_bzr_error
562
        if self._log_file is None:
563
            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.
564
        bzrlib.trace.disable_test_log(self._log_nonce)
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
565
        self._log_file.seek(0)
566
        self._log_contents = self._log_file.read()
1185.16.122 by Martin Pool
[patch] Close test log file before deleting, needed on Windows
567
        self._log_file.close()
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
568
        os.remove(self._log_file_name)
569
        self._log_file = self._log_file_name = None
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
570
1185.16.108 by mbp at sourcefrog
Add TestCase.addCleanup method.
571
    def addCleanup(self, callable):
572
        """Arrange to run a callable when this case is torn down.
573
574
        Callables are run in the reverse of the order they are registered, 
575
        ie last-in first-out.
576
        """
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
577
        if callable in self._cleanups:
578
            raise ValueError("cleanup function %r already registered on %s" 
579
                    % (callable, self))
1185.16.108 by mbp at sourcefrog
Add TestCase.addCleanup method.
580
        self._cleanups.append(callable)
581
1185.16.110 by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks
582
    def _cleanEnvironment(self):
1185.38.3 by John Arbash Meinel
Refactored environment cleaning code
583
        new_env = {
584
            'HOME': os.getcwd(),
585
            'APPDATA': os.getcwd(),
586
            'BZREMAIL': None,
587
            'EMAIL': None,
588
        }
1185.38.4 by John Arbash Meinel
Making old_env a private member
589
        self.__old_env = {}
1185.16.110 by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks
590
        self.addCleanup(self._restoreEnvironment)
1185.38.3 by John Arbash Meinel
Refactored environment cleaning code
591
        for name, value in new_env.iteritems():
592
            self._captureVar(name, value)
593
594
595
    def _captureVar(self, name, newvalue):
596
        """Set an environment variable, preparing it to be reset when finished."""
1185.38.4 by John Arbash Meinel
Making old_env a private member
597
        self.__old_env[name] = os.environ.get(name, None)
1185.38.3 by John Arbash Meinel
Refactored environment cleaning code
598
        if newvalue is None:
599
            if name in os.environ:
600
                del os.environ[name]
601
        else:
602
            os.environ[name] = newvalue
1185.16.110 by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks
603
1185.38.2 by John Arbash Meinel
[patch] Aaron Bentley's HOME fix.
604
    @staticmethod
605
    def _restoreVar(name, value):
606
        if value is None:
1185.38.3 by John Arbash Meinel
Refactored environment cleaning code
607
            if name in os.environ:
608
                del os.environ[name]
1185.38.2 by John Arbash Meinel
[patch] Aaron Bentley's HOME fix.
609
        else:
610
            os.environ[name] = value
611
1185.16.110 by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks
612
    def _restoreEnvironment(self):
1185.38.4 by John Arbash Meinel
Making old_env a private member
613
        for name, value in self.__old_env.iteritems():
1185.38.3 by John Arbash Meinel
Refactored environment cleaning code
614
            self._restoreVar(name, value)
1185.16.110 by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks
615
616
    def tearDown(self):
1185.16.108 by mbp at sourcefrog
Add TestCase.addCleanup method.
617
        self._runCleanups()
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
618
        unittest.TestCase.tearDown(self)
619
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)
620
    def time(self, callable, *args, **kwargs):
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
621
        """Run callable and accrue the time it takes to the benchmark time.
622
        
623
        If lsprofiling is enabled (i.e. by --lsprof-time to bzr selftest) then
624
        this will cause lsprofile statistics to be gathered and stored in
625
        self._benchcalls.
626
        """
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)
627
        if self._benchtime is None:
628
            self._benchtime = 0
629
        start = time.time()
630
        try:
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
631
            if not self._gather_lsprof_in_benchmarks:
632
                return callable(*args, **kwargs)
633
            else:
634
                # record this benchmark
635
                ret, stats = bzrlib.lsprof.profile(callable, *args, **kwargs)
636
                stats.sort()
637
                self._benchcalls.append(((callable, args, kwargs), stats))
638
                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)
639
        finally:
640
            self._benchtime += time.time() - start
641
1185.16.108 by mbp at sourcefrog
Add TestCase.addCleanup method.
642
    def _runCleanups(self):
643
        """Run registered cleanup functions. 
644
645
        This should only be called from TestCase.tearDown.
646
        """
1541 by Martin Pool
doc
647
        # TODO: Perhaps this should keep running cleanups even if 
648
        # one of them fails?
1185.33.74 by Martin Pool
pychecker cleanups
649
        for cleanup_fn in reversed(self._cleanups):
650
            cleanup_fn()
1185.16.108 by mbp at sourcefrog
Add TestCase.addCleanup method.
651
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
652
    def log(self, *args):
1185.43.1 by Martin Pool
Remove direct logging calls from selftest
653
        mutter(*args)
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
654
655
    def _get_log(self):
656
        """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
657
        if self._log_file_name:
658
            return open(self._log_file_name).read()
659
        else:
1185.16.109 by mbp at sourcefrog
Clean up test log files when tests complete.
660
            return self._log_contents
1185.43.1 by Martin Pool
Remove direct logging calls from selftest
661
        # TODO: Delete the log after it's been read in
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
662
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
663
    def capture(self, cmd, retcode=0):
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
664
        """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.
665
        return self.run_bzr_captured(cmd.split(), retcode=retcode)[0]
1185.3.26 by Martin Pool
- remove remaining external executions of bzr
666
1685.1.52 by John Arbash Meinel
[merge] bzr.dev 1704
667
    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
668
        """Invoke bzr and return (stdout, stderr).
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
669
670
        Useful for code that wants to check the contents of the
671
        output, the way error messages are presented, etc.
672
673
        This should be the main method for tests that want to exercise the
674
        overall behavior of the bzr application (rather than a unit test
675
        or a functional test of the library.)
676
677
        Much of the old code runs bzr by forking a new copy of Python, but
678
        that is slower, harder to debug, and generally not necessary.
679
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
680
        This runs bzr through the interface that catches and reports
681
        errors, and with logging set to something approximating the
682
        default, so that error reporting can be checked.
683
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
684
        :param argv: arguments to invoke bzr
685
        :param retcode: expected return code, or None for don't-care.
686
        :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.
687
        :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
688
        """
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
689
        if encoding is None:
690
            encoding = bzrlib.user_encoding
1687.1.2 by Robert Collins
Add stdin parameter to run_bzr and run_bzr_captured.
691
        if stdin is not None:
692
            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
693
        stdout = StringIOWrapper()
694
        stderr = StringIOWrapper()
695
        stdout.encoding = encoding
696
        stderr.encoding = encoding
697
1185.85.72 by John Arbash Meinel
Fix some of the tests.
698
        self.log('run bzr: %r', argv)
1185.43.5 by Martin Pool
Update log message quoting
699
        # FIXME: don't call into logging here
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
700
        handler = logging.StreamHandler(stderr)
701
        handler.setLevel(logging.INFO)
702
        logger = logging.getLogger('')
703
        logger.addHandler(handler)
1692.3.3 by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory.
704
        old_ui_factory = bzrlib.ui.ui_factory
705
        bzrlib.ui.ui_factory = bzrlib.tests.blackbox.TestUIFactory(
706
            stdout=stdout,
707
            stderr=stderr)
1687.1.11 by Robert Collins
Teach TestCase.run_bzr_captured about the ui factories.
708
        bzrlib.ui.ui_factory.stdin = stdin
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
709
        try:
1687.1.2 by Robert Collins
Add stdin parameter to run_bzr and run_bzr_captured.
710
            result = self.apply_redirected(stdin, stdout, stderr,
1185.3.20 by Martin Pool
- run_bzr_captured also includes logged errors in
711
                                           bzrlib.commands.run_bzr_catch_errors,
712
                                           argv)
713
        finally:
714
            logger.removeHandler(handler)
1692.3.3 by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory.
715
            bzrlib.ui.ui_factory = old_ui_factory
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
716
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
717
        out = stdout.getvalue()
718
        err = stderr.getvalue()
719
        if out:
1185.85.72 by John Arbash Meinel
Fix some of the tests.
720
            self.log('output:\n%r', out)
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
721
        if err:
1185.85.72 by John Arbash Meinel
Fix some of the tests.
722
            self.log('errors:\n%r', err)
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
723
        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
724
            self.assertEquals(retcode, result)
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
725
        return out, err
726
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
727
    def run_bzr(self, *args, **kwargs):
1119 by Martin Pool
doc
728
        """Invoke bzr, as if it were run from the command line.
729
730
        This should be the main method for tests that want to exercise the
731
        overall behavior of the bzr application (rather than a unit test
732
        or a functional test of the library.)
733
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
734
        This sends the stdout/stderr results into the test's log,
735
        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.
736
737
        :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
738
        """
1185.3.18 by Martin Pool
- add new helper TestBase.run_bzr_captured
739
        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
740
        encoding = kwargs.pop('encoding', None)
1687.1.2 by Robert Collins
Add stdin parameter to run_bzr and run_bzr_captured.
741
        stdin = kwargs.pop('stdin', None)
1685.1.52 by John Arbash Meinel
[merge] bzr.dev 1704
742
        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
743
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
744
    def run_bzr_decode(self, *args, **kwargs):
745
        if kwargs.has_key('encoding'):
746
            encoding = kwargs['encoding']
747
        else:
748
            encoding = bzrlib.user_encoding
749
        return self.run_bzr(*args, **kwargs)[0].decode(encoding)
750
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.
751
    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
752
        """Run bzr, and check that stderr contains the supplied regexes
753
        
1711.4.36 by John Arbash Meinel
cherrypick accepted win32 fixes: call tearDown for skipped tests, update docs for run_bzr_error
754
        :param error_regexes: Sequence of regular expressions which 
755
            must each be found in the error output. The relative ordering
756
            is not enforced.
757
        :param args: command-line arguments for bzr
758
        :param kwargs: Keyword arguments which are interpreted by run_bzr
759
            This function changes the default value of retcode to be 3,
760
            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
761
        :return: (out, err) The actual output of running the command (in case you
762
                 want to do more inspection)
1711.4.36 by John Arbash Meinel
cherrypick accepted win32 fixes: call tearDown for skipped tests, update docs for run_bzr_error
763
764
        Examples of use:
765
            # Make sure that commit is failing because there is nothing to do
766
            self.run_bzr_error(['no changes to commit'],
767
                               'commit', '-m', 'my commit comment')
768
            # Make sure --strict is handling an unknown file, rather than
769
            # giving us the 'nothing to do' error
770
            self.build_tree(['unknown'])
771
            self.run_bzr_error(['Commit refused because there are unknown files'],
772
                               '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
773
        """
774
        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.
775
        out, err = self.run_bzr(*args, **kwargs)
776
        for regex in error_regexes:
777
            self.assertContainsRe(err, regex)
1711.2.71 by John Arbash Meinel
Default to retcode=3, and add a test for run_bzr_error
778
        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.
779
1752.1.6 by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring
780
    def run_bzr_subprocess(self, *args, **kwargs):
781
        """Run bzr in a subprocess for testing.
782
783
        This starts a new Python interpreter and runs bzr in there. 
784
        This should only be used for tests that have a justifiable need for
785
        this isolation: e.g. they are testing startup time, or signal
786
        handling, or early startup code, etc.  Subprocess code can't be 
787
        profiled or debugged so easily.
1752.1.7 by Aaron Bentley
Stop using shlex in run_bzr_subprocess
788
789
        :param retcode: The status code that is expected.  Defaults to 0.  If
790
        None is supplied, the status code is not checked.
1752.1.6 by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring
791
        """
1752.1.1 by Aaron Bentley
Add run_bzr_external
792
        bzr_path = os.path.dirname(os.path.dirname(bzrlib.__file__))+'/bzr'
793
        args = list(args)
1752.1.6 by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring
794
        process = Popen([sys.executable, bzr_path]+args, stdout=PIPE, 
795
                         stderr=PIPE)
1752.1.1 by Aaron Bentley
Add run_bzr_external
796
        out = process.stdout.read()
797
        err = process.stderr.read()
798
        retcode = process.wait()
1752.1.6 by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring
799
        supplied_retcode = kwargs.get('retcode', 0)
1752.1.1 by Aaron Bentley
Add run_bzr_external
800
        if supplied_retcode is not None:
801
            assert supplied_retcode == retcode
802
        return [out, err]
803
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
804
    def check_inventory_shape(self, inv, shape):
1291 by Martin Pool
- add test for moving files between directories
805
        """Compare an inventory to a list of expected names.
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
806
807
        Fail if they are not precisely equal.
808
        """
809
        extras = []
810
        shape = list(shape)             # copy
811
        for path, ie in inv.entries():
812
            name = path.replace('\\', '/')
813
            if ie.kind == 'dir':
814
                name = name + '/'
815
            if name in shape:
816
                shape.remove(name)
817
            else:
818
                extras.append(name)
819
        if shape:
820
            self.fail("expected paths not found in inventory: %r" % shape)
821
        if extras:
822
            self.fail("unexpected paths found in inventory: %r" % extras)
823
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
824
    def apply_redirected(self, stdin=None, stdout=None, stderr=None,
825
                         a_callable=None, *args, **kwargs):
826
        """Call callable with redirected std io pipes.
827
828
        Returns the return code."""
829
        if not callable(a_callable):
830
            raise ValueError("a_callable must be callable.")
831
        if stdin is None:
832
            stdin = StringIO("")
833
        if stdout is None:
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
834
            if getattr(self, "_log_file", None) is not None:
974.1.70 by Aaron Bentley
Fixed selftest spewage (Brian M. Carlson)
835
                stdout = self._log_file
836
            else:
837
                stdout = StringIO()
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
838
        if stderr is None:
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
839
            if getattr(self, "_log_file", None is not None):
974.1.70 by Aaron Bentley
Fixed selftest spewage (Brian M. Carlson)
840
                stderr = self._log_file
841
            else:
842
                stderr = StringIO()
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
843
        real_stdin = sys.stdin
844
        real_stdout = sys.stdout
845
        real_stderr = sys.stderr
846
        try:
847
            sys.stdout = stdout
848
            sys.stderr = stderr
849
            sys.stdin = stdin
1160 by Martin Pool
- tiny refactoring
850
            return a_callable(*args, **kwargs)
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
851
        finally:
852
            sys.stdout = real_stdout
853
            sys.stderr = real_stderr
854
            sys.stdin = real_stdin
855
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
856
    def merge(self, branch_from, wt_to):
857
        """A helper for tests to do a ui-less merge.
858
859
        This should move to the main library when someone has time to integrate
860
        it in.
861
        """
862
        # minimal ui-less merge.
863
        wt_to.branch.fetch(branch_from)
864
        base_rev = common_ancestor(branch_from.last_revision(),
865
                                   wt_to.branch.last_revision(),
866
                                   wt_to.branch.repository)
867
        merge_inner(wt_to.branch, branch_from.basis_tree(), 
868
                    wt_to.branch.repository.revision_tree(base_rev),
869
                    this_tree=wt_to)
870
        wt_to.add_pending_merge(branch_from.last_revision())
871
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
872
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
873
BzrTestBase = TestCase
874
875
     
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
876
class TestCaseInTempDir(TestCase):
877
    """Derived class that runs a test within a temporary directory.
878
879
    This is useful for tests that need to create a branch, etc.
880
881
    The directory is created in a slightly complex way: for each
882
    Python invocation, a new temporary top-level directory is created.
883
    All test cases create their own directory within that.  If the
884
    tests complete successfully, the directory is removed.
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
885
886
    InTempDir is an old alias for FunctionalTestCase.
887
    """
888
889
    TEST_ROOT = None
890
    _TEST_NAME = 'test'
891
    OVERRIDE_PYTHON = 'python'
892
893
    def check_file_contents(self, filename, expect):
894
        self.log("check contents of file %s" % filename)
895
        contents = file(filename, 'r').read()
896
        if contents != expect:
897
            self.log("expected: %r" % expect)
898
            self.log("actually: %r" % contents)
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
899
            self.fail("contents of %s not as expected" % filename)
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
900
901
    def _make_test_root(self):
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
902
        if TestCaseInTempDir.TEST_ROOT is not None:
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
903
            return
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
904
        i = 0
905
        while True:
1185.16.147 by Martin Pool
[patch] Test base directory must be unicode (from Alexander)
906
            root = u'test%04d.tmp' % i
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
907
            try:
908
                os.mkdir(root)
909
            except OSError, e:
910
                if e.errno == errno.EEXIST:
911
                    i += 1
912
                    continue
913
                else:
914
                    raise
915
            # successfully created
1185.31.37 by John Arbash Meinel
Switched os.path.abspath and os.path.realpath to osutils.* (still passes on cygwin)
916
            TestCaseInTempDir.TEST_ROOT = osutils.abspath(root)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
917
            break
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
918
        # make a fake bzr directory there to prevent any tests propagating
919
        # 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.
920
        bzrdir.BzrDir.create_standalone_workingtree(TestCaseInTempDir.TEST_ROOT)
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
921
922
    def setUp(self):
1185.16.110 by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks
923
        super(TestCaseInTempDir, self).setUp()
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
924
        self._make_test_root()
1185.16.110 by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks
925
        _currentdir = os.getcwdu()
1551.6.2 by Aaron Bentley
Added explanatory comment
926
        # 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
927
        short_id = self.id().replace('bzrlib.tests.', '') \
1551.6.3 by Aaron Bentley
Updated from dev
928
                   .replace('__main__.', '')[-100:]
1540.3.20 by Martin Pool
Construct unique test directory names even when test ids recurr
929
        # it's possible the same test class is run several times for
930
        # parameterized tests, so make sure the names don't collide.  
931
        i = 0
932
        while True:
933
            if i > 0:
934
                candidate_dir = '%s/%s.%d' % (self.TEST_ROOT, short_id, i)
935
            else:
936
                candidate_dir = '%s/%s' % (self.TEST_ROOT, short_id)
937
            if os.path.exists(candidate_dir):
938
                i = i + 1
939
                continue
940
            else:
941
                self.test_dir = candidate_dir
942
                os.mkdir(self.test_dir)
943
                os.chdir(self.test_dir)
944
                break
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
945
        os.environ['HOME'] = self.test_dir
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
946
        os.environ['APPDATA'] = self.test_dir
1185.16.110 by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks
947
        def _leaveDirectory():
948
            os.chdir(_currentdir)
949
        self.addCleanup(_leaveDirectory)
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
950
        
1530.1.3 by Robert Collins
transport implementations now tested consistently.
951
    def build_tree(self, shape, line_endings='native', transport=None):
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
952
        """Build a test tree according to a pattern.
953
954
        shape is a sequence of file specifications.  If the final
955
        character is '/', a directory is created.
956
957
        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
958
        :param line_endings: Either 'binary' or 'native'
959
                             in binary mode, exact contents are written
960
                             in native mode, the line endings match the
961
                             default platform endings.
1530.1.3 by Robert Collins
transport implementations now tested consistently.
962
963
        :param transport: A transport to write to, for building trees on 
964
                          VFS's. If the transport is readonly or None,
965
                          "." is opened automatically.
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
966
        """
967
        # XXX: It's OK to just create them using forward slashes on windows?
1530.1.3 by Robert Collins
transport implementations now tested consistently.
968
        if transport is None or transport.is_readonly():
1553.5.9 by Martin Pool
Add TestCaseWithTransport.get_transport and get_readonly_transport
969
            transport = get_transport(".")
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
970
        for name in shape:
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
971
            self.assert_(isinstance(name, basestring))
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
972
            if name[-1] == '/':
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
973
                transport.mkdir(urlutils.escape(name[:-1]))
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
974
            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
975
                if line_endings == 'binary':
1530.1.3 by Robert Collins
transport implementations now tested consistently.
976
                    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
977
                elif line_endings == 'native':
1530.1.3 by Robert Collins
transport implementations now tested consistently.
978
                    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
979
                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.
980
                    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
981
                content = "contents of %s%s" % (name.encode('utf-8'), end)
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
982
                transport.put(urlutils.escape(name), StringIO(content))
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
983
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
984
    def build_tree_contents(self, shape):
1514 by Robert Collins
Unbreak self.build_tree_shape in tests.
985
        build_tree_contents(shape)
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
986
1405 by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave
987
    def failUnlessExists(self, path):
988
        """Fail unless path, which may be abs or relative, exists."""
1448 by Robert Collins
revert symlinks correctly
989
        self.failUnless(osutils.lexists(path))
1185.31.40 by John Arbash Meinel
Added osutils.mkdtemp()
990
991
    def failIfExists(self, path):
992
        """Fail if path, which may be abs or relative, exists."""
993
        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
994
        
1442.1.70 by Robert Collins
Add assertFileEqual to TestCaseInTempDir.
995
    def assertFileEqual(self, content, path):
996
        """Fail if path does not contain 'content'."""
997
        self.failUnless(osutils.lexists(path))
1685.1.31 by John Arbash Meinel
Adding tests for the rest of the _win32 functions.
998
        # TODO: jam 20060427 Shouldn't this be 'rb'?
1442.1.70 by Robert Collins
Add assertFileEqual to TestCaseInTempDir.
999
        self.assertEqualDiff(content, open(path, 'r').read())
1185.31.40 by John Arbash Meinel
Added osutils.mkdtemp()
1000
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
1001
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
1002
class TestCaseWithTransport(TestCaseInTempDir):
1003
    """A test case that provides get_url and get_readonly_url facilities.
1004
1005
    These back onto two transport servers, one for readonly access and one for
1006
    read write access.
1007
1008
    If no explicit class is provided for readonly access, a
1009
    ReadonlyTransportDecorator is used instead which allows the use of non disk
1010
    based read write transports.
1011
1012
    If an explicit class is provided for readonly access, that server and the 
1013
    readwrite one must both define get_url() as resolving to os.getcwd().
1014
    """
1015
1016
    def __init__(self, methodName='testMethod'):
1017
        super(TestCaseWithTransport, self).__init__(methodName)
1018
        self.__readonly_server = None
1019
        self.__server = None
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1020
        self.transport_server = default_transport
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
1021
        self.transport_readonly_server = None
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
1022
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
1023
    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.
1024
        """Get a URL for the readonly transport.
1025
1026
        This will either be backed by '.' or a decorator to the transport 
1027
        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.
1028
        relpath provides for clients to get a path relative to the base url.
1029
        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.
1030
        """
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.
1031
        base = self.get_readonly_server().get_url()
1032
        if relpath is not None:
1033
            if not base.endswith('/'):
1034
                base = base + '/'
1035
            base = base + relpath
1036
        return base
1037
1038
    def get_readonly_server(self):
1039
        """Get the server instance for the readonly transport
1040
1041
        This is useful for some tests with specific servers to do diagnostics.
1042
        """
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
1043
        if self.__readonly_server is None:
1044
            if self.transport_readonly_server is None:
1045
                # readonly decorator requested
1046
                # bring up the server
1047
                self.get_url()
1048
                self.__readonly_server = ReadonlyServer()
1049
                self.__readonly_server.setUp(self.__server)
1050
            else:
1051
                self.__readonly_server = self.transport_readonly_server()
1052
                self.__readonly_server.setUp()
1053
            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.
1054
        return self.__readonly_server
1055
1056
    def get_server(self):
1057
        """Get the read/write server instance.
1058
1059
        This is useful for some tests with specific servers that need
1060
        diagnostics.
1061
        """
1062
        if self.__server is None:
1063
            self.__server = self.transport_server()
1064
            self.__server.setUp()
1065
            self.addCleanup(self.__server.tearDown)
1066
        return self.__server
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
1067
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
1068
    def get_url(self, relpath=None):
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
1069
        """Get a URL for the readwrite transport.
1070
1071
        This will either be backed by '.' or to an equivalent non-file based
1072
        facility.
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
1073
        relpath provides for clients to get a path relative to the base url.
1074
        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.
1075
        """
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.
1076
        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.
1077
        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.
1078
            if not base.endswith('/'):
1079
                base = base + '/'
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
1080
            base = 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.
1081
        return base
1082
1553.5.9 by Martin Pool
Add TestCaseWithTransport.get_transport and get_readonly_transport
1083
    def get_transport(self):
1084
        """Return a writeable transport for the test scratch space"""
1085
        t = get_transport(self.get_url())
1086
        self.assertFalse(t.is_readonly())
1087
        return t
1088
1089
    def get_readonly_transport(self):
1090
        """Return a readonly transport for the test scratch space
1091
        
1092
        This can be used to test that operations which should only need
1093
        readonly access in fact do not try to write.
1094
        """
1095
        t = get_transport(self.get_readonly_url())
1096
        self.assertTrue(t.is_readonly())
1097
        return t
1098
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1099
    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.
1100
        """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
1101
        repo = self.make_repository(relpath, format=format)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1102
        return repo.bzrdir.create_branch()
1103
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1104
    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.
1105
        try:
1106
            url = self.get_url(relpath)
1685.1.14 by John Arbash Meinel
TestCaseWithTransport.get_url() should actually return a URL encoded path
1107
            mutter('relpath %r => url %r', relpath, url)
1108
            segments = url.split('/')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1109
            if segments and segments[-1] not in ('', '.'):
1685.1.15 by John Arbash Meinel
We don't need to add the rest of the URL again
1110
                parent = '/'.join(segments[:-1])
1553.5.9 by Martin Pool
Add TestCaseWithTransport.get_transport and get_readonly_transport
1111
                t = get_transport(parent)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1112
                try:
1113
                    t.mkdir(segments[-1])
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.
1114
                except errors.FileExists:
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1115
                    pass
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1116
            if format is None:
1117
                format=bzrlib.bzrdir.BzrDirFormat.get_default_format()
1118
            # FIXME: make this use a single transport someday. RBC 20060418
1119
            return format.initialize_on_transport(get_transport(relpath))
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.
1120
        except errors.UninitializableFormat:
1684.1.4 by Martin Pool
(patch) better warnings when tests are skipped (Alexander)
1121
            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.
1122
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1123
    def make_repository(self, relpath, shared=False, format=None):
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1124
        """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
1125
        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.
1126
        return made_control.create_repository(shared=shared)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1127
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1128
    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.
1129
        """Create a branch on the transport and a tree locally.
1130
1131
        Returns the tree.
1132
        """
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.
1133
        # TODO: always use the local disk path for the working tree,
1134
        # this obviously requires a format that supports branch references
1135
        # so check for that by checking bzrdir.BzrDirFormat.get_default_format()
1136
        # RBC 20060208
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
1137
        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.
1138
        try:
1139
            return b.bzrdir.create_workingtree()
1140
        except errors.NotLocalUrl:
1141
            # new formats - catch No tree error and create
1142
            # a branch reference and a checkout.
1143
            # old formats at that point - raise TestSkipped.
1144
            # TODO: rbc 20060208
1145
            return WorkingTreeFormat2().initialize(bzrdir.BzrDir.open(relpath))
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1146
1553.5.68 by Martin Pool
Add new TestCaseWithTransport.assertIsDirectory() and tests
1147
    def assertIsDirectory(self, relpath, transport):
1148
        """Assert that relpath within transport is a directory.
1149
1150
        This may not be possible on all transports; in that case it propagates
1151
        a TransportNotPossible.
1152
        """
1153
        try:
1154
            mode = transport.stat(relpath).st_mode
1155
        except errors.NoSuchFile:
1156
            self.fail("path %s is not a directory; no such file"
1157
                      % (relpath))
1158
        if not stat.S_ISDIR(mode):
1159
            self.fail("path %s is not a directory; has mode %#o"
1160
                      % (relpath, mode))
1161
1534.4.10 by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
1162
1534.4.31 by Robert Collins
cleanedup test_outside_wt
1163
class ChrootedTestCase(TestCaseWithTransport):
1164
    """A support class that provides readonly urls outside the local namespace.
1165
1166
    This is done by checking if self.transport_server is a MemoryServer. if it
1167
    is then we are chrooted already, if it is not then an HttpServer is used
1168
    for readonly urls.
1169
1170
    TODO RBC 20060127: make this an option to TestCaseWithTransport so it can
1171
                       be used without needed to redo it when a different 
1172
                       subclass is in use ?
1173
    """
1174
1175
    def setUp(self):
1176
        super(ChrootedTestCase, self).setUp()
1177
        if not self.transport_server == bzrlib.transport.memory.MemoryServer:
1178
            self.transport_readonly_server = bzrlib.transport.http.HttpServer
1179
1180
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1181
def filter_suite_by_re(suite, pattern):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1182
    result = TestUtil.TestSuite()
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1183
    filter_re = re.compile(pattern)
1184
    for test in iter_suite_tests(suite):
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1185
        if filter_re.search(test.id()):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1186
            result.addTest(test)
1187
    return result
1188
1189
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1190
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.
1191
              stop_on_failure=False, keep_output=False,
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1192
              transport=None, lsprof_timed=None):
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
1193
    TestCaseInTempDir._TEST_NAME = name
1728.1.1 by Robert Collins
(rbc)Merge in benchmark --lsprof-timed lsprofiling feature. (Robert Collins, Martin Pool).
1194
    TestCase._gather_lsprof_in_benchmarks = lsprof_timed
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
1195
    if verbose:
1196
        verbosity = 2
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
1197
        pb = None
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
1198
    else:
1199
        verbosity = 1
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
1200
        pb = progress.ProgressBar()
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
1201
    runner = TextTestRunner(stream=sys.stdout,
1202
                            descriptions=0,
1534.11.1 by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode.
1203
                            verbosity=verbosity,
1204
                            keep_output=keep_output,
1205
                            pb=pb)
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1206
    runner.stop_on_failure=stop_on_failure
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1207
    if pattern != '.*':
1208
        suite = filter_suite_by_re(suite, pattern)
1209
    result = runner.run(suite)
1393.1.6 by Martin Pool
- fold testsweet into bzrlib.selftest
1210
    return result.wasSuccessful()
1211
1212
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1213
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.
1214
             keep_output=False,
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1215
             transport=None,
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1216
             test_suite_factory=None,
1217
             lsprof_timed=None):
1204 by Martin Pool
doc
1218
    """Run the whole test suite under the enhanced runner"""
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.
1219
    global default_transport
1220
    if transport is None:
1221
        transport = default_transport
1222
    old_transport = default_transport
1223
    default_transport = transport
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1224
    try:
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1225
        if test_suite_factory is None:
1226
            suite = test_suite()
1227
        else:
1228
            suite = test_suite_factory()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1229
        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.
1230
                     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
1231
                     transport=transport,
1232
                     lsprof_timed=lsprof_timed)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1233
    finally:
1234
        default_transport = old_transport
1235
1092.1.17 by Robert Collins
remove TEST_CLASSES dead code and provide a bzrlib.test_suite() convenience method
1236
1237
def test_suite():
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1238
    """Build and return TestSuite for the whole of bzrlib.
1239
    
1240
    This function can be replaced if you need to change the default test
1241
    suite on a global basis, but it is not encouraged.
1242
    """
1740.6.1 by Martin Pool
Remove Scratch objects used by doctests
1243
    testmod_names = [
1518 by Robert Collins
Merge from mbp.
1244
                   '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
1245
                   'bzrlib.tests.test_api',
1518 by Robert Collins
Merge from mbp.
1246
                   'bzrlib.tests.test_bad_files',
1247
                   'bzrlib.tests.test_branch',
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
1248
                   'bzrlib.tests.test_bundle',
1534.4.39 by Robert Collins
Basic BzrDir support.
1249
                   'bzrlib.tests.test_bzrdir',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1250
                   '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
1251
                   'bzrlib.tests.test_commit',
1252
                   'bzrlib.tests.test_commit_merge',
1253
                   'bzrlib.tests.test_config',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1254
                   'bzrlib.tests.test_conflicts',
1551.3.11 by Aaron Bentley
Merge from Robert
1255
                   'bzrlib.tests.test_decorators',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1256
                   'bzrlib.tests.test_diff',
1551.3.11 by Aaron Bentley
Merge from Robert
1257
                   'bzrlib.tests.test_doc_generate',
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
1258
                   'bzrlib.tests.test_emptytree',
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
1259
                   'bzrlib.tests.test_errors',
1185.80.5 by John Arbash Meinel
Changing the escaping just a little bit. Now we can handle unicode characters.
1260
                   'bzrlib.tests.test_escaped_store',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1261
                   'bzrlib.tests.test_fetch',
1518 by Robert Collins
Merge from mbp.
1262
                   'bzrlib.tests.test_gpg',
1263
                   'bzrlib.tests.test_graph',
1264
                   'bzrlib.tests.test_hashcache',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1265
                   'bzrlib.tests.test_http',
1518 by Robert Collins
Merge from mbp.
1266
                   'bzrlib.tests.test_identitymap',
1267
                   'bzrlib.tests.test_inv',
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1268
                   'bzrlib.tests.test_knit',
1553.5.12 by Martin Pool
New LockDir locking mechanism
1269
                   'bzrlib.tests.test_lockdir',
1185.67.4 by Aaron Bentley
Throw if we try to write to a LockableFiles with no write lock
1270
                   'bzrlib.tests.test_lockable_files',
1518 by Robert Collins
Merge from mbp.
1271
                   'bzrlib.tests.test_log',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1272
                   '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
1273
                   'bzrlib.tests.test_merge3',
1518 by Robert Collins
Merge from mbp.
1274
                   'bzrlib.tests.test_merge_core',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1275
                   'bzrlib.tests.test_missing',
1518 by Robert Collins
Merge from mbp.
1276
                   '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
1277
                   'bzrlib.tests.test_nonascii',
1518 by Robert Collins
Merge from mbp.
1278
                   '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.
1279
                   'bzrlib.tests.test_osutils',
1558.15.6 by Aaron Bentley
Added more tests
1280
                   'bzrlib.tests.test_patch',
1185.82.9 by John Arbash Meinel
Moving patches testing into main test suite.
1281
                   'bzrlib.tests.test_patches',
1185.58.1 by John Arbash Meinel
Added new permissions test (currently don't pass)
1282
                   'bzrlib.tests.test_permissions',
1515 by Robert Collins
* Plugins with the same name in different directories in the bzr plugin
1283
                   'bzrlib.tests.test_plugins',
1551.2.27 by Aaron Bentley
Got propogation under test
1284
                   'bzrlib.tests.test_progress',
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
1285
                   'bzrlib.tests.test_reconcile',
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
1286
                   'bzrlib.tests.test_repository',
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1287
                   'bzrlib.tests.test_revision',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1288
                   'bzrlib.tests.test_revisionnamespaces',
1518 by Robert Collins
Merge from mbp.
1289
                   'bzrlib.tests.test_revprops',
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
1290
                   'bzrlib.tests.test_revisiontree',
1185.47.1 by Martin Pool
[broken] start converting basic_io to more rfc822-like format
1291
                   'bzrlib.tests.test_rio',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1292
                   'bzrlib.tests.test_sampler',
1185.51.1 by Martin Pool
Better message when failing to import a test suite.
1293
                   'bzrlib.tests.test_selftest',
1185.33.89 by Martin Pool
[patch] add a selftest test that the setup build script works (Alexander Belchenko)
1294
                   '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.
1295
                   'bzrlib.tests.test_sftp_transport',
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1296
                   'bzrlib.tests.test_smart_add',
1522 by Robert Collins
Test for the number of uses of self.working_tree() in branch.py
1297
                   'bzrlib.tests.test_source',
1551.6.19 by Aaron Bentley
Fix pending merge status on empty trees
1298
                   '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
1299
                   'bzrlib.tests.test_store',
1534.2.1 by Robert Collins
Implement deprecated_method
1300
                   'bzrlib.tests.test_symbol_versioning',
1518 by Robert Collins
Merge from mbp.
1301
                   'bzrlib.tests.test_testament',
1558.15.1 by Aaron Bentley
Add text_file function
1302
                   'bzrlib.tests.test_textfile',
1551.6.7 by Aaron Bentley
Implemented two-way merge, refactored weave merge
1303
                   'bzrlib.tests.test_textmerge',
1518 by Robert Collins
Merge from mbp.
1304
                   '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
1305
                   'bzrlib.tests.test_transactions',
1534.7.1 by Aaron Bentley
Got creation of a versioned file working
1306
                   '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
1307
                   'bzrlib.tests.test_transport',
1308
                   'bzrlib.tests.test_tsort',
1666.1.2 by Robert Collins
Fix race condition between end of stream and end of file with tuned_gzip.
1309
                   'bzrlib.tests.test_tuned_gzip',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1310
                   'bzrlib.tests.test_ui',
1311
                   'bzrlib.tests.test_upgrade',
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
1312
                   'bzrlib.tests.test_urlutils',
1563.2.1 by Robert Collins
Merge in a variation of the versionedfile api from versioned-file.
1313
                   'bzrlib.tests.test_versionedfile',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1314
                   'bzrlib.tests.test_weave',
1315
                   '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
1316
                   'bzrlib.tests.test_workingtree',
1185.33.91 by Martin Pool
[merge] improved 'missing' command from aaron
1317
                   'bzrlib.tests.test_xml',
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1318
                   ]
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1319
    test_transport_implementations = [
1711.3.2 by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions
1320
        'bzrlib.tests.test_transport_implementations',
1321
        'bzrlib.tests.test_read_bundle',
1322
        ]
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1323
    suite = TestUtil.TestSuite()
1707.2.2 by Robert Collins
Start on bench_add, an add benchtest.
1324
    loader = TestUtil.TestLoader()
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1325
    from bzrlib.transport import TransportTestProviderAdapter
1326
    adapter = TransportTestProviderAdapter()
1534.4.23 by Robert Collins
Move branch implementations tests into a package.
1327
    adapt_modules(test_transport_implementations, adapter, loader, suite)
1707.2.2 by Robert Collins
Start on bench_add, an add benchtest.
1328
    suite.addTest(loader.loadTestsFromModuleNames(testmod_names))
1513 by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
1329
    for package in packages_to_test():
1330
        suite.addTest(package.test_suite())
855 by Martin Pool
- Patch from John to allow plugins to add their own tests.
1331
    for m in MODULES_TO_TEST:
1185.51.1 by Martin Pool
Better message when failing to import a test suite.
1332
        suite.addTest(loader.loadTestsFromModule(m))
1740.6.1 by Martin Pool
Remove Scratch objects used by doctests
1333
    for m in MODULES_TO_DOCTEST:
1334
        suite.addTest(doctest.DocTestSuite(m))
1516 by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a
1335
    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.
1336
        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
1337
            suite.addTest(plugin.test_suite())
1092.1.17 by Robert Collins
remove TEST_CLASSES dead code and provide a bzrlib.test_suite() convenience method
1338
    return suite
764 by Martin Pool
- log messages from a particular test are printed if that test fails
1339
1185.51.1 by Martin Pool
Better message when failing to import a test suite.
1340
1534.4.23 by Robert Collins
Move branch implementations tests into a package.
1341
def adapt_modules(mods_list, adapter, loader, suite):
1342
    """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.
1343
    for test in iter_suite_tests(loader.loadTestsFromModuleNames(mods_list)):
1344
        suite.addTests(adapter.adapt(test))