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