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