/brz/remove-bazaar

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