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