bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
3173.1.10
by Martin Pool
Move assertFileEqual to TestCase base class as it's generally usable |
1 |
# Copyright (C) 2005, 2006, 2007, 2008 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 |
||
|
2485.6.6
by Martin Pool
Put test root directory (containing per-test directories) in TMPDIR |
29 |
import atexit |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
30 |
import codecs |
|
1185.1.29
by Robert Collins
merge merge tweaks from aaron, which includes latest .dev |
31 |
from cStringIO import StringIO |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
32 |
import difflib |
|
1740.6.1
by Martin Pool
Remove Scratch objects used by doctests |
33 |
import doctest |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
34 |
import errno |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
35 |
import logging |
36 |
import os |
|
|
2255.2.185
by Martin Pool
assertEqual uses pformat to show results |
37 |
from pprint import pformat |
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
38 |
import random |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
39 |
import re |
|
2530.3.1
by Martin Pool
Cleanup old variations on run_bzr in the test suite |
40 |
import shlex |
|
1530.1.17
by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible. |
41 |
import stat |
|
1752.1.1
by Aaron Bentley
Add run_bzr_external |
42 |
from subprocess import Popen, PIPE |
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
43 |
import sys |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
44 |
import tempfile |
|
3406.1.2
by Vincent Ladeuil
Fix as per Robert's review. |
45 |
import threading |
|
3084.1.1
by Andrew Bennetts
Add a --coverage option to selftest. |
46 |
import time |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
47 |
import unittest |
|
2485.6.5
by Martin Pool
Remove keep_output option |
48 |
import warnings |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
49 |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
50 |
|
|
2095.5.3
by Martin Pool
Disable all debug_flags when running blackbox tests |
51 |
from bzrlib import ( |
|
3567.4.12
by John Arbash Meinel
Expose the branch building framework to the test suite. |
52 |
branchbuilder, |
|
2095.5.3
by Martin Pool
Disable all debug_flags when running blackbox tests |
53 |
bzrdir, |
54 |
debug, |
|
55 |
errors, |
|
56 |
memorytree, |
|
57 |
osutils, |
|
58 |
progress, |
|
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
59 |
ui, |
|
2095.5.3
by Martin Pool
Disable all debug_flags when running blackbox tests |
60 |
urlutils, |
|
3649.6.2
by Vincent Ladeuil
Replace aliases in selftest --starting-with option. |
61 |
registry, |
|
2292.1.1
by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file. |
62 |
workingtree, |
|
2095.5.3
by Martin Pool
Disable all debug_flags when running blackbox tests |
63 |
)
|
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
64 |
import bzrlib.branch |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
65 |
import bzrlib.commands |
|
1551.12.28
by Aaron Bentley
Move bundle timestamp code to timestamp |
66 |
import bzrlib.timestamp |
|
2024.2.3
by John Arbash Meinel
Move out export tests from test_too_much, refactor |
67 |
import bzrlib.export |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
68 |
import bzrlib.inventory |
|
1185.67.6
by Aaron Bentley
Added tests and fixes for LockableFiles.put_utf8(); imported IterableFile |
69 |
import bzrlib.iterablefile |
|
1553.5.19
by Martin Pool
Run lockdir doctests |
70 |
import bzrlib.lockdir |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
71 |
try: |
72 |
import bzrlib.lsprof |
|
73 |
except ImportError: |
|
74 |
# lsprof not available
|
|
75 |
pass
|
|
|
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
76 |
from bzrlib.merge import merge_inner |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
77 |
import bzrlib.merge3 |
78 |
import bzrlib.plugin |
|
79 |
import bzrlib.store |
|
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
80 |
from bzrlib import symbol_versioning |
|
2530.3.1
by Martin Pool
Cleanup old variations on run_bzr in the test suite |
81 |
from bzrlib.symbol_versioning import ( |
|
2921.6.5
by Robert Collins
* The ``exclude_pattern`` parameter to the ``bzrlib.tests.`` functions |
82 |
DEPRECATED_PARAMETER, |
|
2921.6.6
by Robert Collins
* The ``exclude_pattern`` and ``random_order`` parameters to the function |
83 |
deprecated_function, |
84 |
deprecated_method, |
|
|
2921.6.5
by Robert Collins
* The ``exclude_pattern`` parameter to the ``bzrlib.tests.`` functions |
85 |
deprecated_passed, |
|
2530.3.1
by Martin Pool
Cleanup old variations on run_bzr in the test suite |
86 |
)
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
87 |
import bzrlib.trace |
|
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
88 |
from bzrlib.transport import get_transport |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
89 |
import bzrlib.transport |
|
1951.2.1
by Martin Pool
Change to using LocalURLServer for testing. |
90 |
from bzrlib.transport.local import LocalURLServer |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
91 |
from bzrlib.transport.memory import MemoryServer |
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
92 |
from bzrlib.transport.readonly import ReadonlyServer |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
93 |
from bzrlib.trace import mutter, note |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
94 |
from bzrlib.tests import TestUtil |
|
3102.1.1
by Vincent Ladeuil
Rename bzrlib/test/HTTPTestUtils.py to bzrlib/tests/http_utils.py and fix |
95 |
from bzrlib.tests.http_server import HttpServer |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
96 |
from bzrlib.tests.TestUtil import ( |
97 |
TestSuite, |
|
98 |
TestLoader, |
|
99 |
)
|
|
|
1514
by Robert Collins
Unbreak self.build_tree_shape in tests. |
100 |
from bzrlib.tests.treeshape import build_tree_contents |
|
2948.4.1
by Lukáš Lalinský
Custom template-based version info formatter. |
101 |
import bzrlib.version_info_formats.format_custom |
|
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. |
102 |
from bzrlib.workingtree import WorkingTree, WorkingTreeFormat2 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
103 |
|
|
2387.2.1
by Robert Collins
Mark bzrlib.tests as providing assertFOO helper functions by adding a __unittest global attribute. (Robert Collins, Andrew Bennetts, Martin Pool, Jonathan Lange) |
104 |
# Mark this python module as being part of the implementation
|
105 |
# of unittest: this gives us better tracebacks where the last
|
|
106 |
# shown frame is the test code, not our assertXYZ.
|
|
|
2598.5.7
by Aaron Bentley
Updates from review |
107 |
__unittest = 1 |
|
2387.2.1
by Robert Collins
Mark bzrlib.tests as providing assertFOO helper functions by adding a __unittest global attribute. (Robert Collins, Andrew Bennetts, Martin Pool, Jonathan Lange) |
108 |
|
|
1951.2.1
by Martin Pool
Change to using LocalURLServer for testing. |
109 |
default_transport = LocalURLServer |
|
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. |
110 |
|
|
1185.82.7
by John Arbash Meinel
Adding patches.py into bzrlib, including the tests into the test suite. |
111 |
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
112 |
class ExtendedTestResult(unittest._TextTestResult): |
113 |
"""Accepts, reports and accumulates the results of running tests. |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
114 |
|
|
2817.5.1
by Vincent Ladeuil
Catch leaking tests. |
115 |
Compared to the unittest version this class adds support for
|
|
2695.1.1
by Martin Pool
Fix problem if the first test is missing a dependency |
116 |
profiling, benchmarking, stopping as soon as a test fails, and
|
117 |
skipping tests. There are further-specialized subclasses for
|
|
118 |
different types of display.
|
|
119 |
||
120 |
When a test finishes, in whatever way, it calls one of the addSuccess,
|
|
121 |
addFailure or addError classes. These in turn may redirect to a more
|
|
122 |
specific case for the special test results supported by our extended
|
|
123 |
tests.
|
|
|
2695.1.2
by Martin Pool
_benchmarkTime should not be an attribute of ExtendedTestResult, because it only applies to the most recent test reported |
124 |
|
125 |
Note that just one of these objects is fed the results from many tests.
|
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
126 |
"""
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
127 |
|
|
1185.62.21
by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test. |
128 |
stop_early = False |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
129 |
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
130 |
def __init__(self, stream, descriptions, verbosity, |
131 |
bench_history=None, |
|
132 |
num_tests=None, |
|
133 |
):
|
|
|
1819.1.8
by Martin Pool
Improved reporting of bzrlib revision_id |
134 |
"""Construct new TestResult. |
135 |
||
136 |
:param bench_history: Optionally, a writable file object to accumulate
|
|
137 |
benchmark results.
|
|
138 |
"""
|
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
139 |
unittest._TextTestResult.__init__(self, stream, descriptions, verbosity) |
|
1819.1.1
by Carl Friedrich Bolz
(lifeless, cfbolz, hpk): Give the test result object an optional benchmark |
140 |
if bench_history is not None: |
|
1819.1.8
by Martin Pool
Improved reporting of bzrlib revision_id |
141 |
from bzrlib.version import _get_bzr_source_tree |
142 |
src_tree = _get_bzr_source_tree() |
|
143 |
if src_tree: |
|
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
144 |
try: |
145 |
revision_id = src_tree.get_parent_ids()[0] |
|
146 |
except IndexError: |
|
147 |
# XXX: if this is a brand new tree, do the same as if there
|
|
148 |
# is no branch.
|
|
149 |
revision_id = '' |
|
|
1819.1.8
by Martin Pool
Improved reporting of bzrlib revision_id |
150 |
else: |
151 |
# XXX: If there's no branch, what should we do?
|
|
152 |
revision_id = '' |
|
|
1819.1.4
by Jan Balster
save the revison id for every benchmark run in .perf-history |
153 |
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 |
154 |
self._bench_history = bench_history |
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
155 |
self.ui = ui.ui_factory |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
156 |
self.num_tests = num_tests |
157 |
self.error_count = 0 |
|
158 |
self.failure_count = 0 |
|
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
159 |
self.known_failure_count = 0 |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
160 |
self.skip_count = 0 |
|
2729.1.1
by Martin Pool
Add TestNotApplicable exception and handling of it; document test parameterization |
161 |
self.not_applicable_count = 0 |
|
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
162 |
self.unsupported = {} |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
163 |
self.count = 0 |
164 |
self._overall_start_time = time.time() |
|
|
1707.2.3
by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool). |
165 |
|
|
2695.1.2
by Martin Pool
_benchmarkTime should not be an attribute of ExtendedTestResult, because it only applies to the most recent test reported |
166 |
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). |
167 |
"""Add a benchmark time for the current test case.""" |
|
2695.1.2
by Martin Pool
_benchmarkTime should not be an attribute of ExtendedTestResult, because it only applies to the most recent test reported |
168 |
return 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). |
169 |
|
170 |
def _elapsedTestTimeString(self): |
|
171 |
"""Return a time string for the overall time the current test has taken.""" |
|
172 |
return self._formatTime(time.time() - self._start_time) |
|
173 |
||
|
2695.1.2
by Martin Pool
_benchmarkTime should not be an attribute of ExtendedTestResult, because it only applies to the most recent test reported |
174 |
def _testTimeString(self, testCase): |
175 |
benchmark_time = self._extractBenchmarkTime(testCase) |
|
176 |
if benchmark_time is not 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). |
177 |
return "%s/%s" % ( |
|
2695.1.2
by Martin Pool
_benchmarkTime should not be an attribute of ExtendedTestResult, because it only applies to the most recent test reported |
178 |
self._formatTime(benchmark_time), |
|
1707.2.3
by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool). |
179 |
self._elapsedTestTimeString()) |
180 |
else: |
|
|
2196.1.1
by Martin Pool
better formatting of benchmark output so it doesn't wrap |
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.""" |
|
|
2196.1.1
by Martin Pool
better formatting of benchmark output so it doesn't wrap |
185 |
# some benchmarks can take thousands of seconds to run, so we need 8
|
186 |
# places
|
|
187 |
return "%8dms" % (1000 * seconds) |
|
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
188 |
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
189 |
def _shortened_test_description(self, test): |
190 |
what = test.id() |
|
|
2196.1.1
by Martin Pool
better formatting of benchmark output so it doesn't wrap |
191 |
what = re.sub(r'^bzrlib\.(tests|benchmarks)\.', '', what) |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
192 |
return what |
|
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
193 |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
194 |
def startTest(self, test): |
195 |
unittest.TestResult.startTest(self, test) |
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
196 |
self.report_test_start(test) |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
197 |
test.number = self.count |
|
1707.2.3
by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool). |
198 |
self._recordTestStartTime() |
199 |
||
200 |
def _recordTestStartTime(self): |
|
201 |
"""Record that a test has started.""" |
|
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
202 |
self._start_time = time.time() |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
203 |
|
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
204 |
def _cleanupLogFile(self, test): |
205 |
# We can only do this if we have one of our TestCases, not if
|
|
206 |
# we have a doctest.
|
|
207 |
setKeepLogfile = getattr(test, 'setKeepLogfile', None) |
|
208 |
if setKeepLogfile is not None: |
|
209 |
setKeepLogfile() |
|
210 |
||
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
211 |
def addError(self, test, err): |
|
2695.1.1
by Martin Pool
Fix problem if the first test is missing a dependency |
212 |
"""Tell result that test finished with an error. |
213 |
||
214 |
Called from the TestCase run() method when the test
|
|
215 |
fails with an unexpected error.
|
|
216 |
"""
|
|
217 |
self._testConcluded(test) |
|
|
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
218 |
if isinstance(err[1], TestSkipped): |
|
2695.1.1
by Martin Pool
Fix problem if the first test is missing a dependency |
219 |
return self._addSkipped(test, err) |
|
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
220 |
elif isinstance(err[1], UnavailableFeature): |
221 |
return self.addNotSupported(test, err[1].args[0]) |
|
|
2695.1.1
by Martin Pool
Fix problem if the first test is missing a dependency |
222 |
else: |
223 |
unittest.TestResult.addError(self, test, err) |
|
224 |
self.error_count += 1 |
|
225 |
self.report_error(test, err) |
|
226 |
if self.stop_early: |
|
227 |
self.stop() |
|
|
3517.4.15
by Martin Pool
Remove dead code |
228 |
self._cleanupLogFile(test) |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
229 |
|
230 |
def addFailure(self, test, err): |
|
|
2695.1.1
by Martin Pool
Fix problem if the first test is missing a dependency |
231 |
"""Tell result that test failed. |
232 |
||
233 |
Called from the TestCase run() method when the test
|
|
234 |
fails because e.g. an assert() method failed.
|
|
235 |
"""
|
|
236 |
self._testConcluded(test) |
|
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
237 |
if isinstance(err[1], KnownFailure): |
|
2695.1.1
by Martin Pool
Fix problem if the first test is missing a dependency |
238 |
return self._addKnownFailure(test, err) |
239 |
else: |
|
240 |
unittest.TestResult.addFailure(self, test, err) |
|
241 |
self.failure_count += 1 |
|
242 |
self.report_failure(test, err) |
|
243 |
if self.stop_early: |
|
244 |
self.stop() |
|
|
3517.4.15
by Martin Pool
Remove dead code |
245 |
self._cleanupLogFile(test) |
|
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
246 |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
247 |
def addSuccess(self, test): |
|
2695.1.1
by Martin Pool
Fix problem if the first test is missing a dependency |
248 |
"""Tell result that test completed successfully. |
249 |
||
250 |
Called from the TestCase run()
|
|
251 |
"""
|
|
252 |
self._testConcluded(test) |
|
|
1819.1.3
by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history |
253 |
if self._bench_history is not None: |
|
2695.1.2
by Martin Pool
_benchmarkTime should not be an attribute of ExtendedTestResult, because it only applies to the most recent test reported |
254 |
benchmark_time = self._extractBenchmarkTime(test) |
255 |
if benchmark_time is not None: |
|
|
1819.1.3
by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history |
256 |
self._bench_history.write("%s %s\n" % ( |
|
2695.1.2
by Martin Pool
_benchmarkTime should not be an attribute of ExtendedTestResult, because it only applies to the most recent test reported |
257 |
self._formatTime(benchmark_time), |
|
1819.1.3
by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history |
258 |
test.id())) |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
259 |
self.report_success(test) |
|
3199.1.1
by Vincent Ladeuil
Get rid of ~1000 useless log files out of 10.000 tests in /tmp. |
260 |
self._cleanupLogFile(test) |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
261 |
unittest.TestResult.addSuccess(self, test) |
|
3224.4.4
by Andrew Bennetts
Tweak clearing of _log_contents (idea from John). |
262 |
test._log_contents = '' |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
263 |
|
|
2695.1.1
by Martin Pool
Fix problem if the first test is missing a dependency |
264 |
def _testConcluded(self, test): |
265 |
"""Common code when a test has finished. |
|
266 |
||
267 |
Called regardless of whether it succeded, failed, etc.
|
|
268 |
"""
|
|
|
3199.1.1
by Vincent Ladeuil
Get rid of ~1000 useless log files out of 10.000 tests in /tmp. |
269 |
pass
|
|
2695.1.1
by Martin Pool
Fix problem if the first test is missing a dependency |
270 |
|
271 |
def _addKnownFailure(self, test, err): |
|
272 |
self.known_failure_count += 1 |
|
273 |
self.report_known_failure(test, err) |
|
274 |
||
275 |
def addNotSupported(self, test, feature): |
|
276 |
"""The test will not be run because of a missing feature. |
|
277 |
"""
|
|
278 |
# this can be called in two different ways: it may be that the
|
|
279 |
# test started running, and then raised (through addError)
|
|
280 |
# UnavailableFeature. Alternatively this method can be called
|
|
281 |
# while probing for features before running the tests; in that
|
|
282 |
# case we will see startTest and stopTest, but the test will never
|
|
283 |
# actually run.
|
|
284 |
self.unsupported.setdefault(str(feature), 0) |
|
285 |
self.unsupported[str(feature)] += 1 |
|
286 |
self.report_unsupported(test, feature) |
|
287 |
||
288 |
def _addSkipped(self, test, skip_excinfo): |
|
|
2729.1.1
by Martin Pool
Add TestNotApplicable exception and handling of it; document test parameterization |
289 |
if isinstance(skip_excinfo[1], TestNotApplicable): |
290 |
self.not_applicable_count += 1 |
|
291 |
self.report_not_applicable(test, skip_excinfo) |
|
292 |
else: |
|
293 |
self.skip_count += 1 |
|
294 |
self.report_skip(test, skip_excinfo) |
|
|
2338.4.10
by Marien Zwart
Make a test skipped from setUp run tearDown again. Make calling _runCleanups twice safe. Clean up tests. |
295 |
try: |
296 |
test.tearDown() |
|
297 |
except KeyboardInterrupt: |
|
298 |
raise
|
|
299 |
except: |
|
|
2817.5.1
by Vincent Ladeuil
Catch leaking tests. |
300 |
self.addError(test, test._exc_info()) |
|
2338.4.10
by Marien Zwart
Make a test skipped from setUp run tearDown again. Make calling _runCleanups twice safe. Clean up tests. |
301 |
else: |
|
2729.1.4
by Martin Pool
merge trunk |
302 |
# seems best to treat this as success from point-of-view of unittest
|
303 |
# -- it actually does nothing so it barely matters :)
|
|
|
2338.4.10
by Marien Zwart
Make a test skipped from setUp run tearDown again. Make calling _runCleanups twice safe. Clean up tests. |
304 |
unittest.TestResult.addSuccess(self, test) |
|
3224.4.6
by Andrew Bennetts
Tweak another _log_contents clearing. |
305 |
test._log_contents = '' |
|
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
306 |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
307 |
def printErrorList(self, flavour, errors): |
308 |
for test, err in errors: |
|
309 |
self.stream.writeln(self.separator1) |
|
|
2321.3.2
by Alexander Belchenko
numbered dirs: printErrorList show test number for NUMBERED_DIRS |
310 |
self.stream.write("%s: " % flavour) |
311 |
self.stream.writeln(self.getDescription(test)) |
|
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
312 |
if getattr(test, '_get_log', None) is not None: |
|
2911.6.1
by Blake Winton
Change 'print >> f,'s to 'f.write('s. |
313 |
self.stream.write('\n') |
|
2911.6.3
by Blake Winton
Implemented suggestions from John Arbash Meinel. |
314 |
self.stream.write( |
|
2911.6.1
by Blake Winton
Change 'print >> f,'s to 'f.write('s. |
315 |
('vvvv[log from %s]' % test.id()).ljust(78,'-')) |
316 |
self.stream.write('\n') |
|
317 |
self.stream.write(test._get_log()) |
|
318 |
self.stream.write('\n') |
|
|
2911.6.3
by Blake Winton
Implemented suggestions from John Arbash Meinel. |
319 |
self.stream.write( |
|
2911.6.1
by Blake Winton
Change 'print >> f,'s to 'f.write('s. |
320 |
('^^^^[log from %s]' % test.id()).ljust(78,'-')) |
321 |
self.stream.write('\n') |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
322 |
self.stream.writeln(self.separator2) |
323 |
self.stream.writeln("%s" % err) |
|
324 |
||
|
2095.4.1
by Martin Pool
Better progress bars during tests |
325 |
def finished(self): |
326 |
pass
|
|
327 |
||
328 |
def report_cleaning_up(self): |
|
329 |
pass
|
|
330 |
||
331 |
def report_success(self, test): |
|
332 |
pass
|
|
333 |
||
|
2658.3.1
by Daniel Watkins
Added ExtendedTestResult.wasStrictlySuccessful. |
334 |
def wasStrictlySuccessful(self): |
335 |
if self.unsupported or self.known_failure_count: |
|
336 |
return False |
|
337 |
return self.wasSuccessful() |
|
338 |
||
339 |
||
|
2095.4.1
by Martin Pool
Better progress bars during tests |
340 |
class TextTestResult(ExtendedTestResult): |
341 |
"""Displays progress and results of tests in text form""" |
|
342 |
||
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
343 |
def __init__(self, stream, descriptions, verbosity, |
344 |
bench_history=None, |
|
345 |
num_tests=None, |
|
346 |
pb=None, |
|
347 |
):
|
|
348 |
ExtendedTestResult.__init__(self, stream, descriptions, verbosity, |
|
|
2598.4.1
by Martin Pool
Remove obsolete --clean-output, --keep-output, --numbered-dirs selftest options (thanks Alexander) |
349 |
bench_history, num_tests) |
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
350 |
if pb is None: |
|
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
351 |
self.pb = self.ui.nested_progress_bar() |
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
352 |
self._supplied_pb = False |
353 |
else: |
|
354 |
self.pb = pb |
|
355 |
self._supplied_pb = True |
|
|
2095.4.5
by mbp at sourcefrog
Use regular progress-bar classes, not a special mechanism |
356 |
self.pb.show_pct = False |
357 |
self.pb.show_spinner = False |
|
|
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
358 |
self.pb.show_eta = False, |
|
2095.4.5
by mbp at sourcefrog
Use regular progress-bar classes, not a special mechanism |
359 |
self.pb.show_count = False |
360 |
self.pb.show_bar = False |
|
361 |
||
|
2095.4.1
by Martin Pool
Better progress bars during tests |
362 |
def report_starting(self): |
|
2095.4.5
by mbp at sourcefrog
Use regular progress-bar classes, not a special mechanism |
363 |
self.pb.update('[test 0/%d] starting...' % (self.num_tests)) |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
364 |
|
365 |
def _progress_prefix_text(self): |
|
|
3297.1.1
by Martin Pool
More concise display of test progress bar |
366 |
# the longer this text, the less space we have to show the test
|
367 |
# name...
|
|
368 |
a = '[%d' % self.count # total that have been run |
|
369 |
# tests skipped as known not to be relevant are not important enough
|
|
370 |
# to show here
|
|
371 |
## if self.skip_count:
|
|
372 |
## a += ', %d skip' % self.skip_count
|
|
373 |
## if self.known_failure_count:
|
|
374 |
## a += '+%dX' % self.known_failure_count
|
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
375 |
if self.num_tests is not None: |
376 |
a +='/%d' % self.num_tests |
|
|
3297.1.1
by Martin Pool
More concise display of test progress bar |
377 |
a += ' in ' |
378 |
runtime = time.time() - self._overall_start_time |
|
379 |
if runtime >= 60: |
|
380 |
a += '%dm%ds' % (runtime / 60, runtime % 60) |
|
381 |
else: |
|
382 |
a += '%ds' % runtime |
|
|
3297.1.3
by Martin Pool
Fix up selftest progress tests |
383 |
if self.error_count: |
384 |
a += ', %d err' % self.error_count |
|
385 |
if self.failure_count: |
|
386 |
a += ', %d fail' % self.failure_count |
|
387 |
if self.unsupported: |
|
388 |
a += ', %d missing' % len(self.unsupported) |
|
|
2095.4.3
by Martin Pool
Tweak test display a bit more |
389 |
a += ']' |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
390 |
return a |
391 |
||
392 |
def report_test_start(self, test): |
|
393 |
self.count += 1 |
|
|
2095.4.5
by mbp at sourcefrog
Use regular progress-bar classes, not a special mechanism |
394 |
self.pb.update( |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
395 |
self._progress_prefix_text() |
396 |
+ ' ' |
|
397 |
+ self._shortened_test_description(test)) |
|
398 |
||
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
399 |
def _test_description(self, test): |
|
2598.4.1
by Martin Pool
Remove obsolete --clean-output, --keep-output, --numbered-dirs selftest options (thanks Alexander) |
400 |
return self._shortened_test_description(test) |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
401 |
|
|
2095.4.3
by Martin Pool
Tweak test display a bit more |
402 |
def report_error(self, test, err): |
|
2134.1.1
by Henri Wiechers
Changed TextTestResult's report methods to avoid % formatting in calls to ProgressBar.note(), instead args are passed and note() handles the formatting. This prevents bugs where note() might be passed a string with %'s in it because one of the args contain %'s. |
403 |
self.pb.note('ERROR: %s\n %s\n', |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
404 |
self._test_description(test), |
|
2095.4.3
by Martin Pool
Tweak test display a bit more |
405 |
err[1], |
|
2134.1.1
by Henri Wiechers
Changed TextTestResult's report methods to avoid % formatting in calls to ProgressBar.note(), instead args are passed and note() handles the formatting. This prevents bugs where note() might be passed a string with %'s in it because one of the args contain %'s. |
406 |
)
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
407 |
|
|
2095.4.3
by Martin Pool
Tweak test display a bit more |
408 |
def report_failure(self, test, err): |
|
2134.1.1
by Henri Wiechers
Changed TextTestResult's report methods to avoid % formatting in calls to ProgressBar.note(), instead args are passed and note() handles the formatting. This prevents bugs where note() might be passed a string with %'s in it because one of the args contain %'s. |
409 |
self.pb.note('FAIL: %s\n %s\n', |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
410 |
self._test_description(test), |
|
2095.4.3
by Martin Pool
Tweak test display a bit more |
411 |
err[1], |
|
2134.1.1
by Henri Wiechers
Changed TextTestResult's report methods to avoid % formatting in calls to ProgressBar.note(), instead args are passed and note() handles the formatting. This prevents bugs where note() might be passed a string with %'s in it because one of the args contain %'s. |
412 |
)
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
413 |
|
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
414 |
def report_known_failure(self, test, err): |
415 |
self.pb.note('XFAIL: %s\n%s\n', |
|
416 |
self._test_description(test), err[1]) |
|
417 |
||
|
2095.4.1
by Martin Pool
Better progress bars during tests |
418 |
def report_skip(self, test, skip_excinfo): |
|
2729.1.1
by Martin Pool
Add TestNotApplicable exception and handling of it; document test parameterization |
419 |
pass
|
420 |
||
421 |
def report_not_applicable(self, test, skip_excinfo): |
|
422 |
pass
|
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
423 |
|
|
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
424 |
def report_unsupported(self, test, feature): |
425 |
"""test cannot be run because feature is missing.""" |
|
426 |
||
|
2095.4.1
by Martin Pool
Better progress bars during tests |
427 |
def report_cleaning_up(self): |
|
2095.4.5
by mbp at sourcefrog
Use regular progress-bar classes, not a special mechanism |
428 |
self.pb.update('cleaning up...') |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
429 |
|
430 |
def finished(self): |
|
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
431 |
if not self._supplied_pb: |
432 |
self.pb.finished() |
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
433 |
|
434 |
||
435 |
class VerboseTestResult(ExtendedTestResult): |
|
436 |
"""Produce long output, with one line per test run plus times""" |
|
437 |
||
438 |
def _ellipsize_to_right(self, a_string, final_width): |
|
439 |
"""Truncate and pad a string, keeping the right hand side""" |
|
440 |
if len(a_string) > final_width: |
|
441 |
result = '...' + a_string[3-final_width:] |
|
442 |
else: |
|
443 |
result = a_string |
|
444 |
return result.ljust(final_width) |
|
445 |
||
446 |
def report_starting(self): |
|
447 |
self.stream.write('running %d tests...\n' % self.num_tests) |
|
448 |
||
449 |
def report_test_start(self, test): |
|
450 |
self.count += 1 |
|
451 |
name = self._shortened_test_description(test) |
|
|
2196.1.1
by Martin Pool
better formatting of benchmark output so it doesn't wrap |
452 |
# width needs space for 6 char status, plus 1 for slash, plus 2 10-char
|
453 |
# numbers, plus a trailing blank
|
|
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
454 |
# when NUMBERED_DIRS: plus 5 chars on test number, plus 1 char on space
|
|
2598.4.1
by Martin Pool
Remove obsolete --clean-output, --keep-output, --numbered-dirs selftest options (thanks Alexander) |
455 |
self.stream.write(self._ellipsize_to_right(name, |
456 |
osutils.terminal_width()-30)) |
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
457 |
self.stream.flush() |
458 |
||
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
459 |
def _error_summary(self, err): |
460 |
indent = ' ' * 4 |
|
461 |
return '%s%s' % (indent, err[1]) |
|
462 |
||
|
2095.4.3
by Martin Pool
Tweak test display a bit more |
463 |
def report_error(self, test, err): |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
464 |
self.stream.writeln('ERROR %s\n%s' |
|
2695.1.2
by Martin Pool
_benchmarkTime should not be an attribute of ExtendedTestResult, because it only applies to the most recent test reported |
465 |
% (self._testTimeString(test), |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
466 |
self._error_summary(err))) |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
467 |
|
|
2095.4.3
by Martin Pool
Tweak test display a bit more |
468 |
def report_failure(self, test, err): |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
469 |
self.stream.writeln(' FAIL %s\n%s' |
|
2695.1.2
by Martin Pool
_benchmarkTime should not be an attribute of ExtendedTestResult, because it only applies to the most recent test reported |
470 |
% (self._testTimeString(test), |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
471 |
self._error_summary(err))) |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
472 |
|
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
473 |
def report_known_failure(self, test, err): |
474 |
self.stream.writeln('XFAIL %s\n%s' |
|
|
2695.1.2
by Martin Pool
_benchmarkTime should not be an attribute of ExtendedTestResult, because it only applies to the most recent test reported |
475 |
% (self._testTimeString(test), |
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
476 |
self._error_summary(err))) |
477 |
||
|
2095.4.1
by Martin Pool
Better progress bars during tests |
478 |
def report_success(self, test): |
|
2695.1.2
by Martin Pool
_benchmarkTime should not be an attribute of ExtendedTestResult, because it only applies to the most recent test reported |
479 |
self.stream.writeln(' OK %s' % self._testTimeString(test)) |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
480 |
for bench_called, stats in getattr(test, '_benchcalls', []): |
481 |
self.stream.writeln('LSProf output for %s(%s, %s)' % bench_called) |
|
482 |
stats.pprint(file=self.stream) |
|
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
483 |
# flush the stream so that we get smooth output. This verbose mode is
|
484 |
# used to show the output in PQM.
|
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
485 |
self.stream.flush() |
486 |
||
487 |
def report_skip(self, test, skip_excinfo): |
|
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
488 |
self.stream.writeln(' SKIP %s\n%s' |
|
2695.1.2
by Martin Pool
_benchmarkTime should not be an attribute of ExtendedTestResult, because it only applies to the most recent test reported |
489 |
% (self._testTimeString(test), |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
490 |
self._error_summary(skip_excinfo))) |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
491 |
|
|
2729.1.1
by Martin Pool
Add TestNotApplicable exception and handling of it; document test parameterization |
492 |
def report_not_applicable(self, test, skip_excinfo): |
493 |
self.stream.writeln(' N/A %s\n%s' |
|
|
2729.1.5
by Martin Pool
Update report_not_applicable for _testTimeString fix |
494 |
% (self._testTimeString(test), |
|
2729.1.1
by Martin Pool
Add TestNotApplicable exception and handling of it; document test parameterization |
495 |
self._error_summary(skip_excinfo))) |
496 |
||
|
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
497 |
def report_unsupported(self, test, feature): |
498 |
"""test cannot be run because feature is missing.""" |
|
499 |
self.stream.writeln("NODEP %s\n The feature '%s' is not available." |
|
|
2695.1.2
by Martin Pool
_benchmarkTime should not be an attribute of ExtendedTestResult, because it only applies to the most recent test reported |
500 |
%(self._testTimeString(test), feature)) |
|
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
501 |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
502 |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
503 |
class TextTestRunner(object): |
|
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
504 |
stop_on_failure = False |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
505 |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
506 |
def __init__(self, |
507 |
stream=sys.stderr, |
|
508 |
descriptions=0, |
|
509 |
verbosity=1, |
|
|
2379.6.3
by Alexander Belchenko
Rework NUMBERED_DIRS usage to keep test_selftest.py passing the tests on win32 |
510 |
bench_history=None, |
|
2418.4.1
by John Arbash Meinel
(Ian Clatworthy) Bugs #102679, #102686. Add --exclude and --randomize to 'bzr selftest' |
511 |
list_only=False |
|
2379.6.3
by Alexander Belchenko
Rework NUMBERED_DIRS usage to keep test_selftest.py passing the tests on win32 |
512 |
):
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
513 |
self.stream = unittest._WritelnDecorator(stream) |
514 |
self.descriptions = descriptions |
|
515 |
self.verbosity = verbosity |
|
|
1819.1.2
by Carl Friedrich Bolz
(lifeless, cfbolz, hpk): Add a benchmark output parameter to TextTestRunner. |
516 |
self._bench_history = bench_history |
|
2394.2.1
by Ian Clatworthy
--list and --exclude first cut |
517 |
self.list_only = list_only |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
518 |
|
519 |
def run(self, test): |
|
520 |
"Run the given test case or test suite."
|
|
521 |
startTime = time.time() |
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
522 |
if self.verbosity == 1: |
523 |
result_class = TextTestResult |
|
524 |
elif self.verbosity >= 2: |
|
525 |
result_class = VerboseTestResult |
|
526 |
result = result_class(self.stream, |
|
527 |
self.descriptions, |
|
528 |
self.verbosity, |
|
529 |
bench_history=self._bench_history, |
|
530 |
num_tests=test.countTestCases(), |
|
531 |
)
|
|
532 |
result.stop_early = self.stop_on_failure |
|
533 |
result.report_starting() |
|
|
2394.2.1
by Ian Clatworthy
--list and --exclude first cut |
534 |
if self.list_only: |
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
535 |
if self.verbosity >= 2: |
536 |
self.stream.writeln("Listing tests only ...\n") |
|
537 |
run = 0 |
|
|
2394.2.1
by Ian Clatworthy
--list and --exclude first cut |
538 |
for t in iter_suite_tests(test): |
539 |
self.stream.writeln("%s" % (t.id())) |
|
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
540 |
run += 1 |
541 |
actionTaken = "Listed" |
|
|
2394.2.1
by Ian Clatworthy
--list and --exclude first cut |
542 |
else: |
543 |
test.run(result) |
|
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
544 |
run = result.testsRun |
545 |
actionTaken = "Ran" |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
546 |
stopTime = time.time() |
547 |
timeTaken = stopTime - startTime |
|
548 |
result.printErrors() |
|
549 |
self.stream.writeln(result.separator2) |
|
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
550 |
self.stream.writeln("%s %d test%s in %.3fs" % (actionTaken, |
551 |
run, run != 1 and "s" or "", timeTaken)) |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
552 |
self.stream.writeln() |
553 |
if not result.wasSuccessful(): |
|
554 |
self.stream.write("FAILED (") |
|
555 |
failed, errored = map(len, (result.failures, result.errors)) |
|
556 |
if failed: |
|
557 |
self.stream.write("failures=%d" % failed) |
|
558 |
if errored: |
|
559 |
if failed: self.stream.write(", ") |
|
560 |
self.stream.write("errors=%d" % errored) |
|
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
561 |
if result.known_failure_count: |
562 |
if failed or errored: self.stream.write(", ") |
|
563 |
self.stream.write("known_failure_count=%d" % |
|
564 |
result.known_failure_count) |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
565 |
self.stream.writeln(")") |
566 |
else: |
|
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
567 |
if result.known_failure_count: |
568 |
self.stream.writeln("OK (known_failures=%d)" % |
|
569 |
result.known_failure_count) |
|
570 |
else: |
|
571 |
self.stream.writeln("OK") |
|
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
572 |
if result.skip_count > 0: |
573 |
skipped = result.skip_count |
|
574 |
self.stream.writeln('%d test%s skipped' % |
|
575 |
(skipped, skipped != 1 and "s" or "")) |
|
|
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
576 |
if result.unsupported: |
577 |
for feature, count in sorted(result.unsupported.items()): |
|
578 |
self.stream.writeln("Missing feature '%s' skipped %d tests." % |
|
579 |
(feature, count)) |
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
580 |
result.finished() |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
581 |
return result |
582 |
||
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
583 |
|
|
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
584 |
def iter_suite_tests(suite): |
585 |
"""Return all tests in a suite, recursing through nested suites""" |
|
586 |
for item in suite._tests: |
|
587 |
if isinstance(item, unittest.TestCase): |
|
588 |
yield item |
|
589 |
elif isinstance(item, unittest.TestSuite): |
|
590 |
for r in iter_suite_tests(item): |
|
591 |
yield r |
|
592 |
else: |
|
593 |
raise Exception('unknown object %r inside test suite %r' |
|
594 |
% (item, suite)) |
|
595 |
||
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
596 |
|
597 |
class TestSkipped(Exception): |
|
598 |
"""Indicates that a test was intentionally skipped, rather than failing.""" |
|
599 |
||
600 |
||
|
2729.1.1
by Martin Pool
Add TestNotApplicable exception and handling of it; document test parameterization |
601 |
class TestNotApplicable(TestSkipped): |
602 |
"""A test is not applicable to the situation where it was run. |
|
603 |
||
604 |
This is only normally raised by parameterized tests, if they find that
|
|
605 |
the instance they're constructed upon does not support one aspect
|
|
606 |
of its interface.
|
|
607 |
"""
|
|
608 |
||
609 |
||
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
610 |
class KnownFailure(AssertionError): |
611 |
"""Indicates that a test failed in a precisely expected manner. |
|
612 |
||
613 |
Such failures dont block the whole test suite from passing because they are
|
|
614 |
indicators of partially completed code or of future work. We have an
|
|
615 |
explicit error for them so that we can ensure that they are always visible:
|
|
616 |
KnownFailures are always shown in the output of bzr selftest.
|
|
617 |
"""
|
|
618 |
||
619 |
||
|
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
620 |
class UnavailableFeature(Exception): |
621 |
"""A feature required for this test was not available. |
|
622 |
||
623 |
The feature should be used to construct the exception.
|
|
624 |
"""
|
|
625 |
||
626 |
||
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
627 |
class CommandFailed(Exception): |
628 |
pass
|
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
629 |
|
|
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 |
630 |
|
631 |
class StringIOWrapper(object): |
|
632 |
"""A wrapper around cStringIO which just adds an encoding attribute. |
|
633 |
|
|
634 |
Internally we can check sys.stdout to see what the output encoding
|
|
635 |
should be. However, cStringIO has no encoding attribute that we can
|
|
636 |
set. So we wrap it instead.
|
|
637 |
"""
|
|
638 |
encoding='ascii' |
|
639 |
_cstring = None |
|
640 |
||
641 |
def __init__(self, s=None): |
|
642 |
if s is not None: |
|
643 |
self.__dict__['_cstring'] = StringIO(s) |
|
644 |
else: |
|
645 |
self.__dict__['_cstring'] = StringIO() |
|
646 |
||
647 |
def __getattr__(self, name, getattr=getattr): |
|
648 |
return getattr(self.__dict__['_cstring'], name) |
|
649 |
||
650 |
def __setattr__(self, name, val): |
|
651 |
if name == 'encoding': |
|
652 |
self.__dict__['encoding'] = val |
|
653 |
else: |
|
654 |
return setattr(self._cstring, name, val) |
|
655 |
||
656 |
||
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
657 |
class TestUIFactory(ui.CLIUIFactory): |
658 |
"""A UI Factory for testing. |
|
659 |
||
660 |
Hide the progress bar but emit note()s.
|
|
661 |
Redirect stdin.
|
|
662 |
Allows get_password to be tested without real tty attached.
|
|
|
2294.4.1
by Vincent Ladeuil
Add a UIFactory.get_login method, fix tests. |
663 |
"""
|
664 |
||
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
665 |
def __init__(self, |
666 |
stdout=None, |
|
667 |
stderr=None, |
|
668 |
stdin=None): |
|
669 |
super(TestUIFactory, self).__init__() |
|
670 |
if stdin is not None: |
|
671 |
# We use a StringIOWrapper to be able to test various
|
|
672 |
# encodings, but the user is still responsible to
|
|
673 |
# encode the string and to set the encoding attribute
|
|
674 |
# of StringIOWrapper.
|
|
675 |
self.stdin = StringIOWrapper(stdin) |
|
676 |
if stdout is None: |
|
677 |
self.stdout = sys.stdout |
|
678 |
else: |
|
679 |
self.stdout = stdout |
|
680 |
if stderr is None: |
|
681 |
self.stderr = sys.stderr |
|
682 |
else: |
|
683 |
self.stderr = stderr |
|
684 |
||
685 |
def clear(self): |
|
686 |
"""See progress.ProgressBar.clear().""" |
|
687 |
||
688 |
def clear_term(self): |
|
689 |
"""See progress.ProgressBar.clear_term().""" |
|
690 |
||
691 |
def clear_term(self): |
|
692 |
"""See progress.ProgressBar.clear_term().""" |
|
693 |
||
694 |
def finished(self): |
|
695 |
"""See progress.ProgressBar.finished().""" |
|
696 |
||
697 |
def note(self, fmt_string, *args, **kwargs): |
|
698 |
"""See progress.ProgressBar.note().""" |
|
699 |
self.stdout.write((fmt_string + "\n") % args) |
|
700 |
||
701 |
def progress_bar(self): |
|
702 |
return self |
|
703 |
||
704 |
def nested_progress_bar(self): |
|
705 |
return self |
|
706 |
||
707 |
def update(self, message, count=None, total=None): |
|
708 |
"""See progress.ProgressBar.update().""" |
|
709 |
||
710 |
def get_non_echoed_password(self, prompt): |
|
711 |
"""Get password from stdin without trying to handle the echo mode""" |
|
712 |
if prompt: |
|
|
2461.1.1
by Vincent Ladeuil
Fix 110204 by letting TestUIFactory encode password prompt. |
713 |
self.stdout.write(prompt.encode(self.stdout.encoding, 'replace')) |
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
714 |
password = self.stdin.readline() |
715 |
if not password: |
|
716 |
raise EOFError |
|
717 |
if password[-1] == '\n': |
|
718 |
password = password[:-1] |
|
719 |
return password |
|
|
2294.4.1
by Vincent Ladeuil
Add a UIFactory.get_login method, fix tests. |
720 |
|
721 |
||
|
3406.1.2
by Vincent Ladeuil
Fix as per Robert's review. |
722 |
def _report_leaked_threads(): |
723 |
bzrlib.trace.warning('%s is leaking threads among %d leaking tests', |
|
724 |
TestCase._first_thread_leaker_id, |
|
725 |
TestCase._leaking_threads_tests) |
|
726 |
||
727 |
||
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
728 |
class TestCase(unittest.TestCase): |
729 |
"""Base class for bzr unit tests. |
|
730 |
|
|
731 |
Tests that need access to disk resources should subclass
|
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
732 |
TestCaseInTempDir not TestCase.
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
733 |
|
734 |
Error and debug log messages are redirected from their usual
|
|
735 |
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. |
736 |
retrieved by _get_log(). We use a real OS file, not an in-memory object,
|
737 |
so that it can also capture file IO. When the test completes this file
|
|
738 |
is read into memory and removed from disk.
|
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
739 |
|
740 |
There are also convenience functions to invoke bzr's command-line
|
|
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
741 |
routine, and to build and check bzr trees.
|
742 |
|
|
743 |
In addition to the usual method of overriding tearDown(), this class also
|
|
744 |
allows subclasses to register functions into the _cleanups list, which is
|
|
745 |
run in order as the object is torn down. It's less likely this will be
|
|
746 |
accidentally overlooked.
|
|
747 |
"""
|
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
748 |
|
|
3406.1.2
by Vincent Ladeuil
Fix as per Robert's review. |
749 |
_active_threads = None |
750 |
_leaking_threads_tests = 0 |
|
751 |
_first_thread_leaker_id = None |
|
|
1185.16.14
by Martin Pool
- make TestCase._get_log work even if setup was aborted |
752 |
_log_file_name = None |
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
753 |
_log_contents = '' |
|
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
754 |
_keep_log_file = False |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
755 |
# record lsprof data when performing benchmark calls.
|
756 |
_gather_lsprof_in_benchmarks = False |
|
|
3405.1.1
by Robert Collins
(robertc) Preserve test ids correctly to aid debugging. (Robert Collins, Andrew Bennetts) |
757 |
attrs_to_keep = ('id', '_testMethodName', '_testMethodDoc', |
|
3224.4.9
by Andrew Bennetts
Add _TestCase__testMethodName to attrs_to_keep, for compatibility with Python 2.4. |
758 |
'_log_contents', '_log_file_name', '_benchtime', |
759 |
'_TestCase__testMethodName') |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
760 |
|
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
761 |
def __init__(self, methodName='testMethod'): |
762 |
super(TestCase, self).__init__(methodName) |
|
763 |
self._cleanups = [] |
|
764 |
||
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
765 |
def setUp(self): |
766 |
unittest.TestCase.setUp(self) |
|
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
767 |
self._cleanEnvironment() |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
768 |
self._silenceUI() |
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
769 |
self._startLogFile() |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
770 |
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) |
771 |
self._benchtime = None |
|
2423.1.1
by Martin Pool
fix import order dependency that broke benchmarks |
772 |
self._clear_hooks() |
|
2560.1.1
by Robert Collins
Make debug.debug_flags be isolated for all tests. |
773 |
self._clear_debug_flags() |
|
3406.1.2
by Vincent Ladeuil
Fix as per Robert's review. |
774 |
TestCase._active_threads = threading.activeCount() |
775 |
self.addCleanup(self._check_leaked_threads) |
|
776 |
||
777 |
def _check_leaked_threads(self): |
|
778 |
active = threading.activeCount() |
|
779 |
leaked_threads = active - TestCase._active_threads |
|
780 |
TestCase._active_threads = active |
|
781 |
if leaked_threads: |
|
782 |
TestCase._leaking_threads_tests += 1 |
|
783 |
if TestCase._first_thread_leaker_id is None: |
|
784 |
TestCase._first_thread_leaker_id = self.id() |
|
785 |
# we're not specifically told when all tests are finished.
|
|
786 |
# This will do. We use a function to avoid keeping a reference
|
|
787 |
# to a TestCase object.
|
|
788 |
atexit.register(_report_leaked_threads) |
|
|
2560.1.1
by Robert Collins
Make debug.debug_flags be isolated for all tests. |
789 |
|
790 |
def _clear_debug_flags(self): |
|
791 |
"""Prevent externally set debug flags affecting tests. |
|
792 |
|
|
793 |
Tests that want to use debug flags can just set them in the
|
|
794 |
debug_flags set during setup/teardown.
|
|
795 |
"""
|
|
|
3731.3.1
by Andrew Bennetts
Make the test suite pass when -Eallow_debug is used. |
796 |
self._preserved_debug_flags = set(debug.debug_flags) |
|
3390.1.1
by Andrew Bennetts
Add --debugflags/-E option to selftest. |
797 |
if 'allow_debug' not in selftest_debug_flags: |
|
3302.2.1
by Andrew Bennetts
Add -Dselftest_debug debug flag. |
798 |
debug.debug_flags.clear() |
|
3731.3.1
by Andrew Bennetts
Make the test suite pass when -Eallow_debug is used. |
799 |
self.addCleanup(self._restore_debug_flags) |
|
2423.1.1
by Martin Pool
fix import order dependency that broke benchmarks |
800 |
|
801 |
def _clear_hooks(self): |
|
|
2245.1.1
by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers |
802 |
# prevent hooks affecting tests
|
|
2423.1.1
by Martin Pool
fix import order dependency that broke benchmarks |
803 |
import bzrlib.branch |
|
3703.3.3
by Andrew Bennetts
Neater effort tests for push by using a _SmartClient.hooks['call'] hook. |
804 |
import bzrlib.smart.client |
|
2423.1.1
by Martin Pool
fix import order dependency that broke benchmarks |
805 |
import bzrlib.smart.server |
|
2370.4.1
by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented |
806 |
self._preserved_hooks = { |
|
2018.18.14
by Martin Pool
merge hpss again; restore incorrectly removed RemoteRepository.break_lock |
807 |
bzrlib.branch.Branch: bzrlib.branch.Branch.hooks, |
|
3335.1.1
by Jelmer Vernooij
Add tests for mutabletree hooks. |
808 |
bzrlib.mutabletree.MutableTree: bzrlib.mutabletree.MutableTree.hooks, |
|
3703.3.3
by Andrew Bennetts
Neater effort tests for push by using a _SmartClient.hooks['call'] hook. |
809 |
bzrlib.smart.client._SmartClient: bzrlib.smart.client._SmartClient.hooks, |
|
2018.18.14
by Martin Pool
merge hpss again; restore incorrectly removed RemoteRepository.break_lock |
810 |
bzrlib.smart.server.SmartTCPServer: bzrlib.smart.server.SmartTCPServer.hooks, |
|
2370.4.1
by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented |
811 |
}
|
|
2245.1.1
by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers |
812 |
self.addCleanup(self._restoreHooks) |
|
2018.18.14
by Martin Pool
merge hpss again; restore incorrectly removed RemoteRepository.break_lock |
813 |
# reset all hooks to an empty instance of the appropriate type
|
|
2245.1.2
by Robert Collins
Remove the static DefaultHooks method from Branch, replacing it with a derived dict BranchHooks object, which is easier to use and provides a place to put the policy-checking add method discussed on list. |
814 |
bzrlib.branch.Branch.hooks = bzrlib.branch.BranchHooks() |
|
3703.3.3
by Andrew Bennetts
Neater effort tests for push by using a _SmartClient.hooks['call'] hook. |
815 |
bzrlib.smart.client._SmartClient.hooks = bzrlib.smart.client.SmartClientHooks() |
|
2018.18.14
by Martin Pool
merge hpss again; restore incorrectly removed RemoteRepository.break_lock |
816 |
bzrlib.smart.server.SmartTCPServer.hooks = bzrlib.smart.server.SmartServerHooks() |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
817 |
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
818 |
def _silenceUI(self): |
819 |
"""Turn off UI for duration of test""" |
|
820 |
# by default the UI is off; tests can turn it on if they want it.
|
|
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
821 |
saved = ui.ui_factory |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
822 |
def _restore(): |
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
823 |
ui.ui_factory = saved |
824 |
ui.ui_factory = ui.SilentUIFactory() |
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
825 |
self.addCleanup(_restore) |
826 |
||
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
827 |
def _ndiff_strings(self, a, b): |
|
1185.16.67
by Martin Pool
- assertEqualDiff handles strings without trailing newline |
828 |
"""Return ndiff between two strings containing lines. |
829 |
|
|
830 |
A trailing newline is added if missing to make the strings
|
|
831 |
print properly."""
|
|
832 |
if b and b[-1] != '\n': |
|
833 |
b += '\n' |
|
834 |
if a and a[-1] != '\n': |
|
835 |
a += '\n' |
|
|
1185.16.21
by Martin Pool
- tweak diff shown by assertEqualDiff |
836 |
difflines = difflib.ndiff(a.splitlines(True), |
837 |
b.splitlines(True), |
|
838 |
linejunk=lambda x: False, |
|
839 |
charjunk=lambda x: False) |
|
840 |
return ''.join(difflines) |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
841 |
|
|
2255.2.190
by Martin Pool
assertEqual can take an option message |
842 |
def assertEqual(self, a, b, message=''): |
|
2360.1.2
by John Arbash Meinel
Add an overzealous test, for Unicode support of _iter_changes. |
843 |
try: |
844 |
if a == b: |
|
845 |
return
|
|
846 |
except UnicodeError, e: |
|
847 |
# If we can't compare without getting a UnicodeError, then
|
|
848 |
# obviously they are different
|
|
849 |
mutter('UnicodeError: %s', e) |
|
|
2255.2.190
by Martin Pool
assertEqual can take an option message |
850 |
if message: |
851 |
message += '\n' |
|
852 |
raise AssertionError("%snot equal:\na = %s\nb = %s\n" |
|
853 |
% (message, |
|
|
2477.1.4
by Martin Pool
fix up indenting in pformat of inequalities displayed by test suite |
854 |
pformat(a), pformat(b))) |
|
2255.2.185
by Martin Pool
assertEqual uses pformat to show results |
855 |
|
856 |
assertEquals = assertEqual |
|
857 |
||
|
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. |
858 |
def assertEqualDiff(self, a, b, message=None): |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
859 |
"""Assert two texts are equal, if not raise an exception. |
860 |
|
|
861 |
This is intended for use with multi-line strings where it can
|
|
862 |
be hard to find the differences by eye.
|
|
863 |
"""
|
|
864 |
# TODO: perhaps override assertEquals to call this for strings?
|
|
865 |
if a == b: |
|
866 |
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. |
867 |
if message is None: |
868 |
message = "texts not equal:\n" |
|
|
3468.2.2
by Martin Pool
Better message re final newlines from assertEqualDiff |
869 |
if a == b + '\n': |
870 |
message = 'first string is missing a final newline.\n' |
|
871 |
if a + '\n' == b: |
|
872 |
message = 'second string is missing a final newline.\n' |
|
|
2555.3.3
by Martin Pool
Simple lock tracing in LockDir |
873 |
raise AssertionError(message + |
874 |
self._ndiff_strings(a, b)) |
|
|
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
875 |
|
|
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. |
876 |
def assertEqualMode(self, mode, mode_test): |
877 |
self.assertEqual(mode, mode_test, |
|
878 |
'mode mismatch %o != %o' % (mode, mode_test)) |
|
879 |
||
|
3709.3.2
by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat. |
880 |
def assertEqualStat(self, expected, actual): |
881 |
"""assert that expected and actual are the same stat result. |
|
882 |
||
883 |
:param expected: A stat result.
|
|
884 |
:param actual: A stat result.
|
|
885 |
:raises AssertionError: If the expected and actual stat values differ
|
|
886 |
other than by atime.
|
|
887 |
"""
|
|
888 |
self.assertEqual(expected.st_size, actual.st_size) |
|
889 |
self.assertEqual(expected.st_mtime, actual.st_mtime) |
|
890 |
self.assertEqual(expected.st_ctime, actual.st_ctime) |
|
891 |
self.assertEqual(expected.st_dev, actual.st_dev) |
|
892 |
self.assertEqual(expected.st_ino, actual.st_ino) |
|
893 |
self.assertEqual(expected.st_mode, actual.st_mode) |
|
894 |
||
|
2474.1.68
by John Arbash Meinel
Review feedback from Martin, mostly documentation updates. |
895 |
def assertPositive(self, val): |
896 |
"""Assert that val is greater than 0.""" |
|
897 |
self.assertTrue(val > 0, 'expected a positive value, but got %s' % val) |
|
898 |
||
899 |
def assertNegative(self, val): |
|
900 |
"""Assert that val is less than 0.""" |
|
901 |
self.assertTrue(val < 0, 'expected a negative value, but got %s' % val) |
|
902 |
||
|
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
903 |
def assertStartsWith(self, s, prefix): |
904 |
if not s.startswith(prefix): |
|
905 |
raise AssertionError('string %r does not start with %r' % (s, prefix)) |
|
906 |
||
907 |
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. |
908 |
"""Asserts that s ends with suffix.""" |
909 |
if not s.endswith(suffix): |
|
|
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
910 |
raise AssertionError('string %r does not end with %r' % (s, suffix)) |
|
1185.16.42
by Martin Pool
- Add assertContainsRe |
911 |
|
912 |
def assertContainsRe(self, haystack, needle_re): |
|
913 |
"""Assert that a contains something matching a regular expression.""" |
|
914 |
if not re.search(needle_re, haystack): |
|
|
2555.3.1
by Martin Pool
Better messages from assertContainsRe |
915 |
if '\n' in haystack or len(haystack) > 60: |
916 |
# a long string, format it in a more readable way
|
|
917 |
raise AssertionError( |
|
918 |
'pattern "%s" not found in\n"""\\\n%s"""\n' |
|
919 |
% (needle_re, haystack)) |
|
920 |
else: |
|
921 |
raise AssertionError('pattern "%s" not found in "%s"' |
|
922 |
% (needle_re, haystack)) |
|
|
1442.1.70
by Robert Collins
Add assertFileEqual to TestCaseInTempDir. |
923 |
|
|
1185.84.3
by Aaron Bentley
Hide diffs for old revisions in bundles |
924 |
def assertNotContainsRe(self, haystack, needle_re): |
925 |
"""Assert that a does not match a regular expression""" |
|
926 |
if re.search(needle_re, haystack): |
|
927 |
raise AssertionError('pattern "%s" found in "%s"' |
|
928 |
% (needle_re, haystack)) |
|
929 |
||
|
1553.5.3
by Martin Pool
[patch] Rename TestCase.AssertSubset to assertSubset for consistency (Jan Hudec) |
930 |
def assertSubset(self, sublist, superlist): |
|
1185.46.8
by Aaron Bentley
bzr add reports ignored patterns. |
931 |
"""Assert that every entry in sublist is present in superlist.""" |
|
2695.1.4
by Martin Pool
Much faster assertSubset using sets, not O(n**2) |
932 |
missing = set(sublist) - set(superlist) |
|
1185.46.8
by Aaron Bentley
bzr add reports ignored patterns. |
933 |
if len(missing) > 0: |
|
2695.1.4
by Martin Pool
Much faster assertSubset using sets, not O(n**2) |
934 |
raise AssertionError("value(s) %r not present in container %r" % |
|
1185.46.8
by Aaron Bentley
bzr add reports ignored patterns. |
935 |
(missing, superlist)) |
936 |
||
|
2004.1.29
by v.ladeuil+lp at free
New tests for http range requests handling. |
937 |
def assertListRaises(self, excClass, func, *args, **kwargs): |
938 |
"""Fail unless excClass is raised when the iterator from func is used. |
|
939 |
|
|
940 |
Many functions can return generators this makes sure
|
|
941 |
to wrap them in a list() call to make sure the whole generator
|
|
942 |
is run, and that the proper exception is raised.
|
|
943 |
"""
|
|
944 |
try: |
|
945 |
list(func(*args, **kwargs)) |
|
|
3287.20.1
by John Arbash Meinel
Update assertListRaises so that it returns the exception. |
946 |
except excClass, e: |
947 |
return e |
|
|
2004.1.29
by v.ladeuil+lp at free
New tests for http range requests handling. |
948 |
else: |
949 |
if getattr(excClass,'__name__', None) is not None: |
|
950 |
excName = excClass.__name__ |
|
951 |
else: |
|
952 |
excName = str(excClass) |
|
953 |
raise self.failureException, "%s not raised" % excName |
|
954 |
||
|
2399.1.7
by John Arbash Meinel
Cleanup bzrlib/benchmarks/* so that everything at least has a valid doc string. |
955 |
def assertRaises(self, excClass, callableObj, *args, **kwargs): |
|
2323.5.5
by Martin Pool
override TestCase.assertRaises to return the exception |
956 |
"""Assert that a callable raises a particular exception. |
957 |
||
|
2323.5.9
by Martin Pool
Clear up assertRaises (r=robert) |
958 |
:param excClass: As for the except statement, this may be either an
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
959 |
exception class, or a tuple of classes.
|
|
2399.1.7
by John Arbash Meinel
Cleanup bzrlib/benchmarks/* so that everything at least has a valid doc string. |
960 |
:param callableObj: A callable, will be passed ``*args`` and
|
961 |
``**kwargs``.
|
|
|
2323.5.9
by Martin Pool
Clear up assertRaises (r=robert) |
962 |
|
|
2323.5.5
by Martin Pool
override TestCase.assertRaises to return the exception |
963 |
Returns the exception so that you can examine it.
|
964 |
"""
|
|
965 |
try: |
|
|
2399.1.10
by John Arbash Meinel
fix assertRaises to use the right parameter... |
966 |
callableObj(*args, **kwargs) |
|
2323.5.5
by Martin Pool
override TestCase.assertRaises to return the exception |
967 |
except excClass, e: |
968 |
return e |
|
969 |
else: |
|
970 |
if getattr(excClass,'__name__', None) is not None: |
|
971 |
excName = excClass.__name__ |
|
972 |
else: |
|
|
2323.5.9
by Martin Pool
Clear up assertRaises (r=robert) |
973 |
# probably a tuple
|
|
2323.5.5
by Martin Pool
override TestCase.assertRaises to return the exception |
974 |
excName = str(excClass) |
975 |
raise self.failureException, "%s not raised" % excName |
|
976 |
||
|
2220.1.13
by Marius Kruger
Remove assertNone |
977 |
def assertIs(self, left, right, message=None): |
|
1185.68.1
by Aaron Bentley
test transactions |
978 |
if not (left is right): |
|
2220.1.13
by Marius Kruger
Remove assertNone |
979 |
if message is not None: |
980 |
raise AssertionError(message) |
|
981 |
else: |
|
982 |
raise AssertionError("%r is not %r." % (left, right)) |
|
983 |
||
984 |
def assertIsNot(self, left, right, message=None): |
|
985 |
if (left is right): |
|
986 |
if message is not None: |
|
987 |
raise AssertionError(message) |
|
988 |
else: |
|
989 |
raise AssertionError("%r is %r." % (left, right)) |
|
|
2220.1.4
by Marius Kruger
* bzrlib/tests/__init__ |
990 |
|
|
1530.1.21
by Robert Collins
Review feedback fixes. |
991 |
def assertTransportMode(self, transport, path, mode): |
|
1530.1.17
by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible. |
992 |
"""Fail if a path does not have mode mode. |
993 |
|
|
|
1651.1.3
by Martin Pool
Use transport._can_roundtrip_unix_modebits to decide whether to check transport results |
994 |
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. |
995 |
"""
|
|
1651.1.3
by Martin Pool
Use transport._can_roundtrip_unix_modebits to decide whether to check transport results |
996 |
if not transport._can_roundtrip_unix_modebits(): |
|
1530.1.17
by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible. |
997 |
return
|
998 |
path_stat = transport.stat(path) |
|
999 |
actual_mode = stat.S_IMODE(path_stat.st_mode) |
|
1000 |
self.assertEqual(mode, actual_mode, |
|
1001 |
'mode of %r incorrect (%o != %o)' % (path, mode, actual_mode)) |
|
1002 |
||
|
2823.1.4
by Vincent Ladeuil
Use assertIsSameRealPath to avoid OSX aliasing (specifically /tmp |
1003 |
def assertIsSameRealPath(self, path1, path2): |
1004 |
"""Fail if path1 and path2 points to different files""" |
|
|
2823.1.11
by Vincent Ladeuil
Review feedback. |
1005 |
self.assertEqual(osutils.realpath(path1), |
1006 |
osutils.realpath(path2), |
|
1007 |
"apparent paths:\na = %s\nb = %s\n," % (path1, path2)) |
|
|
2823.1.4
by Vincent Ladeuil
Use assertIsSameRealPath to avoid OSX aliasing (specifically /tmp |
1008 |
|
|
1540.3.22
by Martin Pool
[patch] Add TestCase.assertIsInstance |
1009 |
def assertIsInstance(self, obj, kls): |
1010 |
"""Fail if obj is not an instance of kls""" |
|
1011 |
if not isinstance(obj, kls): |
|
|
1666.1.6
by Robert Collins
Make knit the default format. |
1012 |
self.fail("%r is an instance of %s rather than %s" % ( |
1013 |
obj, obj.__class__, kls)) |
|
|
1540.3.22
by Martin Pool
[patch] Add TestCase.assertIsInstance |
1014 |
|
|
1551.13.10
by Aaron Bentley
Changes from review (poolie) |
1015 |
def expectFailure(self, reason, assertion, *args, **kwargs): |
|
1551.13.9
by Aaron Bentley
Implement TestCase.expectFailure |
1016 |
"""Invoke a test, expecting it to fail for the given reason. |
1017 |
||
|
1551.13.10
by Aaron Bentley
Changes from review (poolie) |
1018 |
This is for assertions that ought to succeed, but currently fail.
|
|
1551.13.11
by Aaron Bentley
Update docs |
1019 |
(The failure is *expected* but not *wanted*.) Please be very precise
|
1020 |
about the failure you're expecting. If a new bug is introduced,
|
|
1021 |
AssertionError should be raised, not KnownFailure.
|
|
1022 |
||
1023 |
Frequently, expectFailure should be followed by an opposite assertion.
|
|
1024 |
See example below.
|
|
|
1551.13.10
by Aaron Bentley
Changes from review (poolie) |
1025 |
|
|
1551.13.9
by Aaron Bentley
Implement TestCase.expectFailure |
1026 |
Intended to be used with a callable that raises AssertionError as the
|
|
1551.13.10
by Aaron Bentley
Changes from review (poolie) |
1027 |
'assertion' parameter. args and kwargs are passed to the 'assertion'.
|
|
1551.13.9
by Aaron Bentley
Implement TestCase.expectFailure |
1028 |
|
1029 |
Raises KnownFailure if the test fails. Raises AssertionError if the
|
|
1030 |
test succeeds.
|
|
1031 |
||
1032 |
example usage::
|
|
|
1551.13.11
by Aaron Bentley
Update docs |
1033 |
|
1034 |
self.expectFailure('Math is broken', self.assertNotEqual, 54,
|
|
1035 |
dynamic_val)
|
|
1036 |
self.assertEqual(42, dynamic_val)
|
|
1037 |
||
1038 |
This means that a dynamic_val of 54 will cause the test to raise
|
|
1039 |
a KnownFailure. Once math is fixed and the expectFailure is removed,
|
|
1040 |
only a dynamic_val of 42 will allow the test to pass. Anything other
|
|
1041 |
than 54 or 42 will cause an AssertionError.
|
|
|
1551.13.9
by Aaron Bentley
Implement TestCase.expectFailure |
1042 |
"""
|
1043 |
try: |
|
|
1551.13.10
by Aaron Bentley
Changes from review (poolie) |
1044 |
assertion(*args, **kwargs) |
|
1551.13.9
by Aaron Bentley
Implement TestCase.expectFailure |
1045 |
except AssertionError: |
1046 |
raise KnownFailure(reason) |
|
1047 |
else: |
|
1048 |
self.fail('Unexpected success. Should have failed: %s' % reason) |
|
1049 |
||
|
3173.1.10
by Martin Pool
Move assertFileEqual to TestCase base class as it's generally usable |
1050 |
def assertFileEqual(self, content, path): |
1051 |
"""Fail if path does not contain 'content'.""" |
|
1052 |
self.failUnlessExists(path) |
|
1053 |
f = file(path, 'rb') |
|
1054 |
try: |
|
1055 |
s = f.read() |
|
1056 |
finally: |
|
1057 |
f.close() |
|
1058 |
self.assertEqualDiff(content, s) |
|
1059 |
||
|
3173.1.12
by Martin Pool
Add test_push_log_file |
1060 |
def failUnlessExists(self, path): |
1061 |
"""Fail unless path or paths, which may be abs or relative, exist.""" |
|
1062 |
if not isinstance(path, basestring): |
|
1063 |
for p in path: |
|
1064 |
self.failUnlessExists(p) |
|
1065 |
else: |
|
1066 |
self.failUnless(osutils.lexists(path),path+" does not exist") |
|
1067 |
||
1068 |
def failIfExists(self, path): |
|
1069 |
"""Fail if path or paths, which may be abs or relative, exist.""" |
|
1070 |
if not isinstance(path, basestring): |
|
1071 |
for p in path: |
|
1072 |
self.failIfExists(p) |
|
1073 |
else: |
|
1074 |
self.failIf(osutils.lexists(path),path+" exists") |
|
1075 |
||
|
2592.3.243
by Martin Pool
Rename TestCase._capture_warnings |
1076 |
def _capture_deprecation_warnings(self, a_callable, *args, **kwargs): |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1077 |
"""A helper for callDeprecated and applyDeprecated. |
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
1078 |
|
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1079 |
:param a_callable: A callable to call.
|
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
1080 |
:param args: The positional arguments for the callable
|
1081 |
: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 |
1082 |
:return: A tuple (warnings, result). result is the result of calling
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
1083 |
a_callable(``*args``, ``**kwargs``).
|
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
1084 |
"""
|
1085 |
local_warnings = [] |
|
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1086 |
def capture_warnings(msg, cls=None, stacklevel=None): |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1087 |
# we've hooked into a deprecation specific callpath,
|
1088 |
# only deprecations should getting sent via it.
|
|
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
1089 |
self.assertEqual(cls, DeprecationWarning) |
1090 |
local_warnings.append(msg) |
|
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1091 |
original_warning_method = symbol_versioning.warn |
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
1092 |
symbol_versioning.set_warning_method(capture_warnings) |
1093 |
try: |
|
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1094 |
result = a_callable(*args, **kwargs) |
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
1095 |
finally: |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1096 |
symbol_versioning.set_warning_method(original_warning_method) |
1097 |
return (local_warnings, result) |
|
1098 |
||
1099 |
def applyDeprecated(self, deprecation_format, a_callable, *args, **kwargs): |
|
1100 |
"""Call a deprecated callable without warning the user. |
|
1101 |
||
|
2530.3.3
by Martin Pool
Clean up some callers that use varargs syntax for run_bzr, but don't |
1102 |
Note that this only captures warnings raised by symbol_versioning.warn,
|
1103 |
not other callers that go direct to the warning module.
|
|
1104 |
||
|
2697.2.2
by Martin Pool
deprecate Branch.append_revision |
1105 |
To test that a deprecated method raises an error, do something like
|
1106 |
this::
|
|
1107 |
||
|
3400.3.6
by Martin Pool
Remove code deprecated prior to 1.1 and its tests |
1108 |
self.assertRaises(errors.ReservedId,
|
1109 |
self.applyDeprecated,
|
|
1110 |
deprecated_in((1, 5, 0)),
|
|
1111 |
br.append_revision,
|
|
1112 |
'current:')
|
|
|
2697.2.2
by Martin Pool
deprecate Branch.append_revision |
1113 |
|
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1114 |
:param deprecation_format: The deprecation format that the callable
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
1115 |
should have been deprecated with. This is the same type as the
|
1116 |
parameter to deprecated_method/deprecated_function. If the
|
|
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1117 |
callable is not deprecated with this format, an assertion error
|
1118 |
will be raised.
|
|
1119 |
:param a_callable: A callable to call. This may be a bound method or
|
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
1120 |
a regular function. It will be called with ``*args`` and
|
1121 |
``**kwargs``.
|
|
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1122 |
:param args: The positional arguments for the callable
|
1123 |
:param kwargs: The keyword arguments for the callable
|
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
1124 |
:return: The result of a_callable(``*args``, ``**kwargs``)
|
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1125 |
"""
|
|
2592.3.243
by Martin Pool
Rename TestCase._capture_warnings |
1126 |
call_warnings, result = self._capture_deprecation_warnings(a_callable, |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1127 |
*args, **kwargs) |
1128 |
expected_first_warning = symbol_versioning.deprecation_string( |
|
1129 |
a_callable, deprecation_format) |
|
1130 |
if len(call_warnings) == 0: |
|
|
2255.7.47
by Robert Collins
Improve applyDeprecated warning message. |
1131 |
self.fail("No deprecation warning generated by call to %s" % |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1132 |
a_callable) |
1133 |
self.assertEqual(expected_first_warning, call_warnings[0]) |
|
1134 |
return result |
|
1135 |
||
|
2592.3.242
by Martin Pool
New method TestCase.call_catch_warnings |
1136 |
def callCatchWarnings(self, fn, *args, **kw): |
1137 |
"""Call a callable that raises python warnings. |
|
1138 |
||
1139 |
The caller's responsible for examining the returned warnings.
|
|
1140 |
||
1141 |
If the callable raises an exception, the exception is not
|
|
1142 |
caught and propagates up to the caller. In that case, the list
|
|
1143 |
of warnings is not available.
|
|
1144 |
||
1145 |
:returns: ([warning_object, ...], fn_result)
|
|
1146 |
"""
|
|
|
2592.3.246
by Andrew Bennetts
Override warnings.filters in callCatchWarnings, to insulate it from -Werror. |
1147 |
# XXX: This is not perfect, because it completely overrides the
|
1148 |
# warnings filters, and some code may depend on suppressing particular
|
|
1149 |
# warnings. It's the easiest way to insulate ourselves from -Werror,
|
|
1150 |
# though. -- Andrew, 20071062
|
|
|
2592.3.242
by Martin Pool
New method TestCase.call_catch_warnings |
1151 |
wlist = [] |
|
3734.5.3
by Vincent Ladeuil
Martin's review feedback. |
1152 |
def _catcher(message, category, filename, lineno, file=None, line=None): |
|
2592.3.242
by Martin Pool
New method TestCase.call_catch_warnings |
1153 |
# despite the name, 'message' is normally(?) a Warning subclass
|
1154 |
# instance
|
|
1155 |
wlist.append(message) |
|
1156 |
saved_showwarning = warnings.showwarning |
|
|
2592.3.246
by Andrew Bennetts
Override warnings.filters in callCatchWarnings, to insulate it from -Werror. |
1157 |
saved_filters = warnings.filters |
|
2592.3.242
by Martin Pool
New method TestCase.call_catch_warnings |
1158 |
try: |
1159 |
warnings.showwarning = _catcher |
|
|
2592.3.246
by Andrew Bennetts
Override warnings.filters in callCatchWarnings, to insulate it from -Werror. |
1160 |
warnings.filters = [] |
|
2592.3.242
by Martin Pool
New method TestCase.call_catch_warnings |
1161 |
result = fn(*args, **kw) |
1162 |
finally: |
|
1163 |
warnings.showwarning = saved_showwarning |
|
|
2592.3.246
by Andrew Bennetts
Override warnings.filters in callCatchWarnings, to insulate it from -Werror. |
1164 |
warnings.filters = saved_filters |
|
2592.3.242
by Martin Pool
New method TestCase.call_catch_warnings |
1165 |
return wlist, result |
1166 |
||
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1167 |
def callDeprecated(self, expected, callable, *args, **kwargs): |
1168 |
"""Assert that a callable is deprecated in a particular way. |
|
1169 |
||
1170 |
This is a very precise test for unusual requirements. The
|
|
1171 |
applyDeprecated helper function is probably more suited for most tests
|
|
1172 |
as it allows you to simply specify the deprecation format being used
|
|
1173 |
and will ensure that that is issued for the function being called.
|
|
1174 |
||
|
2530.3.3
by Martin Pool
Clean up some callers that use varargs syntax for run_bzr, but don't |
1175 |
Note that this only captures warnings raised by symbol_versioning.warn,
|
|
2592.3.242
by Martin Pool
New method TestCase.call_catch_warnings |
1176 |
not other callers that go direct to the warning module. To catch
|
1177 |
general warnings, use callCatchWarnings.
|
|
|
2530.3.3
by Martin Pool
Clean up some callers that use varargs syntax for run_bzr, but don't |
1178 |
|
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1179 |
:param expected: a list of the deprecation warnings expected, in order
|
1180 |
:param callable: The callable to call
|
|
1181 |
:param args: The positional arguments for the callable
|
|
1182 |
:param kwargs: The keyword arguments for the callable
|
|
1183 |
"""
|
|
|
2592.3.243
by Martin Pool
Rename TestCase._capture_warnings |
1184 |
call_warnings, result = self._capture_deprecation_warnings(callable, |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1185 |
*args, **kwargs) |
1186 |
self.assertEqual(expected, call_warnings) |
|
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
1187 |
return result |
1188 |
||
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
1189 |
def _startLogFile(self): |
1190 |
"""Send bzr and test log messages to a temporary file. |
|
1191 |
||
1192 |
The file is removed as the test is torn down.
|
|
1193 |
"""
|
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1194 |
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 |
1195 |
self._log_file = os.fdopen(fileno, 'w+') |
|
3173.1.9
by Martin Pool
tests should now call push/pop_test_log |
1196 |
self._log_memento = bzrlib.trace.push_log_file(self._log_file) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1197 |
self._log_file_name = name |
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
1198 |
self.addCleanup(self._finishLogFile) |
1199 |
||
1200 |
def _finishLogFile(self): |
|
1201 |
"""Finished with the log file. |
|
1202 |
||
|
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
1203 |
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. |
1204 |
"""
|
|
1711.7.10
by John Arbash Meinel
Nothing to clean up if self._log_file is None |
1205 |
if self._log_file is None: |
1206 |
return
|
|
|
3173.1.9
by Martin Pool
tests should now call push/pop_test_log |
1207 |
bzrlib.trace.pop_log_file(self._log_memento) |
|
1185.16.122
by Martin Pool
[patch] Close test log file before deleting, needed on Windows |
1208 |
self._log_file.close() |
|
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
1209 |
self._log_file = None |
|
2024.2.9
by John Arbash Meinel
Bring back log deletions |
1210 |
if not self._keep_log_file: |
1211 |
os.remove(self._log_file_name) |
|
1212 |
self._log_file_name = None |
|
|
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
1213 |
|
1214 |
def setKeepLogfile(self): |
|
1215 |
"""Make the logfile not be deleted when _finishLogFile is called.""" |
|
1216 |
self._keep_log_file = True |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1217 |
|
|
3620.1.1
by Jonathan Lange
Let addCleanup take arguments that are then passed to the cleanup. |
1218 |
def addCleanup(self, callable, *args, **kwargs): |
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
1219 |
"""Arrange to run a callable when this case is torn down. |
1220 |
||
1221 |
Callables are run in the reverse of the order they are registered,
|
|
1222 |
ie last-in first-out.
|
|
1223 |
"""
|
|
|
3620.1.1
by Jonathan Lange
Let addCleanup take arguments that are then passed to the cleanup. |
1224 |
self._cleanups.append((callable, args, kwargs)) |
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
1225 |
|
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
1226 |
def _cleanEnvironment(self): |
|
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
1227 |
new_env = { |
|
2055.1.2
by John Arbash Meinel
Clean up BZR_HOME in ENV for the test suite |
1228 |
'BZR_HOME': None, # Don't inherit BZR_HOME to all the tests. |
|
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
1229 |
'HOME': os.getcwd(), |
|
3638.4.4
by Mark Hammond
fix typo in comments |
1230 |
# bzr now uses the Win32 API and doesn't rely on APPDATA, but the
|
|
3638.4.1
by Mark Hammond
Add win32utils.get_local_appdata_location() so bzr and plugins can |
1231 |
# tests do check our impls match APPDATA
|
|
2839.6.2
by Alexander Belchenko
changes after Martin's review |
1232 |
'BZR_EDITOR': None, # test_msgeditor manipulates this variable |
|
1861.4.1
by Matthieu Moy
BZREMAIL renamed to BZR_EMAIL. |
1233 |
'BZR_EMAIL': None, |
|
1912.2.1
by Adeodato Simó
Clear $BZREMAIL in tests, not only the newer $BZR_EMAIL, since the |
1234 |
'BZREMAIL': None, # may still be present in the environment |
|
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
1235 |
'EMAIL': None, |
|
1963.1.6
by John Arbash Meinel
Use the new helper function in a few places |
1236 |
'BZR_PROGRESS_BAR': None, |
|
3193.6.1
by Alexander Belchenko
``BZR_LOG=disable`` suppresses writing messages to .bzr.log. |
1237 |
'BZR_LOG': None, |
|
3835.2.7
by Aaron Bentley
Add tests for plugins |
1238 |
'BZR_PLUGIN_PATH': None, |
|
2617.2.1
by Jelmer Vernooij
Sanitize SSH_AUTH_SOCK environment variable (#125955). |
1239 |
# SSH Agent
|
1240 |
'SSH_AUTH_SOCK': None, |
|
|
2167.3.6
by v.ladeuil+lp at free
Take John's comments into account and add more tests. |
1241 |
# Proxies
|
1242 |
'http_proxy': None, |
|
1243 |
'HTTP_PROXY': None, |
|
1244 |
'https_proxy': None, |
|
1245 |
'HTTPS_PROXY': None, |
|
1246 |
'no_proxy': None, |
|
1247 |
'NO_PROXY': None, |
|
1248 |
'all_proxy': None, |
|
1249 |
'ALL_PROXY': None, |
|
1250 |
# Nobody cares about these ones AFAIK. So far at
|
|
1251 |
# least. If you do (care), please update this comment
|
|
1252 |
# -- vila 20061212
|
|
1253 |
'ftp_proxy': None, |
|
1254 |
'FTP_PROXY': None, |
|
|
2512.3.1
by Daniel Watkins
Added BZR_REMOTE_PATH to the list of environment variables cleaned before running tests, fixing bug #111958. |
1255 |
'BZR_REMOTE_PATH': None, |
|
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
1256 |
}
|
|
1185.38.4
by John Arbash Meinel
Making old_env a private member |
1257 |
self.__old_env = {} |
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
1258 |
self.addCleanup(self._restoreEnvironment) |
|
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
1259 |
for name, value in new_env.iteritems(): |
1260 |
self._captureVar(name, value) |
|
1261 |
||
1262 |
def _captureVar(self, name, newvalue): |
|
|
1963.1.6
by John Arbash Meinel
Use the new helper function in a few places |
1263 |
"""Set an environment variable, and reset it when finished.""" |
1264 |
self.__old_env[name] = osutils.set_or_unset_env(name, newvalue) |
|
|
1185.38.2
by John Arbash Meinel
[patch] Aaron Bentley's HOME fix. |
1265 |
|
|
2560.1.1
by Robert Collins
Make debug.debug_flags be isolated for all tests. |
1266 |
def _restore_debug_flags(self): |
|
2560.1.3
by Robert Collins
Allow 'from debug import debug_flags' |
1267 |
debug.debug_flags.clear() |
1268 |
debug.debug_flags.update(self._preserved_debug_flags) |
|
|
2560.1.1
by Robert Collins
Make debug.debug_flags be isolated for all tests. |
1269 |
|
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
1270 |
def _restoreEnvironment(self): |
|
1185.38.4
by John Arbash Meinel
Making old_env a private member |
1271 |
for name, value in self.__old_env.iteritems(): |
|
1963.1.6
by John Arbash Meinel
Use the new helper function in a few places |
1272 |
osutils.set_or_unset_env(name, value) |
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
1273 |
|
|
2245.1.1
by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers |
1274 |
def _restoreHooks(self): |
|
2370.4.1
by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented |
1275 |
for klass, hooks in self._preserved_hooks.items(): |
1276 |
setattr(klass, 'hooks', hooks) |
|
|
2245.1.1
by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers |
1277 |
|
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
1278 |
def knownFailure(self, reason): |
1279 |
"""This test has failed for some known reason.""" |
|
1280 |
raise KnownFailure(reason) |
|
1281 |
||
|
2367.1.3
by Robert Collins
Add support for calling addNotSupported on TestResults to bzr TestCase's |
1282 |
def run(self, result=None): |
1283 |
if result is None: result = self.defaultTestResult() |
|
1284 |
for feature in getattr(self, '_test_needs_features', []): |
|
1285 |
if not feature.available(): |
|
1286 |
result.startTest(self) |
|
1287 |
if getattr(result, 'addNotSupported', None): |
|
1288 |
result.addNotSupported(self, feature) |
|
1289 |
else: |
|
1290 |
result.addSuccess(self) |
|
1291 |
result.stopTest(self) |
|
1292 |
return
|
|
|
3224.4.1
by Andrew Bennetts
Prune __dict__ of TestCases after they have run to save memory. |
1293 |
try: |
1294 |
return unittest.TestCase.run(self, result) |
|
1295 |
finally: |
|
1296 |
saved_attrs = {} |
|
|
3224.4.3
by Andrew Bennetts
Rename 'not_found' marker to 'absent_attr'. |
1297 |
absent_attr = object() |
|
3224.4.1
by Andrew Bennetts
Prune __dict__ of TestCases after they have run to save memory. |
1298 |
for attr_name in self.attrs_to_keep: |
|
3224.4.3
by Andrew Bennetts
Rename 'not_found' marker to 'absent_attr'. |
1299 |
attr = getattr(self, attr_name, absent_attr) |
1300 |
if attr is not absent_attr: |
|
|
3224.4.1
by Andrew Bennetts
Prune __dict__ of TestCases after they have run to save memory. |
1301 |
saved_attrs[attr_name] = attr |
1302 |
self.__dict__ = saved_attrs |
|
|
2367.1.3
by Robert Collins
Add support for calling addNotSupported on TestResults to bzr TestCase's |
1303 |
|
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
1304 |
def tearDown(self): |
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
1305 |
self._runCleanups() |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1306 |
unittest.TestCase.tearDown(self) |
1307 |
||
|
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) |
1308 |
def time(self, callable, *args, **kwargs): |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
1309 |
"""Run callable and accrue the time it takes to the benchmark time. |
1310 |
|
|
1311 |
If lsprofiling is enabled (i.e. by --lsprof-time to bzr selftest) then
|
|
1312 |
this will cause lsprofile statistics to be gathered and stored in
|
|
1313 |
self._benchcalls.
|
|
1314 |
"""
|
|
|
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) |
1315 |
if self._benchtime is None: |
1316 |
self._benchtime = 0 |
|
1317 |
start = time.time() |
|
1318 |
try: |
|
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
1319 |
if not self._gather_lsprof_in_benchmarks: |
1320 |
return callable(*args, **kwargs) |
|
1321 |
else: |
|
1322 |
# record this benchmark
|
|
1323 |
ret, stats = bzrlib.lsprof.profile(callable, *args, **kwargs) |
|
1324 |
stats.sort() |
|
1325 |
self._benchcalls.append(((callable, args, kwargs), stats)) |
|
1326 |
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) |
1327 |
finally: |
1328 |
self._benchtime += time.time() - start |
|
1329 |
||
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
1330 |
def _runCleanups(self): |
1331 |
"""Run registered cleanup functions. |
|
1332 |
||
1333 |
This should only be called from TestCase.tearDown.
|
|
1334 |
"""
|
|
|
1541
by Martin Pool
doc |
1335 |
# TODO: Perhaps this should keep running cleanups even if
|
1336 |
# one of them fails?
|
|
|
2338.4.10
by Marien Zwart
Make a test skipped from setUp run tearDown again. Make calling _runCleanups twice safe. Clean up tests. |
1337 |
|
1338 |
# Actually pop the cleanups from the list so tearDown running
|
|
1339 |
# twice is safe (this happens for skipped tests).
|
|
1340 |
while self._cleanups: |
|
|
3620.1.1
by Jonathan Lange
Let addCleanup take arguments that are then passed to the cleanup. |
1341 |
cleanup, args, kwargs = self._cleanups.pop() |
1342 |
cleanup(*args, **kwargs) |
|
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
1343 |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1344 |
def log(self, *args): |
|
1185.43.1
by Martin Pool
Remove direct logging calls from selftest |
1345 |
mutter(*args) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1346 |
|
|
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
1347 |
def _get_log(self, keep_log_file=False): |
|
2725.1.1
by Robert Collins
Add -Devil flag to highlight the use of problematic API calls. |
1348 |
"""Get the log from bzrlib.trace calls from this test. |
1349 |
||
1350 |
:param keep_log_file: When True, if the log is still a file on disk
|
|
1351 |
leave it as a file on disk. When False, if the log is still a file
|
|
1352 |
on disk, the log file is deleted and the log preserved as
|
|
1353 |
self._log_contents.
|
|
1354 |
:return: A string containing the log.
|
|
1355 |
"""
|
|
|
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
1356 |
# flush the log file, to get all content
|
1357 |
import bzrlib.trace |
|
|
3778.4.1
by Martin Pool
test _get_log method should cope if .bzr.log is not open |
1358 |
if bzrlib.trace._trace_file: |
1359 |
bzrlib.trace._trace_file.flush() |
|
|
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
1360 |
if self._log_contents: |
|
3199.1.1
by Vincent Ladeuil
Get rid of ~1000 useless log files out of 10.000 tests in /tmp. |
1361 |
# XXX: this can hardly contain the content flushed above --vila
|
1362 |
# 20080128
|
|
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
1363 |
return self._log_contents |
|
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
1364 |
if self._log_file_name is not None: |
1365 |
logfile = open(self._log_file_name) |
|
1366 |
try: |
|
1367 |
log_contents = logfile.read() |
|
1368 |
finally: |
|
1369 |
logfile.close() |
|
1370 |
if not keep_log_file: |
|
1371 |
self._log_contents = log_contents |
|
|
2309.2.7
by Alexander Belchenko
Skip permission denied (on win32) during selftest cleanup |
1372 |
try: |
1373 |
os.remove(self._log_file_name) |
|
1374 |
except OSError, e: |
|
1375 |
if sys.platform == 'win32' and e.errno == errno.EACCES: |
|
|
2911.6.1
by Blake Winton
Change 'print >> f,'s to 'f.write('s. |
1376 |
sys.stderr.write(('Unable to delete log file ' |
1377 |
' %r\n' % self._log_file_name)) |
|
|
2309.2.7
by Alexander Belchenko
Skip permission denied (on win32) during selftest cleanup |
1378 |
else: |
1379 |
raise
|
|
|
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
1380 |
return log_contents |
1381 |
else: |
|
1382 |
return "DELETED log file to reduce memory footprint" |
|
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
1383 |
|
|
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
1384 |
def requireFeature(self, feature): |
1385 |
"""This test requires a specific feature is available. |
|
1386 |
||
1387 |
:raises UnavailableFeature: When feature is not available.
|
|
1388 |
"""
|
|
1389 |
if not feature.available(): |
|
1390 |
raise UnavailableFeature(feature) |
|
1391 |
||
|
2530.3.2
by Martin Pool
Refactoring run_bzr code into more of a common base. |
1392 |
def _run_bzr_autosplit(self, args, retcode, encoding, stdin, |
1393 |
working_dir): |
|
|
2530.3.3
by Martin Pool
Clean up some callers that use varargs syntax for run_bzr, but don't |
1394 |
"""Run bazaar command line, splitting up a string command line.""" |
1395 |
if isinstance(args, basestring): |
|
|
2804.4.1
by Alexander Belchenko
some win32-specific fixes for selftest |
1396 |
# shlex don't understand unicode strings,
|
1397 |
# so args should be plain string (bialix 20070906)
|
|
1398 |
args = list(shlex.split(str(args))) |
|
|
2530.3.3
by Martin Pool
Clean up some callers that use varargs syntax for run_bzr, but don't |
1399 |
return self._run_bzr_core(args, retcode=retcode, |
1400 |
encoding=encoding, stdin=stdin, working_dir=working_dir, |
|
1401 |
)
|
|
1402 |
||
1403 |
def _run_bzr_core(self, args, retcode, encoding, stdin, |
|
1404 |
working_dir): |
|
|
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 |
1405 |
if encoding is None: |
|
3224.5.4
by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding. |
1406 |
encoding = osutils.get_user_encoding() |
|
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 |
1407 |
stdout = StringIOWrapper() |
1408 |
stderr = StringIOWrapper() |
|
1409 |
stdout.encoding = encoding |
|
1410 |
stderr.encoding = encoding |
|
1411 |
||
|
2530.3.2
by Martin Pool
Refactoring run_bzr code into more of a common base. |
1412 |
self.log('run bzr: %r', args) |
|
1185.43.5
by Martin Pool
Update log message quoting |
1413 |
# FIXME: don't call into logging here
|
|
1185.3.20
by Martin Pool
- run_bzr_captured also includes logged errors in |
1414 |
handler = logging.StreamHandler(stderr) |
1415 |
handler.setLevel(logging.INFO) |
|
1416 |
logger = logging.getLogger('') |
|
1417 |
logger.addHandler(handler) |
|
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
1418 |
old_ui_factory = ui.ui_factory |
1419 |
ui.ui_factory = TestUIFactory(stdin=stdin, stdout=stdout, stderr=stderr) |
|
|
2027.5.1
by John Arbash Meinel
Add working_dir=XX to run_bzr_* functions, and clean up tests |
1420 |
|
1421 |
cwd = None |
|
1422 |
if working_dir is not None: |
|
1423 |
cwd = osutils.getcwd() |
|
1424 |
os.chdir(working_dir) |
|
1425 |
||
|
1185.3.20
by Martin Pool
- run_bzr_captured also includes logged errors in |
1426 |
try: |
|
2560.1.1
by Robert Collins
Make debug.debug_flags be isolated for all tests. |
1427 |
result = self.apply_redirected(ui.ui_factory.stdin, |
1428 |
stdout, stderr, |
|
|
2830.2.1
by Martin Pool
If TestCase.run_bzr hits an internal exception, don't catch it but rather propagate up into the test suite |
1429 |
bzrlib.commands.run_bzr_catch_user_errors, |
|
2560.1.1
by Robert Collins
Make debug.debug_flags be isolated for all tests. |
1430 |
args) |
|
1185.3.20
by Martin Pool
- run_bzr_captured also includes logged errors in |
1431 |
finally: |
1432 |
logger.removeHandler(handler) |
|
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
1433 |
ui.ui_factory = old_ui_factory |
|
2027.5.1
by John Arbash Meinel
Add working_dir=XX to run_bzr_* functions, and clean up tests |
1434 |
if cwd is not None: |
1435 |
os.chdir(cwd) |
|
|
1685.1.69
by Wouter van Heyst
merge bzr.dev 1740 |
1436 |
|
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
1437 |
out = stdout.getvalue() |
1438 |
err = stderr.getvalue() |
|
1439 |
if out: |
|
|
1185.85.72
by John Arbash Meinel
Fix some of the tests. |
1440 |
self.log('output:\n%r', out) |
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
1441 |
if err: |
|
1185.85.72
by John Arbash Meinel
Fix some of the tests. |
1442 |
self.log('errors:\n%r', err) |
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
1443 |
if retcode is not None: |
|
2292.1.32
by Marius Kruger
* tests/__init__.run_bzr |
1444 |
self.assertEquals(retcode, result, |
1445 |
message='Unexpected return code') |
|
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
1446 |
return out, err |
1447 |
||
|
2830.2.5
by Martin Pool
Deprecated ``run_bzr_decode``; use the new ``output_encoding`` parameter to |
1448 |
def run_bzr(self, args, retcode=0, encoding=None, stdin=None, |
1449 |
working_dir=None, error_regexes=[], output_encoding=None): |
|
|
1119
by Martin Pool
doc |
1450 |
"""Invoke bzr, as if it were run from the command line. |
1451 |
||
|
2530.3.2
by Martin Pool
Refactoring run_bzr code into more of a common base. |
1452 |
The argument list should not include the bzr program name - the
|
1453 |
first argument is normally the bzr command. Arguments may be
|
|
1454 |
passed in three ways:
|
|
1455 |
||
1456 |
1- A list of strings, eg ["commit", "a"]. This is recommended
|
|
1457 |
when the command contains whitespace or metacharacters, or
|
|
1458 |
is built up at run time.
|
|
1459 |
||
1460 |
2- A single string, eg "add a". This is the most convenient
|
|
1461 |
for hardcoded commands.
|
|
1462 |
||
|
2530.3.4
by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr |
1463 |
This runs bzr through the interface that catches and reports
|
1464 |
errors, and with logging set to something approximating the
|
|
1465 |
default, so that error reporting can be checked.
|
|
1466 |
||
|
1119
by Martin Pool
doc |
1467 |
This should be the main method for tests that want to exercise the
|
1468 |
overall behavior of the bzr application (rather than a unit test
|
|
1469 |
or a functional test of the library.)
|
|
1470 |
||
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
1471 |
This sends the stdout/stderr results into the test's log,
|
1472 |
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. |
1473 |
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
1474 |
:keyword stdin: A string to be used as stdin for the command.
|
|
2399.1.17
by John Arbash Meinel
[merge] bzr.dev 2562 |
1475 |
:keyword retcode: The status code the command should return;
|
|
2530.3.2
by Martin Pool
Refactoring run_bzr code into more of a common base. |
1476 |
default 0.
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
1477 |
:keyword working_dir: The directory to run the command in
|
|
2399.1.17
by John Arbash Meinel
[merge] bzr.dev 2562 |
1478 |
:keyword error_regexes: A list of expected error messages. If
|
1479 |
specified they must be seen in the error output of the command.
|
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1480 |
"""
|
|
2830.2.5
by Martin Pool
Deprecated ``run_bzr_decode``; use the new ``output_encoding`` parameter to |
1481 |
out, err = self._run_bzr_autosplit( |
1482 |
args=args, |
|
|
2530.3.2
by Martin Pool
Refactoring run_bzr code into more of a common base. |
1483 |
retcode=retcode, |
|
2830.2.5
by Martin Pool
Deprecated ``run_bzr_decode``; use the new ``output_encoding`` parameter to |
1484 |
encoding=encoding, |
1485 |
stdin=stdin, |
|
1486 |
working_dir=working_dir, |
|
|
2530.3.2
by Martin Pool
Refactoring run_bzr code into more of a common base. |
1487 |
)
|
|
2292.1.27
by Marius Kruger
* tests/__init__.TestCase.run_bzr_captured |
1488 |
for regex in error_regexes: |
1489 |
self.assertContainsRe(err, regex) |
|
1490 |
return out, err |
|
1491 |
||
|
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. |
1492 |
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 |
1493 |
"""Run bzr, and check that stderr contains the supplied regexes |
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
1494 |
|
1495 |
:param error_regexes: Sequence of regular expressions which
|
|
|
1711.7.11
by John Arbash Meinel
Clean up the documentation for run_bzr_error on Martin's suggestion. |
1496 |
must each be found in the error output. The relative ordering
|
1497 |
is not enforced.
|
|
1498 |
:param args: command-line arguments for bzr
|
|
1499 |
:param kwargs: Keyword arguments which are interpreted by run_bzr
|
|
1500 |
This function changes the default value of retcode to be 3,
|
|
1501 |
since in most cases this is run when you expect bzr to fail.
|
|
|
2581.1.1
by Martin Pool
Merge more runbzr cleanups |
1502 |
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
1503 |
:return: (out, err) The actual output of running the command (in case
|
1504 |
you want to do more inspection)
|
|
1505 |
||
1506 |
Examples of use::
|
|
1507 |
||
|
1711.7.11
by John Arbash Meinel
Clean up the documentation for run_bzr_error on Martin's suggestion. |
1508 |
# Make sure that commit is failing because there is nothing to do
|
1509 |
self.run_bzr_error(['no changes to commit'],
|
|
|
2665.1.1
by Michael Hudson
make run_bzr stricter about the keyword arguments it takes. |
1510 |
['commit', '-m', 'my commit comment'])
|
|
1711.7.11
by John Arbash Meinel
Clean up the documentation for run_bzr_error on Martin's suggestion. |
1511 |
# Make sure --strict is handling an unknown file, rather than
|
1512 |
# giving us the 'nothing to do' error
|
|
1513 |
self.build_tree(['unknown'])
|
|
1514 |
self.run_bzr_error(['Commit refused because there are unknown files'],
|
|
|
2665.1.1
by Michael Hudson
make run_bzr stricter about the keyword arguments it takes. |
1515 |
['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 |
1516 |
"""
|
1517 |
kwargs.setdefault('retcode', 3) |
|
|
2552.2.3
by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests. |
1518 |
kwargs['error_regexes'] = error_regexes |
1519 |
out, err = self.run_bzr(*args, **kwargs) |
|
|
1711.2.71
by John Arbash Meinel
Default to retcode=3, and add a test for run_bzr_error |
1520 |
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. |
1521 |
|
|
1752.1.6
by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring |
1522 |
def run_bzr_subprocess(self, *args, **kwargs): |
1523 |
"""Run bzr in a subprocess for testing. |
|
1524 |
||
1525 |
This starts a new Python interpreter and runs bzr in there.
|
|
1526 |
This should only be used for tests that have a justifiable need for
|
|
1527 |
this isolation: e.g. they are testing startup time, or signal
|
|
1528 |
handling, or early startup code, etc. Subprocess code can't be
|
|
1529 |
profiled or debugged so easily.
|
|
|
1752.1.7
by Aaron Bentley
Stop using shlex in run_bzr_subprocess |
1530 |
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
1531 |
:keyword 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 |
1532 |
None is supplied, the status code is not checked.
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
1533 |
:keyword env_changes: A dictionary which lists changes to environment
|
|
1963.1.1
by John Arbash Meinel
run_bzr_subprocess() can take an env_changes parameter |
1534 |
variables. A value of None will unset the env variable.
|
1535 |
The values must be strings. The change will only occur in the
|
|
1536 |
child, so you don't need to fix the environment after running.
|
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
1537 |
:keyword universal_newlines: Convert CRLF => LF
|
1538 |
:keyword allow_plugins: By default the subprocess is run with
|
|
|
2067.2.1
by John Arbash Meinel
Change run_bzr_subprocess to default to supplying --no-plugins. |
1539 |
--no-plugins to ensure test reproducibility. Also, it is possible
|
|
2067.2.2
by John Arbash Meinel
Review comments from Robert |
1540 |
for system-wide plugins to create unexpected output on stderr,
|
1541 |
which can cause unnecessary test failures.
|
|
|
1752.1.6
by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring |
1542 |
"""
|
|
1963.1.2
by John Arbash Meinel
Cleanups suggested by Martin, add test that env_changes can remove an env variable |
1543 |
env_changes = kwargs.get('env_changes', {}) |
|
2027.5.1
by John Arbash Meinel
Add working_dir=XX to run_bzr_* functions, and clean up tests |
1544 |
working_dir = kwargs.get('working_dir', None) |
|
2067.2.1
by John Arbash Meinel
Change run_bzr_subprocess to default to supplying --no-plugins. |
1545 |
allow_plugins = kwargs.get('allow_plugins', False) |
|
2665.4.1
by Aaron Bentley
teach run_bzr_subprocess to accept either a list of strings or a string |
1546 |
if len(args) == 1: |
1547 |
if isinstance(args[0], list): |
|
1548 |
args = args[0] |
|
1549 |
elif isinstance(args[0], basestring): |
|
1550 |
args = list(shlex.split(args[0])) |
|
1551 |
else: |
|
|
3400.3.6
by Martin Pool
Remove code deprecated prior to 1.1 and its tests |
1552 |
raise ValueError("passing varargs to run_bzr_subprocess") |
|
2027.5.1
by John Arbash Meinel
Add working_dir=XX to run_bzr_* functions, and clean up tests |
1553 |
process = self.start_bzr_subprocess(args, env_changes=env_changes, |
|
2067.2.1
by John Arbash Meinel
Change run_bzr_subprocess to default to supplying --no-plugins. |
1554 |
working_dir=working_dir, |
1555 |
allow_plugins=allow_plugins) |
|
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
1556 |
# We distinguish between retcode=None and retcode not passed.
|
1557 |
supplied_retcode = kwargs.get('retcode', 0) |
|
1558 |
return self.finish_bzr_subprocess(process, retcode=supplied_retcode, |
|
1559 |
universal_newlines=kwargs.get('universal_newlines', False), |
|
1560 |
process_args=args) |
|
1561 |
||
|
1910.17.9
by Andrew Bennetts
Add skip_if_plan_to_signal flag to start_bzr_subprocess. |
1562 |
def start_bzr_subprocess(self, process_args, env_changes=None, |
|
2027.5.1
by John Arbash Meinel
Add working_dir=XX to run_bzr_* functions, and clean up tests |
1563 |
skip_if_plan_to_signal=False, |
|
2067.2.1
by John Arbash Meinel
Change run_bzr_subprocess to default to supplying --no-plugins. |
1564 |
working_dir=None, |
1565 |
allow_plugins=False): |
|
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
1566 |
"""Start bzr in a subprocess for testing. |
1567 |
||
1568 |
This starts a new Python interpreter and runs bzr in there.
|
|
1569 |
This should only be used for tests that have a justifiable need for
|
|
1570 |
this isolation: e.g. they are testing startup time, or signal
|
|
1571 |
handling, or early startup code, etc. Subprocess code can't be
|
|
1572 |
profiled or debugged so easily.
|
|
1573 |
||
1574 |
:param process_args: a list of arguments to pass to the bzr executable,
|
|
|
2399.1.7
by John Arbash Meinel
Cleanup bzrlib/benchmarks/* so that everything at least has a valid doc string. |
1575 |
for example ``['--version']``.
|
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
1576 |
:param env_changes: A dictionary which lists changes to environment
|
1577 |
variables. A value of None will unset the env variable.
|
|
1578 |
The values must be strings. The change will only occur in the
|
|
1579 |
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. |
1580 |
:param skip_if_plan_to_signal: raise TestSkipped when true and os.kill
|
1581 |
is not available.
|
|
|
2067.2.1
by John Arbash Meinel
Change run_bzr_subprocess to default to supplying --no-plugins. |
1582 |
:param allow_plugins: If False (default) pass --no-plugins to bzr.
|
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
1583 |
|
1584 |
:returns: Popen object for the started process.
|
|
1585 |
"""
|
|
|
1910.17.9
by Andrew Bennetts
Add skip_if_plan_to_signal flag to start_bzr_subprocess. |
1586 |
if skip_if_plan_to_signal: |
1587 |
if not getattr(os, 'kill', None): |
|
1588 |
raise TestSkipped("os.kill not available.") |
|
1589 |
||
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
1590 |
if env_changes is None: |
1591 |
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 |
1592 |
old_env = {} |
1593 |
||
|
1963.1.2
by John Arbash Meinel
Cleanups suggested by Martin, add test that env_changes can remove an env variable |
1594 |
def cleanup_environment(): |
1595 |
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 |
1596 |
old_env[env_var] = osutils.set_or_unset_env(env_var, value) |
1597 |
||
1598 |
def restore_environment(): |
|
1599 |
for env_var, value in old_env.iteritems(): |
|
1600 |
osutils.set_or_unset_env(env_var, value) |
|
|
1963.1.1
by John Arbash Meinel
run_bzr_subprocess() can take an env_changes parameter |
1601 |
|
|
2018.1.1
by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths). |
1602 |
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 |
1603 |
|
|
2027.5.1
by John Arbash Meinel
Add working_dir=XX to run_bzr_* functions, and clean up tests |
1604 |
cwd = None |
1605 |
if working_dir is not None: |
|
1606 |
cwd = osutils.getcwd() |
|
1607 |
os.chdir(working_dir) |
|
1608 |
||
|
1963.1.7
by John Arbash Meinel
Switch to directly setting the env, and cleaning it up. So that it works on all platforms |
1609 |
try: |
1610 |
# win32 subprocess doesn't support preexec_fn
|
|
1611 |
# so we will avoid using it on all platforms, just to
|
|
1612 |
# make sure the code path is used, and we don't break on win32
|
|
1613 |
cleanup_environment() |
|
|
3616.2.1
by Mark Hammond
Fix how blackbox tests start bzr from frozen executables. |
1614 |
command = [sys.executable] |
1615 |
# frozen executables don't need the path to bzr
|
|
|
3616.2.7
by Mark Hammond
prefer getattr() over hasattr() |
1616 |
if getattr(sys, "frozen", None) is None: |
|
3616.2.1
by Mark Hammond
Fix how blackbox tests start bzr from frozen executables. |
1617 |
command.append(bzr_path) |
|
2067.2.1
by John Arbash Meinel
Change run_bzr_subprocess to default to supplying --no-plugins. |
1618 |
if not allow_plugins: |
1619 |
command.append('--no-plugins') |
|
1620 |
command.extend(process_args) |
|
1621 |
process = self._popen(command, 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 |
1622 |
finally: |
1623 |
restore_environment() |
|
|
2027.5.1
by John Arbash Meinel
Add working_dir=XX to run_bzr_* functions, and clean up tests |
1624 |
if cwd is not None: |
1625 |
os.chdir(cwd) |
|
1626 |
||
|
1910.17.2
by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue |
1627 |
return process |
1628 |
||
|
2067.2.1
by John Arbash Meinel
Change run_bzr_subprocess to default to supplying --no-plugins. |
1629 |
def _popen(self, *args, **kwargs): |
1630 |
"""Place a call to Popen. |
|
|
2067.2.2
by John Arbash Meinel
Review comments from Robert |
1631 |
|
1632 |
Allows tests to override this method to intercept the calls made to
|
|
1633 |
Popen for introspection.
|
|
|
2067.2.1
by John Arbash Meinel
Change run_bzr_subprocess to default to supplying --no-plugins. |
1634 |
"""
|
1635 |
return Popen(*args, **kwargs) |
|
1636 |
||
|
2018.1.1
by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths). |
1637 |
def get_bzr_path(self): |
|
2018.1.9
by Andrew Bennetts
Implement ParamikoVendor.connect_ssh |
1638 |
"""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). |
1639 |
bzr_path = os.path.dirname(os.path.dirname(bzrlib.__file__))+'/bzr' |
1640 |
if not os.path.isfile(bzr_path): |
|
1641 |
# We are probably installed. Assume sys.argv is the right file
|
|
1642 |
bzr_path = sys.argv[0] |
|
1643 |
return bzr_path |
|
1644 |
||
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
1645 |
def finish_bzr_subprocess(self, process, retcode=0, send_signal=None, |
1646 |
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 |
1647 |
"""Finish the execution of process. |
1648 |
||
1649 |
: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. |
1650 |
:param retcode: The status code that is expected. Defaults to 0. If
|
1651 |
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 |
1652 |
: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. |
1653 |
: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 |
1654 |
:returns: (stdout, stderr)
|
1655 |
"""
|
|
1656 |
if send_signal is not None: |
|
1657 |
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. |
1658 |
out, err = process.communicate() |
1659 |
||
1660 |
if universal_newlines: |
|
1661 |
out = out.replace('\r\n', '\n') |
|
1662 |
err = err.replace('\r\n', '\n') |
|
1663 |
||
1664 |
if retcode is not None and retcode != process.returncode: |
|
1665 |
if process_args is None: |
|
1666 |
process_args = "(unknown args)" |
|
1667 |
mutter('Output of bzr %s:\n%s', process_args, out) |
|
1668 |
mutter('Error for bzr %s:\n%s', process_args, err) |
|
1669 |
self.fail('Command bzr %s failed with retcode %s != %s' |
|
1670 |
% (process_args, retcode, process.returncode)) |
|
1671 |
return [out, err] |
|
|
1910.17.2
by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue |
1672 |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1673 |
def check_inventory_shape(self, inv, shape): |
|
1291
by Martin Pool
- add test for moving files between directories |
1674 |
"""Compare an inventory to a list of expected names. |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1675 |
|
1676 |
Fail if they are not precisely equal.
|
|
1677 |
"""
|
|
1678 |
extras = [] |
|
1679 |
shape = list(shape) # copy |
|
1680 |
for path, ie in inv.entries(): |
|
1681 |
name = path.replace('\\', '/') |
|
|
2545.3.1
by James Westby
Fix detection of directory entries in the inventory. |
1682 |
if ie.kind == 'directory': |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1683 |
name = name + '/' |
1684 |
if name in shape: |
|
1685 |
shape.remove(name) |
|
1686 |
else: |
|
1687 |
extras.append(name) |
|
1688 |
if shape: |
|
1689 |
self.fail("expected paths not found in inventory: %r" % shape) |
|
1690 |
if extras: |
|
1691 |
self.fail("unexpected paths found in inventory: %r" % extras) |
|
1692 |
||
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
1693 |
def apply_redirected(self, stdin=None, stdout=None, stderr=None, |
1694 |
a_callable=None, *args, **kwargs): |
|
1695 |
"""Call callable with redirected std io pipes. |
|
1696 |
||
1697 |
Returns the return code."""
|
|
1698 |
if not callable(a_callable): |
|
1699 |
raise ValueError("a_callable must be callable.") |
|
1700 |
if stdin is None: |
|
1701 |
stdin = StringIO("") |
|
1702 |
if stdout is None: |
|
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
1703 |
if getattr(self, "_log_file", None) is not None: |
|
974.1.70
by Aaron Bentley
Fixed selftest spewage (Brian M. Carlson) |
1704 |
stdout = self._log_file |
1705 |
else: |
|
1706 |
stdout = StringIO() |
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
1707 |
if stderr is None: |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
1708 |
if getattr(self, "_log_file", None is not None): |
|
974.1.70
by Aaron Bentley
Fixed selftest spewage (Brian M. Carlson) |
1709 |
stderr = self._log_file |
1710 |
else: |
|
1711 |
stderr = StringIO() |
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
1712 |
real_stdin = sys.stdin |
1713 |
real_stdout = sys.stdout |
|
1714 |
real_stderr = sys.stderr |
|
1715 |
try: |
|
1716 |
sys.stdout = stdout |
|
1717 |
sys.stderr = stderr |
|
1718 |
sys.stdin = stdin |
|
|
1160
by Martin Pool
- tiny refactoring |
1719 |
return a_callable(*args, **kwargs) |
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
1720 |
finally: |
1721 |
sys.stdout = real_stdout |
|
1722 |
sys.stderr = real_stderr |
|
1723 |
sys.stdin = real_stdin |
|
1724 |
||
|
2018.5.78
by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the |
1725 |
def reduceLockdirTimeout(self): |
1726 |
"""Reduce the default lock timeout for the duration of the test, so that |
|
1727 |
if LockContention occurs during a test, it does so quickly.
|
|
1728 |
||
1729 |
Tests that expect to provoke LockContention errors should call this.
|
|
1730 |
"""
|
|
1731 |
orig_timeout = bzrlib.lockdir._DEFAULT_TIMEOUT_SECONDS |
|
1732 |
def resetTimeout(): |
|
1733 |
bzrlib.lockdir._DEFAULT_TIMEOUT_SECONDS = orig_timeout |
|
1734 |
self.addCleanup(resetTimeout) |
|
1735 |
bzrlib.lockdir._DEFAULT_TIMEOUT_SECONDS = 0 |
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
1736 |
|
|
2717.1.1
by Lukáš Lalinsky
Use UTF-8 encoded StringIO for log tests to avoid failures on non-ASCII committer names. |
1737 |
def make_utf8_encoded_stringio(self, encoding_type=None): |
1738 |
"""Return a StringIOWrapper instance, that will encode Unicode |
|
1739 |
input to UTF-8.
|
|
1740 |
"""
|
|
1741 |
if encoding_type is None: |
|
1742 |
encoding_type = 'strict' |
|
1743 |
sio = StringIO() |
|
1744 |
output_encoding = 'utf-8' |
|
1745 |
sio = codecs.getwriter(output_encoding)(sio, errors=encoding_type) |
|
1746 |
sio.encoding = output_encoding |
|
1747 |
return sio |
|
1748 |
||
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
1749 |
|
1750 |
class TestCaseWithMemoryTransport(TestCase): |
|
1751 |
"""Common test class for tests that do not need disk resources. |
|
1752 |
||
1753 |
Tests that need disk resources should derive from TestCaseWithTransport.
|
|
1754 |
||
1755 |
TestCaseWithMemoryTransport sets the TEST_ROOT variable for all bzr tests.
|
|
1756 |
||
1757 |
For TestCaseWithMemoryTransport the test_home_dir is set to the name of
|
|
1758 |
a directory which does not exist. This serves to help ensure test isolation
|
|
1759 |
is preserved. test_dir is set to the TEST_ROOT, as is cwd, because they
|
|
1760 |
must exist. However, TestCaseWithMemoryTransport does not offer local
|
|
1761 |
file defaults for the transport in tests, nor does it obey the command line
|
|
1762 |
override, so tests that accidentally write to the common directory should
|
|
1763 |
be rare.
|
|
|
2485.6.6
by Martin Pool
Put test root directory (containing per-test directories) in TMPDIR |
1764 |
|
1765 |
:cvar TEST_ROOT: Directory containing all temporary directories, plus
|
|
1766 |
a .bzr directory that stops us ascending higher into the filesystem.
|
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1767 |
"""
|
1768 |
||
1769 |
TEST_ROOT = None |
|
1770 |
_TEST_NAME = 'test' |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
1771 |
|
|
1986.2.5
by Robert Collins
Unbreak transport tests. |
1772 |
def __init__(self, methodName='runTest'): |
|
3128.1.3
by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/. |
1773 |
# allow test parameterization after test construction and before test
|
1774 |
# execution. Variables that the parameterizer sets need to be
|
|
|
1986.2.5
by Robert Collins
Unbreak transport tests. |
1775 |
# ones that are not set by setUp, or setUp will trash them.
|
1776 |
super(TestCaseWithMemoryTransport, self).__init__(methodName) |
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
1777 |
self.vfs_transport_factory = default_transport |
1778 |
self.transport_server = None |
|
|
1986.2.5
by Robert Collins
Unbreak transport tests. |
1779 |
self.transport_readonly_server = None |
|
2018.5.44
by Andrew Bennetts
Small changes to help a couple more tests pass. |
1780 |
self.__vfs_server = None |
|
1986.2.5
by Robert Collins
Unbreak transport tests. |
1781 |
|
|
2520.3.1
by Vincent Ladeuil
Fix 110448 by adding a relpath parameter to get_transport. |
1782 |
def get_transport(self, relpath=None): |
1783 |
"""Return a writeable transport. |
|
1784 |
||
1785 |
This transport is for the test scratch space relative to
|
|
|
2592.2.5
by Jonathan Lange
Make UnicodeFilename feature less insane. Add a simple test for it too. |
1786 |
"self._test_root"
|
|
2520.3.1
by Vincent Ladeuil
Fix 110448 by adding a relpath parameter to get_transport. |
1787 |
|
1788 |
:param relpath: a path relative to the base url.
|
|
1789 |
"""
|
|
1790 |
t = get_transport(self.get_url(relpath)) |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
1791 |
self.assertFalse(t.is_readonly()) |
1792 |
return t |
|
1793 |
||
|
2520.3.1
by Vincent Ladeuil
Fix 110448 by adding a relpath parameter to get_transport. |
1794 |
def get_readonly_transport(self, relpath=None): |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
1795 |
"""Return a readonly transport for the test scratch space |
1796 |
|
|
1797 |
This can be used to test that operations which should only need
|
|
1798 |
readonly access in fact do not try to write.
|
|
|
2520.3.1
by Vincent Ladeuil
Fix 110448 by adding a relpath parameter to get_transport. |
1799 |
|
1800 |
:param relpath: a path relative to the base url.
|
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
1801 |
"""
|
|
2520.3.1
by Vincent Ladeuil
Fix 110448 by adding a relpath parameter to get_transport. |
1802 |
t = get_transport(self.get_readonly_url(relpath)) |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
1803 |
self.assertTrue(t.is_readonly()) |
1804 |
return t |
|
1805 |
||
|
2004.1.19
by v.ladeuil+lp at free
Test protocol version in http responses. |
1806 |
def create_transport_readonly_server(self): |
1807 |
"""Create a transport server from class defined at init. |
|
1808 |
||
|
2145.1.1
by mbp at sourcefrog
merge urllib keepalive etc |
1809 |
This is mostly a hook for daughter classes.
|
|
2004.1.19
by v.ladeuil+lp at free
Test protocol version in http responses. |
1810 |
"""
|
1811 |
return self.transport_readonly_server() |
|
1812 |
||
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
1813 |
def get_readonly_server(self): |
1814 |
"""Get the server instance for the readonly transport |
|
1815 |
||
1816 |
This is useful for some tests with specific servers to do diagnostics.
|
|
1817 |
"""
|
|
1818 |
if self.__readonly_server is None: |
|
1819 |
if self.transport_readonly_server is None: |
|
1820 |
# readonly decorator requested
|
|
1821 |
# bring up the server
|
|
1822 |
self.__readonly_server = ReadonlyServer() |
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
1823 |
self.__readonly_server.setUp(self.get_vfs_only_server()) |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
1824 |
else: |
|
2004.1.19
by v.ladeuil+lp at free
Test protocol version in http responses. |
1825 |
self.__readonly_server = self.create_transport_readonly_server() |
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
1826 |
self.__readonly_server.setUp(self.get_vfs_only_server()) |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
1827 |
self.addCleanup(self.__readonly_server.tearDown) |
1828 |
return self.__readonly_server |
|
1829 |
||
1830 |
def get_readonly_url(self, relpath=None): |
|
1831 |
"""Get a URL for the readonly transport. |
|
1832 |
||
1833 |
This will either be backed by '.' or a decorator to the transport
|
|
1834 |
used by self.get_url()
|
|
1835 |
relpath provides for clients to get a path relative to the base url.
|
|
1836 |
These should only be downwards relative, not upwards.
|
|
1837 |
"""
|
|
1838 |
base = self.get_readonly_server().get_url() |
|
|
2520.3.1
by Vincent Ladeuil
Fix 110448 by adding a relpath parameter to get_transport. |
1839 |
return self._adjust_url(base, relpath) |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
1840 |
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
1841 |
def get_vfs_only_server(self): |
|
2018.5.44
by Andrew Bennetts
Small changes to help a couple more tests pass. |
1842 |
"""Get the vfs only read/write server instance. |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
1843 |
|
1844 |
This is useful for some tests with specific servers that need
|
|
1845 |
diagnostics.
|
|
1846 |
||
1847 |
For TestCaseWithMemoryTransport this is always a MemoryServer, and there
|
|
1848 |
is no means to override it.
|
|
1849 |
"""
|
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
1850 |
if self.__vfs_server is None: |
1851 |
self.__vfs_server = MemoryServer() |
|
1852 |
self.__vfs_server.setUp() |
|
1853 |
self.addCleanup(self.__vfs_server.tearDown) |
|
1854 |
return self.__vfs_server |
|
1855 |
||
1856 |
def get_server(self): |
|
1857 |
"""Get the read/write server instance. |
|
1858 |
||
1859 |
This is useful for some tests with specific servers that need
|
|
1860 |
diagnostics.
|
|
1861 |
||
1862 |
This is built from the self.transport_server factory. If that is None,
|
|
1863 |
then the self.get_vfs_server is returned.
|
|
1864 |
"""
|
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
1865 |
if self.__server is None: |
|
2381.1.1
by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's. |
1866 |
if self.transport_server is None or self.transport_server is self.vfs_transport_factory: |
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
1867 |
return self.get_vfs_only_server() |
1868 |
else: |
|
1869 |
# bring up a decorated means of access to the vfs only server.
|
|
1870 |
self.__server = self.transport_server() |
|
|
2381.1.1
by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's. |
1871 |
try: |
1872 |
self.__server.setUp(self.get_vfs_only_server()) |
|
1873 |
except TypeError, e: |
|
1874 |
# This should never happen; the try:Except here is to assist
|
|
1875 |
# developers having to update code rather than seeing an
|
|
1876 |
# uninformative TypeError.
|
|
1877 |
raise Exception, "Old server API in use: %s, %s" % (self.__server, e) |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
1878 |
self.addCleanup(self.__server.tearDown) |
1879 |
return self.__server |
|
1880 |
||
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
1881 |
def _adjust_url(self, base, relpath): |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
1882 |
"""Get a URL (or maybe a path) for the readwrite transport. |
1883 |
||
1884 |
This will either be backed by '.' or to an equivalent non-file based
|
|
1885 |
facility.
|
|
1886 |
relpath provides for clients to get a path relative to the base url.
|
|
1887 |
These should only be downwards relative, not upwards.
|
|
1888 |
"""
|
|
1889 |
if relpath is not None and relpath != '.': |
|
1890 |
if not base.endswith('/'): |
|
1891 |
base = base + '/' |
|
1892 |
# XXX: Really base should be a url; we did after all call
|
|
1893 |
# get_url()! But sometimes it's just a path (from
|
|
1894 |
# LocalAbspathServer), and it'd be wrong to append urlescaped data
|
|
1895 |
# to a non-escaped local path.
|
|
1896 |
if base.startswith('./') or base.startswith('/'): |
|
1897 |
base += relpath |
|
1898 |
else: |
|
1899 |
base += urlutils.escape(relpath) |
|
1900 |
return base |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1901 |
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
1902 |
def get_url(self, relpath=None): |
1903 |
"""Get a URL (or maybe a path) for the readwrite transport. |
|
1904 |
||
1905 |
This will either be backed by '.' or to an equivalent non-file based
|
|
1906 |
facility.
|
|
1907 |
relpath provides for clients to get a path relative to the base url.
|
|
1908 |
These should only be downwards relative, not upwards.
|
|
1909 |
"""
|
|
1910 |
base = self.get_server().get_url() |
|
1911 |
return self._adjust_url(base, relpath) |
|
1912 |
||
1913 |
def get_vfs_only_url(self, relpath=None): |
|
1914 |
"""Get a URL (or maybe a path for the plain old vfs transport. |
|
1915 |
||
|
2018.18.9
by Martin Pool
remote Repository.tarball builds a temporary directory and tars that |
1916 |
This will never be a smart protocol. It always has all the
|
1917 |
capabilities of the local filesystem, but it might actually be a
|
|
1918 |
MemoryTransport or some other similar virtual filesystem.
|
|
1919 |
||
|
2399.1.16
by John Arbash Meinel
[merge] bzr.dev 2466 |
1920 |
This is the backing transport (if any) of the server returned by
|
|
2018.18.9
by Martin Pool
remote Repository.tarball builds a temporary directory and tars that |
1921 |
get_url and get_readonly_url.
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
1922 |
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
1923 |
:param relpath: provides for clients to get a path relative to the base
|
1924 |
url. These should only be downwards relative, not upwards.
|
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
1925 |
:return: A URL
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
1926 |
"""
|
1927 |
base = self.get_vfs_only_server().get_url() |
|
1928 |
return self._adjust_url(base, relpath) |
|
1929 |
||
|
2817.5.1
by Vincent Ladeuil
Catch leaking tests. |
1930 |
def _create_safety_net(self): |
1931 |
"""Make a fake bzr directory. |
|
1932 |
||
|
2875.1.1
by Vincent Ladeuil
Fix #147986 by monitoring a safety .bzr directory. |
1933 |
This prevents any tests propagating up onto the TEST_ROOT directory's
|
1934 |
real branch.
|
|
|
2817.5.1
by Vincent Ladeuil
Catch leaking tests. |
1935 |
"""
|
1936 |
root = TestCaseWithMemoryTransport.TEST_ROOT |
|
1937 |
bzrdir.BzrDir.create_standalone_workingtree(root) |
|
1938 |
||
1939 |
def _check_safety_net(self): |
|
1940 |
"""Check that the safety .bzr directory have not been touched. |
|
1941 |
||
1942 |
_make_test_root have created a .bzr directory to prevent tests from
|
|
1943 |
propagating. This method ensures than a test did not leaked.
|
|
1944 |
"""
|
|
1945 |
root = TestCaseWithMemoryTransport.TEST_ROOT |
|
1946 |
wt = workingtree.WorkingTree.open(root) |
|
1947 |
last_rev = wt.last_revision() |
|
1948 |
if last_rev != 'null:': |
|
1949 |
# The current test have modified the /bzr directory, we need to
|
|
1950 |
# recreate a new one or all the followng tests will fail.
|
|
1951 |
# If you need to inspect its content uncomment the following line
|
|
1952 |
# import pdb; pdb.set_trace()
|
|
1953 |
_rmtree_temp_dir(root + '/.bzr') |
|
1954 |
self._create_safety_net() |
|
1955 |
raise AssertionError('%s/.bzr should not be modified' % root) |
|
1956 |
||
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1957 |
def _make_test_root(self): |
|
2817.5.1
by Vincent Ladeuil
Catch leaking tests. |
1958 |
if TestCaseWithMemoryTransport.TEST_ROOT is None: |
|
2875.1.1
by Vincent Ladeuil
Fix #147986 by monitoring a safety .bzr directory. |
1959 |
root = osutils.mkdtemp(prefix='testbzr-', suffix='.tmp') |
|
2817.5.1
by Vincent Ladeuil
Catch leaking tests. |
1960 |
TestCaseWithMemoryTransport.TEST_ROOT = root |
1961 |
||
1962 |
self._create_safety_net() |
|
1963 |
||
1964 |
# The same directory is used by all tests, and we're not
|
|
1965 |
# specifically told when all tests are finished. This will do.
|
|
1966 |
atexit.register(_rmtree_temp_dir, root) |
|
1967 |
||
1968 |
self.addCleanup(self._check_safety_net) |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
1969 |
|
1970 |
def makeAndChdirToTestDir(self): |
|
1971 |
"""Create a temporary directories for this one test. |
|
1972 |
|
|
1973 |
This must set self.test_home_dir and self.test_dir and chdir to
|
|
1974 |
self.test_dir.
|
|
1975 |
|
|
1976 |
For TestCaseWithMemoryTransport we chdir to the TEST_ROOT for this test.
|
|
1977 |
"""
|
|
1978 |
os.chdir(TestCaseWithMemoryTransport.TEST_ROOT) |
|
1979 |
self.test_dir = TestCaseWithMemoryTransport.TEST_ROOT |
|
1980 |
self.test_home_dir = self.test_dir + "/MemoryTransportMissingHomeDir" |
|
1981 |
||
1982 |
def make_branch(self, relpath, format=None): |
|
1983 |
"""Create a branch on the transport at relpath.""" |
|
1984 |
repo = self.make_repository(relpath, format=format) |
|
1985 |
return repo.bzrdir.create_branch() |
|
1986 |
||
1987 |
def make_bzrdir(self, relpath, format=None): |
|
1988 |
try: |
|
1989 |
# might be a relative or absolute path
|
|
1990 |
maybe_a_url = self.get_url(relpath) |
|
1991 |
segments = maybe_a_url.rsplit('/', 1) |
|
1992 |
t = get_transport(maybe_a_url) |
|
1993 |
if len(segments) > 1 and segments[-1] not in ('', '.'): |
|
|
2475.3.3
by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base() |
1994 |
t.ensure_base() |
|
2230.3.22
by Aaron Bentley
Make test suite use format registry default, not BzrDir default |
1995 |
if format is None: |
1996 |
format = 'default' |
|
|
2204.4.11
by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests |
1997 |
if isinstance(format, basestring): |
1998 |
format = bzrdir.format_registry.make_bzrdir(format) |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
1999 |
return format.initialize_on_transport(t) |
2000 |
except errors.UninitializableFormat: |
|
2001 |
raise TestSkipped("Format %s is not initializable." % format) |
|
2002 |
||
2003 |
def make_repository(self, relpath, shared=False, format=None): |
|
|
2018.18.9
by Martin Pool
remote Repository.tarball builds a temporary directory and tars that |
2004 |
"""Create a repository on our default transport at relpath. |
2005 |
|
|
2006 |
Note that relpath must be a relative path, not a full url.
|
|
2007 |
"""
|
|
2008 |
# FIXME: If you create a remoterepository this returns the underlying
|
|
2009 |
# real format, which is incorrect. Actually we should make sure that
|
|
2010 |
# RemoteBzrDir returns a RemoteRepository.
|
|
2011 |
# maybe mbp 20070410
|
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2012 |
made_control = self.make_bzrdir(relpath, format=format) |
2013 |
return made_control.create_repository(shared=shared) |
|
2014 |
||
|
1986.4.9
by Robert Collins
``TestCase.make_branch_and_memory_tree`` now takes a format |
2015 |
def make_branch_and_memory_tree(self, relpath, format=None): |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2016 |
"""Create a branch on the default transport and a MemoryTree for it.""" |
|
1986.4.9
by Robert Collins
``TestCase.make_branch_and_memory_tree`` now takes a format |
2017 |
b = self.make_branch(relpath, format=format) |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2018 |
return memorytree.MemoryTree.create_on_branch(b) |
2019 |
||
|
3567.4.12
by John Arbash Meinel
Expose the branch building framework to the test suite. |
2020 |
def make_branch_builder(self, relpath, format=None): |
2021 |
url = self.get_url(relpath) |
|
2022 |
tran = get_transport(url) |
|
2023 |
return branchbuilder.BranchBuilder(get_transport(url), format=format) |
|
2024 |
||
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2025 |
def overrideEnvironmentForTesting(self): |
2026 |
os.environ['HOME'] = self.test_home_dir |
|
|
2309.2.6
by Alexander Belchenko
bzr now use Win32 API to determine Application Data location, and don't rely solely on $APPDATA |
2027 |
os.environ['BZR_HOME'] = self.test_home_dir |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2028 |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2029 |
def setUp(self): |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2030 |
super(TestCaseWithMemoryTransport, self).setUp() |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2031 |
self._make_test_root() |
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
2032 |
_currentdir = os.getcwdu() |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2033 |
def _leaveDirectory(): |
2034 |
os.chdir(_currentdir) |
|
2035 |
self.addCleanup(_leaveDirectory) |
|
2036 |
self.makeAndChdirToTestDir() |
|
2037 |
self.overrideEnvironmentForTesting() |
|
2038 |
self.__readonly_server = None |
|
2039 |
self.__server = None |
|
|
2381.1.3
by Robert Collins
Review feedback. |
2040 |
self.reduceLockdirTimeout() |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2041 |
|
2042 |
||
2043 |
class TestCaseInTempDir(TestCaseWithMemoryTransport): |
|
2044 |
"""Derived class that runs a test within a temporary directory. |
|
2045 |
||
2046 |
This is useful for tests that need to create a branch, etc.
|
|
2047 |
||
2048 |
The directory is created in a slightly complex way: for each
|
|
2049 |
Python invocation, a new temporary top-level directory is created.
|
|
2050 |
All test cases create their own directory within that. If the
|
|
2051 |
tests complete successfully, the directory is removed.
|
|
2052 |
||
|
2485.6.3
by Martin Pool
TestCaseInTempDir takes responsibility for cleaning up its own test dir |
2053 |
:ivar test_base_dir: The path of the top-level directory for this
|
2054 |
test, which contains a home directory and a work directory.
|
|
2055 |
||
2056 |
:ivar test_home_dir: An initially empty directory under test_base_dir
|
|
2057 |
which is used as $HOME for this test.
|
|
2058 |
||
2059 |
:ivar test_dir: A directory under test_base_dir used as the current
|
|
2060 |
directory when the test proper is run.
|
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2061 |
"""
|
2062 |
||
2063 |
OVERRIDE_PYTHON = 'python' |
|
2064 |
||
2065 |
def check_file_contents(self, filename, expect): |
|
2066 |
self.log("check contents of file %s" % filename) |
|
2067 |
contents = file(filename, 'r').read() |
|
2068 |
if contents != expect: |
|
2069 |
self.log("expected: %r" % expect) |
|
2070 |
self.log("actually: %r" % contents) |
|
2071 |
self.fail("contents of %s not as expected" % filename) |
|
2072 |
||
|
3549.2.4
by Martin Pool
Rename _getTestDirPrefix not to look like a test |
2073 |
def _getTestDirPrefix(self): |
|
3549.2.1
by Martin Pool
Use test names in the temporary directory name |
2074 |
# create a directory within the top level test directory
|
2075 |
if sys.platform == 'win32': |
|
2076 |
name_prefix = re.sub('[<>*=+",:;_/\\-]', '_', self.id()) |
|
2077 |
# windows is likely to have path-length limits so use a short name
|
|
2078 |
name_prefix = name_prefix[-30:] |
|
2079 |
else: |
|
2080 |
name_prefix = re.sub('[/]', '_', self.id()) |
|
2081 |
return name_prefix |
|
2082 |
||
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2083 |
def makeAndChdirToTestDir(self): |
2084 |
"""See TestCaseWithMemoryTransport.makeAndChdirToTestDir(). |
|
2085 |
|
|
2086 |
For TestCaseInTempDir we create a temporary directory based on the test
|
|
2087 |
name and then create two subdirs - test and home under it.
|
|
2088 |
"""
|
|
|
3613.3.5
by John Arbash Meinel
use the right notation for pathjoin. |
2089 |
name_prefix = osutils.pathjoin(self.TEST_ROOT, self._getTestDirPrefix()) |
|
3549.2.1
by Martin Pool
Use test names in the temporary directory name |
2090 |
name = name_prefix |
2091 |
for i in range(100): |
|
2092 |
if os.path.exists(name): |
|
2093 |
name = name_prefix + '_' + str(i) |
|
2094 |
else: |
|
2095 |
os.mkdir(name) |
|
2096 |
break
|
|
|
2485.6.1
by Martin Pool
Remove duplication in TestCaseInTempDir.makeAndChdirToTestDir |
2097 |
# now create test and home directories within this dir
|
|
3549.2.1
by Martin Pool
Use test names in the temporary directory name |
2098 |
self.test_base_dir = name |
|
2485.6.3
by Martin Pool
TestCaseInTempDir takes responsibility for cleaning up its own test dir |
2099 |
self.test_home_dir = self.test_base_dir + '/home' |
|
2485.6.1
by Martin Pool
Remove duplication in TestCaseInTempDir.makeAndChdirToTestDir |
2100 |
os.mkdir(self.test_home_dir) |
|
2485.6.3
by Martin Pool
TestCaseInTempDir takes responsibility for cleaning up its own test dir |
2101 |
self.test_dir = self.test_base_dir + '/work' |
|
2485.6.1
by Martin Pool
Remove duplication in TestCaseInTempDir.makeAndChdirToTestDir |
2102 |
os.mkdir(self.test_dir) |
2103 |
os.chdir(self.test_dir) |
|
2104 |
# put name of test inside
|
|
|
2485.6.3
by Martin Pool
TestCaseInTempDir takes responsibility for cleaning up its own test dir |
2105 |
f = file(self.test_base_dir + '/name', 'w') |
|
2485.6.1
by Martin Pool
Remove duplication in TestCaseInTempDir.makeAndChdirToTestDir |
2106 |
try: |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
2107 |
f.write(self.id()) |
|
2485.6.1
by Martin Pool
Remove duplication in TestCaseInTempDir.makeAndChdirToTestDir |
2108 |
finally: |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
2109 |
f.close() |
|
2485.6.3
by Martin Pool
TestCaseInTempDir takes responsibility for cleaning up its own test dir |
2110 |
self.addCleanup(self.deleteTestDir) |
2111 |
||
2112 |
def deleteTestDir(self): |
|
|
2564.1.1
by Martin Pool
Change out of the test directory before unlinking it, to avoid permission denied errors on Windows (gzlist) |
2113 |
os.chdir(self.TEST_ROOT) |
|
2485.6.3
by Martin Pool
TestCaseInTempDir takes responsibility for cleaning up its own test dir |
2114 |
_rmtree_temp_dir(self.test_base_dir) |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2115 |
|
|
2193.2.1
by Alexander Belchenko
selftest: build tree for test with binary line-endings by default |
2116 |
def build_tree(self, shape, line_endings='binary', transport=None): |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2117 |
"""Build a test tree according to a pattern. |
2118 |
||
2119 |
shape is a sequence of file specifications. If the final
|
|
2120 |
character is '/', a directory is created.
|
|
2121 |
||
|
1755.3.1
by Robert Collins
Tune the time to build our kernel_like tree : make LocalTransport.put faster, AtomicFile faster, LocalTransport.append faster. |
2122 |
This assumes that all the elements in the tree being built are new.
|
2123 |
||
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2124 |
This doesn't add anything to a branch.
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
2125 |
|
|
3034.4.8
by Alexander Belchenko
TestCaseInTempDir.build_tree now checks type of shape argument. |
2126 |
:type shape: list or tuple.
|
|
1185.38.7
by John Arbash Meinel
Updated build_tree to use fixed line-endings for tests which read the file contents and compare |
2127 |
:param line_endings: Either 'binary' or 'native'
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
2128 |
in binary mode, exact contents are written in native mode, the
|
2129 |
line endings match the default platform endings.
|
|
2130 |
:param transport: A transport to write to, for building trees on VFS's.
|
|
2131 |
If the transport is readonly or None, "." is opened automatically.
|
|
2132 |
:return: None
|
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2133 |
"""
|
|
3044.1.1
by Martin Pool
Fix up calls to TestCase.build_tree passing a string rather than a list |
2134 |
if type(shape) not in (list, tuple): |
2135 |
raise AssertionError("Parameter 'shape' should be " |
|
2136 |
"a list or a tuple. Got %r instead" % (shape,)) |
|
|
1755.3.1
by Robert Collins
Tune the time to build our kernel_like tree : make LocalTransport.put faster, AtomicFile faster, LocalTransport.append faster. |
2137 |
# It's OK to just create them using forward slashes on windows.
|
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
2138 |
if transport is None or transport.is_readonly(): |
|
1553.5.9
by Martin Pool
Add TestCaseWithTransport.get_transport and get_readonly_transport |
2139 |
transport = get_transport(".") |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2140 |
for name in shape: |
|
1185.16.145
by Martin Pool
Remove all assert statements from test cases. |
2141 |
self.assert_(isinstance(name, basestring)) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2142 |
if name[-1] == '/': |
|
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
2143 |
transport.mkdir(urlutils.escape(name[:-1])) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2144 |
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 |
2145 |
if line_endings == 'binary': |
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
2146 |
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 |
2147 |
elif line_endings == 'native': |
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
2148 |
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 |
2149 |
else: |
|
2227.2.2
by v.ladeuil+lp at free
Cleanup. |
2150 |
raise errors.BzrError( |
2151 |
'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 |
2152 |
content = "contents of %s%s" % (name.encode('utf-8'), end) |
|
1955.3.27
by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions |
2153 |
transport.put_bytes_non_atomic(urlutils.escape(name), content) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2154 |
|
|
1185.16.53
by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests |
2155 |
def build_tree_contents(self, shape): |
|
1514
by Robert Collins
Unbreak self.build_tree_shape in tests. |
2156 |
build_tree_contents(shape) |
|
1185.16.53
by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests |
2157 |
|
|
2655.2.5
by Marius Kruger
* Improve BzrRemoveChangedFilesError message. |
2158 |
def assertInWorkingTree(self, path, root_path='.', tree=None): |
|
2292.1.1
by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file. |
2159 |
"""Assert whether path or paths are in the WorkingTree""" |
2160 |
if tree is None: |
|
2161 |
tree = workingtree.WorkingTree.open(root_path) |
|
2162 |
if not isinstance(path, basestring): |
|
2163 |
for p in path: |
|
|
3585.2.1
by Robert Collins
Create acceptance test for bug 150438. |
2164 |
self.assertInWorkingTree(p, tree=tree) |
|
2292.1.1
by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file. |
2165 |
else: |
2166 |
self.assertIsNot(tree.path2id(path), None, |
|
2167 |
path+' not in working tree.') |
|
2168 |
||
|
2655.2.5
by Marius Kruger
* Improve BzrRemoveChangedFilesError message. |
2169 |
def assertNotInWorkingTree(self, path, root_path='.', tree=None): |
|
2292.1.1
by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file. |
2170 |
"""Assert whether path or paths are not in the WorkingTree""" |
2171 |
if tree is None: |
|
2172 |
tree = workingtree.WorkingTree.open(root_path) |
|
2173 |
if not isinstance(path, basestring): |
|
2174 |
for p in path: |
|
2175 |
self.assertNotInWorkingTree(p,tree=tree) |
|
2176 |
else: |
|
2177 |
self.assertIs(tree.path2id(path), None, path+' in working tree.') |
|
|
2227.2.1
by v.ladeuil+lp at free
Small fixes to test suite in the hope that it will facilitate the |
2178 |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2179 |
|
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
2180 |
class TestCaseWithTransport(TestCaseInTempDir): |
2181 |
"""A test case that provides get_url and get_readonly_url facilities. |
|
2182 |
||
2183 |
These back onto two transport servers, one for readonly access and one for
|
|
2184 |
read write access.
|
|
2185 |
||
2186 |
If no explicit class is provided for readonly access, a
|
|
2187 |
ReadonlyTransportDecorator is used instead which allows the use of non disk
|
|
2188 |
based read write transports.
|
|
2189 |
||
2190 |
If an explicit class is provided for readonly access, that server and the
|
|
2191 |
readwrite one must both define get_url() as resolving to os.getcwd().
|
|
2192 |
"""
|
|
2193 |
||
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
2194 |
def get_vfs_only_server(self): |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2195 |
"""See TestCaseWithMemoryTransport. |
|
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. |
2196 |
|
2197 |
This is useful for some tests with specific servers that need
|
|
2198 |
diagnostics.
|
|
2199 |
"""
|
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
2200 |
if self.__vfs_server is None: |
2201 |
self.__vfs_server = self.vfs_transport_factory() |
|
2202 |
self.__vfs_server.setUp() |
|
2203 |
self.addCleanup(self.__vfs_server.tearDown) |
|
2204 |
return self.__vfs_server |
|
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
2205 |
|
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
2206 |
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. |
2207 |
"""Create a branch on the transport and a tree locally. |
2208 |
||
|
1910.7.17
by Andrew Bennetts
Various cosmetic changes. |
2209 |
If the transport is not a LocalTransport, the Tree can't be created on
|
|
2381.1.2
by Robert Collins
Fixup the test changes made for hpss to be clean and self contained. |
2210 |
the transport. In that case if the vfs_transport_factory is
|
2211 |
LocalURLServer the working tree is created in the local
|
|
|
2018.5.88
by Andrew Bennetts
Clarify make_branch_and_tree docstring a little. |
2212 |
directory backing the transport, and the returned tree's branch and
|
|
2381.1.2
by Robert Collins
Fixup the test changes made for hpss to be clean and self contained. |
2213 |
repository will also be accessed locally. Otherwise a lightweight
|
2214 |
checkout is created and returned.
|
|
|
1910.7.17
by Andrew Bennetts
Various cosmetic changes. |
2215 |
|
2216 |
:param format: The BzrDirFormat.
|
|
2217 |
:returns: the WorkingTree.
|
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
2218 |
"""
|
|
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. |
2219 |
# TODO: always use the local disk path for the working tree,
|
2220 |
# this obviously requires a format that supports branch references
|
|
2221 |
# so check for that by checking bzrdir.BzrDirFormat.get_default_format()
|
|
2222 |
# RBC 20060208
|
|
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
2223 |
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. |
2224 |
try: |
2225 |
return b.bzrdir.create_workingtree() |
|
2226 |
except errors.NotLocalUrl: |
|
|
1910.14.1
by Andrew Bennetts
Fix to make_branch_and_tree's behavior when used with an sftp transport. |
2227 |
# We can only make working trees locally at the moment. If the
|
|
2018.5.87
by Andrew Bennetts
Make make_branch_and_tree fall back to creating a local checkout if the transport doesn't support working trees, allowing several more Remote tests to pass. |
2228 |
# transport can't support them, then we keep the non-disk-backed
|
2229 |
# branch and create a local checkout.
|
|
|
2381.1.1
by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's. |
2230 |
if self.vfs_transport_factory is LocalURLServer: |
2231 |
# the branch is colocated on disk, we cannot create a checkout.
|
|
2232 |
# hopefully callers will expect this.
|
|
2233 |
local_controldir= bzrdir.BzrDir.open(self.get_vfs_only_url(relpath)) |
|
|
3489.2.1
by Andrew Bennetts
Fix make_branch_and_tree to return a tree whose .branch is always the right format. |
2234 |
wt = local_controldir.create_workingtree() |
|
3489.2.5
by Andrew Bennetts
Tweak suggested by John's review. |
2235 |
if wt.branch._format != b._format: |
|
3489.2.1
by Andrew Bennetts
Fix make_branch_and_tree to return a tree whose .branch is always the right format. |
2236 |
wt._branch = b |
2237 |
# Make sure that assigning to wt._branch fixes wt.branch,
|
|
2238 |
# in case the implementation details of workingtree objects
|
|
2239 |
# change.
|
|
2240 |
self.assertIs(b, wt.branch) |
|
2241 |
return wt |
|
|
2381.1.1
by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's. |
2242 |
else: |
2243 |
return b.create_checkout(relpath, lightweight=True) |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
2244 |
|
|
1553.5.68
by Martin Pool
Add new TestCaseWithTransport.assertIsDirectory() and tests |
2245 |
def assertIsDirectory(self, relpath, transport): |
2246 |
"""Assert that relpath within transport is a directory. |
|
2247 |
||
2248 |
This may not be possible on all transports; in that case it propagates
|
|
2249 |
a TransportNotPossible.
|
|
2250 |
"""
|
|
2251 |
try: |
|
2252 |
mode = transport.stat(relpath).st_mode |
|
2253 |
except errors.NoSuchFile: |
|
2254 |
self.fail("path %s is not a directory; no such file" |
|
2255 |
% (relpath)) |
|
2256 |
if not stat.S_ISDIR(mode): |
|
2257 |
self.fail("path %s is not a directory; has mode %#o" |
|
2258 |
% (relpath, mode)) |
|
2259 |
||
|
1852.13.18
by Robert Collins
Write top level acceptance test for dirstate. |
2260 |
def assertTreesEqual(self, left, right): |
2261 |
"""Check that left and right have the same content and properties.""" |
|
2262 |
# we use a tree delta to check for equality of the content, and we
|
|
2263 |
# manually check for equality of other things such as the parents list.
|
|
2264 |
self.assertEqual(left.get_parent_ids(), right.get_parent_ids()) |
|
2265 |
differences = left.changes_from(right) |
|
|
2255.2.3
by Robert Collins
Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point. |
2266 |
self.assertFalse(differences.has_changed(), |
2267 |
"Trees %r and %r are different: %r" % (left, right, differences)) |
|
|
1852.13.18
by Robert Collins
Write top level acceptance test for dirstate. |
2268 |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2269 |
def setUp(self): |
2270 |
super(TestCaseWithTransport, self).setUp() |
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
2271 |
self.__vfs_server = None |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2272 |
|
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
2273 |
|
|
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
2274 |
class ChrootedTestCase(TestCaseWithTransport): |
2275 |
"""A support class that provides readonly urls outside the local namespace. |
|
2276 |
||
2277 |
This is done by checking if self.transport_server is a MemoryServer. if it
|
|
2278 |
is then we are chrooted already, if it is not then an HttpServer is used
|
|
2279 |
for readonly urls.
|
|
2280 |
||
2281 |
TODO RBC 20060127: make this an option to TestCaseWithTransport so it can
|
|
2282 |
be used without needed to redo it when a different
|
|
2283 |
subclass is in use ?
|
|
2284 |
"""
|
|
2285 |
||
2286 |
def setUp(self): |
|
2287 |
super(ChrootedTestCase, self).setUp() |
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
2288 |
if not self.vfs_transport_factory == MemoryServer: |
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
2289 |
self.transport_readonly_server = HttpServer |
|
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
2290 |
|
2291 |
||
|
2921.6.9
by Robert Collins
* New helper function ``bzrlib.tests.condition_id_re`` which helps |
2292 |
def condition_id_re(pattern): |
2293 |
"""Create a condition filter which performs a re check on a test's id. |
|
2294 |
|
|
2295 |
:param pattern: A regular expression string.
|
|
2296 |
:return: A callable that returns True if the re matches.
|
|
2297 |
"""
|
|
2298 |
filter_re = re.compile(pattern) |
|
2299 |
def condition(test): |
|
2300 |
test_id = test.id() |
|
2301 |
return filter_re.search(test_id) |
|
2302 |
return condition |
|
2303 |
||
2304 |
||
|
2921.6.8
by Robert Collins
* New helper function ``bzrlib.tests.condition_isinstance`` which helps |
2305 |
def condition_isinstance(klass_or_klass_list): |
2306 |
"""Create a condition filter which returns isinstance(param, klass). |
|
2307 |
|
|
2308 |
:return: A callable which when called with one parameter obj return the
|
|
2309 |
result of isinstance(obj, klass_or_klass_list).
|
|
2310 |
"""
|
|
2311 |
def condition(obj): |
|
2312 |
return isinstance(obj, klass_or_klass_list) |
|
2313 |
return condition |
|
2314 |
||
2315 |
||
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2316 |
def condition_id_in_list(id_list): |
|
3193.1.2
by Vincent Ladeuil
Add condition_id_in_list and filter_suite_by_id_list capabilities. |
2317 |
"""Create a condition filter which verify that test's id in a list. |
2318 |
|
|
|
3302.8.4
by Vincent Ladeuil
Cosmetic changes. |
2319 |
:param id_list: A TestIdList object.
|
|
3193.1.2
by Vincent Ladeuil
Add condition_id_in_list and filter_suite_by_id_list capabilities. |
2320 |
:return: A callable that returns True if the test's id appears in the list.
|
2321 |
"""
|
|
2322 |
def condition(test): |
|
|
3302.8.3
by Vincent Ladeuil
Use better names for TestIdList methods. |
2323 |
return id_list.includes(test.id()) |
|
3193.1.2
by Vincent Ladeuil
Add condition_id_in_list and filter_suite_by_id_list capabilities. |
2324 |
return condition |
2325 |
||
2326 |
||
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2327 |
def condition_id_startswith(starts): |
|
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
2328 |
"""Create a condition filter verifying that test's id starts with a string. |
2329 |
|
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2330 |
:param starts: A list of string.
|
2331 |
:return: A callable that returns True if the test's id starts with one of
|
|
2332 |
the given strings.
|
|
|
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
2333 |
"""
|
2334 |
def condition(test): |
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2335 |
for start in starts: |
2336 |
if test.id().startswith(start): |
|
2337 |
return True |
|
2338 |
return False |
|
|
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
2339 |
return condition |
2340 |
||
2341 |
||
|
2921.6.9
by Robert Collins
* New helper function ``bzrlib.tests.condition_id_re`` which helps |
2342 |
def exclude_tests_by_condition(suite, condition): |
2343 |
"""Create a test suite which excludes some tests from suite. |
|
2344 |
||
2345 |
:param suite: The suite to get tests from.
|
|
2346 |
:param condition: A callable whose result evaluates True when called with a
|
|
2347 |
test case which should be excluded from the result.
|
|
2348 |
:return: A suite which contains the tests found in suite that fail
|
|
2349 |
condition.
|
|
2350 |
"""
|
|
2351 |
result = [] |
|
2352 |
for test in iter_suite_tests(suite): |
|
2353 |
if not condition(test): |
|
2354 |
result.append(test) |
|
2355 |
return TestUtil.TestSuite(result) |
|
2356 |
||
2357 |
||
|
2921.6.7
by Robert Collins
* New helper function ``bzrlib.tests.filter_suite_by_condition`` which |
2358 |
def filter_suite_by_condition(suite, condition): |
2359 |
"""Create a test suite by filtering another one. |
|
2360 |
|
|
2361 |
:param suite: The source suite.
|
|
2362 |
:param condition: A callable whose result evaluates True when called with a
|
|
|
2921.6.9
by Robert Collins
* New helper function ``bzrlib.tests.condition_id_re`` which helps |
2363 |
test case which should be included in the result.
|
|
2921.6.7
by Robert Collins
* New helper function ``bzrlib.tests.filter_suite_by_condition`` which |
2364 |
:return: A suite which contains the tests found in suite that pass
|
2365 |
condition.
|
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2366 |
"""
|
|
2921.6.7
by Robert Collins
* New helper function ``bzrlib.tests.filter_suite_by_condition`` which |
2367 |
result = [] |
2368 |
for test in iter_suite_tests(suite): |
|
2369 |
if condition(test): |
|
2370 |
result.append(test) |
|
2371 |
return TestUtil.TestSuite(result) |
|
2372 |
||
2373 |
||
|
3400.3.6
by Martin Pool
Remove code deprecated prior to 1.1 and its tests |
2374 |
def filter_suite_by_re(suite, pattern): |
|
2394.2.8
by Ian Clatworthy
incorporate feedback from jam |
2375 |
"""Create a test suite by filtering another one. |
2376 |
|
|
2377 |
:param suite: the source suite
|
|
2378 |
:param pattern: pattern that names must match
|
|
2379 |
:returns: the newly created suite
|
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2380 |
"""
|
|
2921.6.9
by Robert Collins
* New helper function ``bzrlib.tests.condition_id_re`` which helps |
2381 |
condition = condition_id_re(pattern) |
|
2921.6.7
by Robert Collins
* New helper function ``bzrlib.tests.filter_suite_by_condition`` which |
2382 |
result_suite = filter_suite_by_condition(suite, condition) |
|
2921.6.4
by Robert Collins
Move the filter implementation of sort_tests_by_re back to filter_tests_by_re. |
2383 |
return result_suite |
|
2394.2.8
by Ian Clatworthy
incorporate feedback from jam |
2384 |
|
2385 |
||
|
3193.1.2
by Vincent Ladeuil
Add condition_id_in_list and filter_suite_by_id_list capabilities. |
2386 |
def filter_suite_by_id_list(suite, test_id_list): |
2387 |
"""Create a test suite by filtering another one. |
|
2388 |
||
2389 |
:param suite: The source suite.
|
|
2390 |
:param test_id_list: A list of the test ids to keep as strings.
|
|
2391 |
:returns: the newly created suite
|
|
2392 |
"""
|
|
2393 |
condition = condition_id_in_list(test_id_list) |
|
2394 |
result_suite = filter_suite_by_condition(suite, condition) |
|
2395 |
return result_suite |
|
2396 |
||
2397 |
||
|
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
2398 |
def filter_suite_by_id_startswith(suite, start): |
2399 |
"""Create a test suite by filtering another one. |
|
2400 |
||
2401 |
:param suite: The source suite.
|
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2402 |
:param start: A list of string the test id must start with one of.
|
|
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
2403 |
:returns: the newly created suite
|
2404 |
"""
|
|
2405 |
condition = condition_id_startswith(start) |
|
2406 |
result_suite = filter_suite_by_condition(suite, condition) |
|
2407 |
return result_suite |
|
2408 |
||
2409 |
||
|
2921.6.2
by Robert Collins
* New helper method ``bzrlib.tests.exclude_tests_by_re`` which gives a new |
2410 |
def exclude_tests_by_re(suite, pattern): |
2411 |
"""Create a test suite which excludes some tests from suite. |
|
2412 |
||
2413 |
:param suite: The suite to get tests from.
|
|
2414 |
:param pattern: A regular expression string. Test ids that match this
|
|
2415 |
pattern will be excluded from the result.
|
|
2416 |
:return: A TestSuite that contains all the tests from suite without the
|
|
2417 |
tests that matched pattern. The order of tests is the same as it was in
|
|
2418 |
suite.
|
|
2419 |
"""
|
|
|
2921.6.9
by Robert Collins
* New helper function ``bzrlib.tests.condition_id_re`` which helps |
2420 |
return exclude_tests_by_condition(suite, condition_id_re(pattern)) |
|
2921.6.2
by Robert Collins
* New helper method ``bzrlib.tests.exclude_tests_by_re`` which gives a new |
2421 |
|
2422 |
||
|
2921.6.6
by Robert Collins
* The ``exclude_pattern`` and ``random_order`` parameters to the function |
2423 |
def preserve_input(something): |
2424 |
"""A helper for performing test suite transformation chains. |
|
2425 |
||
2426 |
:param something: Anything you want to preserve.
|
|
2427 |
:return: Something.
|
|
2428 |
"""
|
|
2429 |
return something |
|
2430 |
||
2431 |
||
|
3128.1.2
by Vincent Ladeuil
Tweak as per review feedback: s/randomise.*/randomize&/, 0.92 -> 1.0. |
2432 |
def randomize_suite(suite): |
|
2921.6.6
by Robert Collins
* The ``exclude_pattern`` and ``random_order`` parameters to the function |
2433 |
"""Return a new TestSuite with suite's tests in random order. |
2434 |
|
|
2435 |
The tests in the input suite are flattened into a single suite in order to
|
|
2436 |
accomplish this. Any nested TestSuites are removed to provide global
|
|
2437 |
randomness.
|
|
2438 |
"""
|
|
|
2921.6.3
by Robert Collins
* New helper method ``bzrlib.tests.randomise_suite`` which returns a |
2439 |
tests = list(iter_suite_tests(suite)) |
2440 |
random.shuffle(tests) |
|
2441 |
return TestUtil.TestSuite(tests) |
|
2442 |
||
2443 |
||
|
3350.5.1
by Robert Collins
* New helper function for splitting test suites ``split_suite_by_condition``. |
2444 |
def split_suite_by_condition(suite, condition): |
2445 |
"""Split a test suite into two by a condition. |
|
2446 |
|
|
2447 |
:param suite: The suite to split.
|
|
2448 |
:param condition: The condition to match on. Tests that match this
|
|
2449 |
condition are returned in the first test suite, ones that do not match
|
|
2450 |
are in the second suite.
|
|
2451 |
:return: A tuple of two test suites, where the first contains tests from
|
|
2452 |
suite matching the condition, and the second contains the remainder
|
|
2453 |
from suite. The order within each output suite is the same as it was in
|
|
2454 |
suite.
|
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2455 |
"""
|
|
3350.5.1
by Robert Collins
* New helper function for splitting test suites ``split_suite_by_condition``. |
2456 |
matched = [] |
2457 |
did_not_match = [] |
|
2458 |
for test in iter_suite_tests(suite): |
|
2459 |
if condition(test): |
|
2460 |
matched.append(test) |
|
2461 |
else: |
|
2462 |
did_not_match.append(test) |
|
2463 |
return TestUtil.TestSuite(matched), TestUtil.TestSuite(did_not_match) |
|
2464 |
||
2465 |
||
|
2921.6.1
by Robert Collins
* New helper method ``bzrlib.tests.split_suite_by_re`` which splits a test |
2466 |
def split_suite_by_re(suite, pattern): |
2467 |
"""Split a test suite into two by a regular expression. |
|
2468 |
|
|
2469 |
:param suite: The suite to split.
|
|
2470 |
:param pattern: A regular expression string. Test ids that match this
|
|
2471 |
pattern will be in the first test suite returned, and the others in the
|
|
2472 |
second test suite returned.
|
|
2473 |
:return: A tuple of two test suites, where the first contains tests from
|
|
2474 |
suite matching pattern, and the second contains the remainder from
|
|
2475 |
suite. The order within each output suite is the same as it was in
|
|
2476 |
suite.
|
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2477 |
"""
|
|
3350.5.1
by Robert Collins
* New helper function for splitting test suites ``split_suite_by_condition``. |
2478 |
return split_suite_by_condition(suite, condition_id_re(pattern)) |
|
2213.2.1
by Martin Pool
Add selftest --first flag |
2479 |
|
2480 |
||
|
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
2481 |
def run_suite(suite, name='test', verbose=False, pattern=".*", |
|
2485.6.6
by Martin Pool
Put test root directory (containing per-test directories) in TMPDIR |
2482 |
stop_on_failure=False, |
|
2213.2.1
by Martin Pool
Add selftest --first flag |
2483 |
transport=None, lsprof_timed=None, bench_history=None, |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
2484 |
matching_tests_first=None, |
|
2394.2.1
by Ian Clatworthy
--list and --exclude first cut |
2485 |
list_only=False, |
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
2486 |
random_seed=None, |
|
2418.4.1
by John Arbash Meinel
(Ian Clatworthy) Bugs #102679, #102686. Add --exclude and --randomize to 'bzr selftest' |
2487 |
exclude_pattern=None, |
|
3169.3.1
by Andrew Bennetts
Make --coverage a global option. |
2488 |
strict=False): |
|
2379.6.3
by Alexander Belchenko
Rework NUMBERED_DIRS usage to keep test_selftest.py passing the tests on win32 |
2489 |
TestCase._gather_lsprof_in_benchmarks = lsprof_timed |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
2490 |
if verbose: |
2491 |
verbosity = 2 |
|
2492 |
else: |
|
2493 |
verbosity = 1 |
|
2494 |
runner = TextTestRunner(stream=sys.stdout, |
|
2495 |
descriptions=0, |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
2496 |
verbosity=verbosity, |
|
2379.6.3
by Alexander Belchenko
Rework NUMBERED_DIRS usage to keep test_selftest.py passing the tests on win32 |
2497 |
bench_history=bench_history, |
|
2418.4.1
by John Arbash Meinel
(Ian Clatworthy) Bugs #102679, #102686. Add --exclude and --randomize to 'bzr selftest' |
2498 |
list_only=list_only, |
|
2379.6.3
by Alexander Belchenko
Rework NUMBERED_DIRS usage to keep test_selftest.py passing the tests on win32 |
2499 |
)
|
|
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
2500 |
runner.stop_on_failure=stop_on_failure |
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
2501 |
# Initialise the random number generator and display the seed used.
|
2502 |
# We convert the seed to a long to make it reuseable across invocations.
|
|
2503 |
random_order = False |
|
2504 |
if random_seed is not None: |
|
2505 |
random_order = True |
|
2506 |
if random_seed == "now": |
|
2507 |
random_seed = long(time.time()) |
|
2508 |
else: |
|
2509 |
# Convert the seed to a long if we can
|
|
2510 |
try: |
|
2511 |
random_seed = long(random_seed) |
|
2512 |
except: |
|
2513 |
pass
|
|
2514 |
runner.stream.writeln("Randomizing test order using seed %s\n" % |
|
2515 |
(random_seed)) |
|
2516 |
random.seed(random_seed) |
|
2517 |
# Customise the list of tests if requested
|
|
|
2921.6.5
by Robert Collins
* The ``exclude_pattern`` parameter to the ``bzrlib.tests.`` functions |
2518 |
if exclude_pattern is not None: |
|
2921.6.6
by Robert Collins
* The ``exclude_pattern`` and ``random_order`` parameters to the function |
2519 |
suite = exclude_tests_by_re(suite, exclude_pattern) |
2520 |
if random_order: |
|
|
3128.1.2
by Vincent Ladeuil
Tweak as per review feedback: s/randomise.*/randomize&/, 0.92 -> 1.0. |
2521 |
order_changer = randomize_suite |
|
2921.6.6
by Robert Collins
* The ``exclude_pattern`` and ``random_order`` parameters to the function |
2522 |
else: |
2523 |
order_changer = preserve_input |
|
|
2921.6.5
by Robert Collins
* The ``exclude_pattern`` parameter to the ``bzrlib.tests.`` functions |
2524 |
if pattern != '.*' or random_order: |
|
2213.2.1
by Martin Pool
Add selftest --first flag |
2525 |
if matching_tests_first: |
|
2921.6.11
by Robert Collins
Last typo. |
2526 |
suites = map(order_changer, split_suite_by_re(suite, pattern)) |
|
2921.6.6
by Robert Collins
* The ``exclude_pattern`` and ``random_order`` parameters to the function |
2527 |
suite = TestUtil.TestSuite(suites) |
|
2213.2.1
by Martin Pool
Add selftest --first flag |
2528 |
else: |
|
2921.6.6
by Robert Collins
* The ``exclude_pattern`` and ``random_order`` parameters to the function |
2529 |
suite = order_changer(filter_suite_by_re(suite, pattern)) |
|
3084.1.1
by Andrew Bennetts
Add a --coverage option to selftest. |
2530 |
|
|
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
2531 |
result = runner.run(suite) |
|
2658.3.4
by Daniel Watkins
'bzr selftest --strict' now fails if there are any unsupported features or tests that are known to fail. |
2532 |
|
2533 |
if strict: |
|
2534 |
return result.wasStrictlySuccessful() |
|
2535 |
||
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
2536 |
return result.wasSuccessful() |
2537 |
||
2538 |
||
|
3390.1.1
by Andrew Bennetts
Add --debugflags/-E option to selftest. |
2539 |
# Controlled by "bzr selftest -E=..." option
|
2540 |
selftest_debug_flags = set() |
|
2541 |
||
2542 |
||
|
1185.35.20
by Aaron Bentley
Only keep test failure directories if --keep-output is specified |
2543 |
def selftest(verbose=False, pattern=".*", stop_on_failure=True, |
|
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
2544 |
transport=None, |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
2545 |
test_suite_factory=None, |
|
1819.1.3
by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history |
2546 |
lsprof_timed=None, |
|
2213.2.1
by Martin Pool
Add selftest --first flag |
2547 |
bench_history=None, |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
2548 |
matching_tests_first=None, |
|
2394.2.1
by Ian Clatworthy
--list and --exclude first cut |
2549 |
list_only=False, |
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
2550 |
random_seed=None, |
|
2658.3.3
by Daniel Watkins
Added UI support for bzr selftest --strict. |
2551 |
exclude_pattern=None, |
2552 |
strict=False, |
|
|
3193.1.8
by Vincent Ladeuil
Add '--load-list' option to selftest. |
2553 |
load_list=None, |
|
3390.1.1
by Andrew Bennetts
Add --debugflags/-E option to selftest. |
2554 |
debug_flags=None, |
|
3302.11.2
by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite. |
2555 |
starting_with=None, |
|
2658.3.3
by Daniel Watkins
Added UI support for bzr selftest --strict. |
2556 |
):
|
|
1204
by Martin Pool
doc |
2557 |
"""Run the whole test suite under the enhanced runner""" |
|
1904.2.5
by Martin Pool
Fix format warning inside test suite and add test |
2558 |
# XXX: Very ugly way to do this...
|
2559 |
# Disable warning about old formats because we don't want it to disturb
|
|
2560 |
# any blackbox tests.
|
|
2561 |
from bzrlib import repository |
|
2562 |
repository._deprecation_warning_done = True |
|
2563 |
||
|
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. |
2564 |
global default_transport |
2565 |
if transport is None: |
|
2566 |
transport = default_transport |
|
2567 |
old_transport = default_transport |
|
2568 |
default_transport = transport |
|
|
3390.1.1
by Andrew Bennetts
Add --debugflags/-E option to selftest. |
2569 |
global selftest_debug_flags |
2570 |
old_debug_flags = selftest_debug_flags |
|
2571 |
if debug_flags is not None: |
|
2572 |
selftest_debug_flags = set(debug_flags) |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
2573 |
try: |
|
3193.1.8
by Vincent Ladeuil
Add '--load-list' option to selftest. |
2574 |
if load_list is None: |
2575 |
keep_only = None |
|
2576 |
else: |
|
2577 |
keep_only = load_test_id_list(load_list) |
|
|
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
2578 |
if test_suite_factory is None: |
|
3302.11.2
by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite. |
2579 |
suite = test_suite(keep_only, starting_with) |
|
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
2580 |
else: |
2581 |
suite = test_suite_factory() |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
2582 |
return run_suite(suite, 'testbzr', verbose=verbose, pattern=pattern, |
|
2485.6.6
by Martin Pool
Put test root directory (containing per-test directories) in TMPDIR |
2583 |
stop_on_failure=stop_on_failure, |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
2584 |
transport=transport, |
|
1819.1.3
by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history |
2585 |
lsprof_timed=lsprof_timed, |
|
2213.2.1
by Martin Pool
Add selftest --first flag |
2586 |
bench_history=bench_history, |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
2587 |
matching_tests_first=matching_tests_first, |
|
2394.2.1
by Ian Clatworthy
--list and --exclude first cut |
2588 |
list_only=list_only, |
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
2589 |
random_seed=random_seed, |
|
2658.3.3
by Daniel Watkins
Added UI support for bzr selftest --strict. |
2590 |
exclude_pattern=exclude_pattern, |
|
3169.3.1
by Andrew Bennetts
Make --coverage a global option. |
2591 |
strict=strict) |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
2592 |
finally: |
2593 |
default_transport = old_transport |
|
|
3390.1.1
by Andrew Bennetts
Add --debugflags/-E option to selftest. |
2594 |
selftest_debug_flags = old_debug_flags |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
2595 |
|
|
1092.1.17
by Robert Collins
remove TEST_CLASSES dead code and provide a bzrlib.test_suite() convenience method |
2596 |
|
|
3193.1.7
by Vincent Ladeuil
Load test id list from a text file. |
2597 |
def load_test_id_list(file_name): |
2598 |
"""Load a test id list from a text file. |
|
2599 |
||
2600 |
The format is one test id by line. No special care is taken to impose
|
|
2601 |
strict rules, these test ids are used to filter the test suite so a test id
|
|
2602 |
that do not match an existing test will do no harm. This allows user to add
|
|
2603 |
comments, leave blank lines, etc.
|
|
2604 |
"""
|
|
2605 |
test_list = [] |
|
2606 |
try: |
|
2607 |
ftest = open(file_name, 'rt') |
|
2608 |
except IOError, e: |
|
2609 |
if e.errno != errno.ENOENT: |
|
2610 |
raise
|
|
2611 |
else: |
|
2612 |
raise errors.NoSuchFile(file_name) |
|
2613 |
||
2614 |
for test_name in ftest.readlines(): |
|
2615 |
test_list.append(test_name.strip()) |
|
2616 |
ftest.close() |
|
2617 |
return test_list |
|
2618 |
||
|
3302.3.3
by Vincent Ladeuil
Fix PEP8 catched by Aaron. Update NEWS. |
2619 |
|
|
3302.3.1
by Vincent Ladeuil
Help identify duplicates IDs in test suite and missing tests in id |
2620 |
def suite_matches_id_list(test_suite, id_list): |
2621 |
"""Warns about tests not appearing or appearing more than once. |
|
2622 |
||
2623 |
:param test_suite: A TestSuite object.
|
|
2624 |
:param test_id_list: The list of test ids that should be found in
|
|
2625 |
test_suite.
|
|
2626 |
||
2627 |
:return: (absents, duplicates) absents is a list containing the test found
|
|
2628 |
in id_list but not in test_suite, duplicates is a list containing the
|
|
2629 |
test found multiple times in test_suite.
|
|
2630 |
||
2631 |
When using a prefined test id list, it may occurs that some tests do not
|
|
2632 |
exist anymore or that some tests use the same id. This function warns the
|
|
2633 |
tester about potential problems in his workflow (test lists are volatile)
|
|
2634 |
or in the test suite itself (using the same id for several tests does not
|
|
2635 |
help to localize defects).
|
|
2636 |
"""
|
|
2637 |
# Build a dict counting id occurrences
|
|
2638 |
tests = dict() |
|
2639 |
for test in iter_suite_tests(test_suite): |
|
2640 |
id = test.id() |
|
2641 |
tests[id] = tests.get(id, 0) + 1 |
|
2642 |
||
2643 |
not_found = [] |
|
2644 |
duplicates = [] |
|
2645 |
for id in id_list: |
|
2646 |
occurs = tests.get(id, 0) |
|
2647 |
if not occurs: |
|
2648 |
not_found.append(id) |
|
2649 |
elif occurs > 1: |
|
2650 |
duplicates.append(id) |
|
2651 |
||
2652 |
return not_found, duplicates |
|
2653 |
||
|
3193.1.7
by Vincent Ladeuil
Load test id list from a text file. |
2654 |
|
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2655 |
class TestIdList(object): |
2656 |
"""Test id list to filter a test suite. |
|
|
3193.1.3
by Vincent Ladeuil
Create a TestIdListFilter helper object to make testing easier. |
2657 |
|
2658 |
Relying on the assumption that test ids are built as:
|
|
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2659 |
<module>[.<class>.<method>][(<param>+)], <module> being in python dotted
|
2660 |
notation, this class offers methods to :
|
|
|
3193.1.4
by Vincent Ladeuil
Make TestTestIdListFilter aware that a test exists for a module or one of |
2661 |
- avoid building a test suite for modules not refered to in the test list,
|
|
3193.1.3
by Vincent Ladeuil
Create a TestIdListFilter helper object to make testing easier. |
2662 |
- keep only the tests listed from the module test suite.
|
2663 |
"""
|
|
2664 |
||
2665 |
def __init__(self, test_id_list): |
|
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2666 |
# When a test suite needs to be filtered against us we compare test ids
|
2667 |
# for equality, so a simple dict offers a quick and simple solution.
|
|
2668 |
self.tests = dict().fromkeys(test_id_list, True) |
|
2669 |
||
2670 |
# While unittest.TestCase have ids like:
|
|
2671 |
# <module>.<class>.<method>[(<param+)],
|
|
2672 |
# doctest.DocTestCase can have ids like:
|
|
2673 |
# <module>
|
|
2674 |
# <module>.<class>
|
|
2675 |
# <module>.<function>
|
|
2676 |
# <module>.<class>.<method>
|
|
2677 |
||
2678 |
# Since we can't predict a test class from its name only, we settle on
|
|
2679 |
# a simple constraint: a test id always begins with its module name.
|
|
2680 |
||
2681 |
modules = {} |
|
|
3193.1.3
by Vincent Ladeuil
Create a TestIdListFilter helper object to make testing easier. |
2682 |
for test_id in test_id_list: |
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2683 |
parts = test_id.split('.') |
2684 |
mod_name = parts.pop(0) |
|
2685 |
modules[mod_name] = True |
|
2686 |
for part in parts: |
|
2687 |
mod_name += '.' + part |
|
2688 |
modules[mod_name] = True |
|
2689 |
self.modules = modules |
|
|
3193.1.4
by Vincent Ladeuil
Make TestTestIdListFilter aware that a test exists for a module or one of |
2690 |
|
|
3302.8.3
by Vincent Ladeuil
Use better names for TestIdList methods. |
2691 |
def refers_to(self, module_name): |
|
3193.1.4
by Vincent Ladeuil
Make TestTestIdListFilter aware that a test exists for a module or one of |
2692 |
"""Is there tests for the module or one of its sub modules.""" |
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2693 |
return self.modules.has_key(module_name) |
2694 |
||
|
3302.8.3
by Vincent Ladeuil
Use better names for TestIdList methods. |
2695 |
def includes(self, test_id): |
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2696 |
return self.tests.has_key(test_id) |
|
3193.1.5
by Vincent Ladeuil
Add helper method to get only listed tests from a module test suite. |
2697 |
|
|
3193.1.3
by Vincent Ladeuil
Create a TestIdListFilter helper object to make testing easier. |
2698 |
|
|
3649.6.2
by Vincent Ladeuil
Replace aliases in selftest --starting-with option. |
2699 |
class TestPrefixAliasRegistry(registry.Registry): |
2700 |
"""A registry for test prefix aliases. |
|
2701 |
||
2702 |
This helps implement shorcuts for the --starting-with selftest
|
|
2703 |
option. Overriding existing prefixes is not allowed but not fatal (a
|
|
2704 |
warning will be emitted).
|
|
2705 |
"""
|
|
2706 |
||
2707 |
def register(self, key, obj, help=None, info=None, |
|
2708 |
override_existing=False): |
|
2709 |
"""See Registry.register. |
|
2710 |
||
2711 |
Trying to override an existing alias causes a warning to be emitted,
|
|
2712 |
not a fatal execption.
|
|
2713 |
"""
|
|
2714 |
try: |
|
2715 |
super(TestPrefixAliasRegistry, self).register( |
|
2716 |
key, obj, help=help, info=info, override_existing=False) |
|
2717 |
except KeyError: |
|
2718 |
actual = self.get(key) |
|
2719 |
note('Test prefix alias %s is already used for %s, ignoring %s' |
|
2720 |
% (key, actual, obj)) |
|
2721 |
||
2722 |
def resolve_alias(self, id_start): |
|
2723 |
"""Replace the alias by the prefix in the given string. |
|
2724 |
||
|
3649.6.3
by Vincent Ladeuil
Fixed typos as per John's review. |
2725 |
Using an unknown prefix is an error to help catching typos.
|
|
3649.6.2
by Vincent Ladeuil
Replace aliases in selftest --starting-with option. |
2726 |
"""
|
2727 |
parts = id_start.split('.') |
|
2728 |
try: |
|
2729 |
parts[0] = self.get(parts[0]) |
|
2730 |
except KeyError: |
|
2731 |
raise errors.BzrCommandError( |
|
2732 |
'%s is not a known test prefix alias' % parts[0]) |
|
2733 |
return '.'.join(parts) |
|
2734 |
||
2735 |
||
2736 |
test_prefix_alias_registry = TestPrefixAliasRegistry() |
|
|
3649.6.3
by Vincent Ladeuil
Fixed typos as per John's review. |
2737 |
"""Registry of test prefix aliases."""
|
|
3649.6.2
by Vincent Ladeuil
Replace aliases in selftest --starting-with option. |
2738 |
|
2739 |
||
2740 |
# This alias allows to detect typos ('bzrlin.') by making all valid test ids
|
|
2741 |
# appear prefixed ('bzrlib.' is "replaced" by 'bzrlib.').
|
|
2742 |
test_prefix_alias_registry.register('bzrlib', 'bzrlib') |
|
2743 |
||
2744 |
# Obvious higest levels prefixes, feel free to add your own via a plugin
|
|
2745 |
test_prefix_alias_registry.register('bd', 'bzrlib.doc') |
|
2746 |
test_prefix_alias_registry.register('bu', 'bzrlib.utils') |
|
2747 |
test_prefix_alias_registry.register('bt', 'bzrlib.tests') |
|
2748 |
test_prefix_alias_registry.register('bb', 'bzrlib.tests.blackbox') |
|
2749 |
test_prefix_alias_registry.register('bp', 'bzrlib.plugins') |
|
2750 |
||
2751 |
||
|
3302.11.2
by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite. |
2752 |
def test_suite(keep_only=None, starting_with=None): |
|
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
2753 |
"""Build and return TestSuite for the whole of bzrlib. |
|
3193.1.6
by Vincent Ladeuil
Filter the whole test suite. |
2754 |
|
2755 |
:param keep_only: A list of test ids limiting the suite returned.
|
|
2756 |
||
|
3302.11.2
by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite. |
2757 |
:param starting_with: An id limiting the suite returned to the tests
|
2758 |
starting with it.
|
|
2759 |
||
|
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
2760 |
This function can be replaced if you need to change the default test
|
2761 |
suite on a global basis, but it is not encouraged.
|
|
2762 |
"""
|
|
|
1740.6.1
by Martin Pool
Remove Scratch objects used by doctests |
2763 |
testmod_names = [ |
|
3302.9.5
by Vincent Ladeuil
bzrlib.doc switch from test_suite() to load_tests(). |
2764 |
'bzrlib.doc', |
|
3302.9.6
by Vincent Ladeuil
bzrlib.tests.blackbox switched from test_suite() to load_tests(). |
2765 |
'bzrlib.tests.blackbox', |
|
3302.9.7
by Vincent Ladeuil
bzrlib.tests.branch_implementations switched from test_suite() to load_tests(). |
2766 |
'bzrlib.tests.branch_implementations', |
|
3302.9.8
by Vincent Ladeuil
bzrlib.tests.bzrdir_implementations switched from test_suite() to load_tests(). |
2767 |
'bzrlib.tests.bzrdir_implementations', |
|
3302.9.9
by Vincent Ladeuil
bzrlib.tests.commands switched from test_suite() to load_tests(). |
2768 |
'bzrlib.tests.commands', |
|
3302.9.10
by Vincent Ladeuil
bzrlib.tests.interrepository_implementations switched from test_suite() |
2769 |
'bzrlib.tests.interrepository_implementations', |
|
3302.9.12
by Vincent Ladeuil
bzrlib.tests.intertree_implementations switched from test_suite() |
2770 |
'bzrlib.tests.intertree_implementations', |
|
3750.1.3
by Vincent Ladeuil
Cleanups. |
2771 |
'bzrlib.tests.inventory_implementations', |
|
3302.9.13
by Vincent Ladeuil
bzrlib.tests.per_lock switched from test_suite() to load_tests(). |
2772 |
'bzrlib.tests.per_lock', |
|
3689.1.1
by John Arbash Meinel
Rename repository_implementations tests into per_repository tests |
2773 |
'bzrlib.tests.per_repository', |
|
3750.1.3
by Vincent Ladeuil
Cleanups. |
2774 |
'bzrlib.tests.per_repository_reference', |
|
2474.1.57
by John Arbash Meinel
Move code around to refactor according to our pyrex extension design. |
2775 |
'bzrlib.tests.test__dirstate_helpers', |
|
3750.1.3
by Vincent Ladeuil
Cleanups. |
2776 |
'bzrlib.tests.test__walkdirs_win32', |
|
1518
by Robert Collins
Merge from mbp. |
2777 |
'bzrlib.tests.test_ancestry', |
|
1551.9.17
by Aaron Bentley
Annotate for working trees across all parents |
2778 |
'bzrlib.tests.test_annotate', |
|
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
2779 |
'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. |
2780 |
'bzrlib.tests.test_atomicfile', |
|
1518
by Robert Collins
Merge from mbp. |
2781 |
'bzrlib.tests.test_bad_files', |
|
2890.2.3
by Robert Collins
* New module ``bzrlib.bisect_multi`` with generic multiple-bisection-at-once |
2782 |
'bzrlib.tests.test_bisect_multi', |
|
1518
by Robert Collins
Merge from mbp. |
2783 |
'bzrlib.tests.test_branch', |
|
2466.7.3
by Robert Collins
Create bzrlib.branchbuilder. |
2784 |
'bzrlib.tests.test_branchbuilder', |
|
3641.3.1
by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests. |
2785 |
'bzrlib.tests.test_btree_index', |
|
2376.4.4
by jml at canonical
Beginnings of generic bug-tracker plugin system. |
2786 |
'bzrlib.tests.test_bugtracker', |
|
1185.82.130
by Aaron Bentley
Rename changesets to revision bundles |
2787 |
'bzrlib.tests.test_bundle', |
|
1534.4.39
by Robert Collins
Basic BzrDir support. |
2788 |
'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 |
2789 |
'bzrlib.tests.test_cache_utf8', |
|
3641.3.1
by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests. |
2790 |
'bzrlib.tests.test_chunk_writer', |
|
2172.1.3
by Aaron Bentley
Rename test_commands in the test suite |
2791 |
'bzrlib.tests.test_commands', |
|
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
2792 |
'bzrlib.tests.test_commit', |
2793 |
'bzrlib.tests.test_commit_merge', |
|
2794 |
'bzrlib.tests.test_config', |
|
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
2795 |
'bzrlib.tests.test_conflicts', |
|
2475.4.1
by Martin Pool
Start adding CountedLock class to partially replace LockableFiles |
2796 |
'bzrlib.tests.test_counted_lock', |
|
1551.3.11
by Aaron Bentley
Merge from Robert |
2797 |
'bzrlib.tests.test_decorators', |
|
2225.1.1
by Aaron Bentley
Added revert change display, with tests |
2798 |
'bzrlib.tests.test_delta', |
|
2490.2.21
by Aaron Bentley
Rename graph to deprecated_graph |
2799 |
'bzrlib.tests.test_deprecated_graph', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
2800 |
'bzrlib.tests.test_diff', |
|
3750.1.3
by Vincent Ladeuil
Cleanups. |
2801 |
'bzrlib.tests.test_directory_service', |
|
1852.13.6
by Robert Collins
start hooking in the prototype dirstate serialiser. |
2802 |
'bzrlib.tests.test_dirstate', |
|
2625.6.1
by Adeodato Simó
New EmailMessage class, façade around email.Message and MIMEMultipart. |
2803 |
'bzrlib.tests.test_email_message', |
|
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
2804 |
'bzrlib.tests.test_errors', |
|
1731.2.16
by Aaron Bentley
Get extract working for standalone trees |
2805 |
'bzrlib.tests.test_extract', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
2806 |
'bzrlib.tests.test_fetch', |
|
1752.5.4
by Andrew Bennetts
Merge from bzr.dev. |
2807 |
'bzrlib.tests.test_ftp_transport', |
|
3830.4.5
by Jelmer Vernooij
add tests for VCS infrastructure classes. |
2808 |
'bzrlib.tests.test_foreign', |
|
2215.5.1
by Alexander Belchenko
Fix generation of rstx man page (problem with short names of options) and provide simple tests for future. |
2809 |
'bzrlib.tests.test_generate_docs', |
|
2116.4.1
by John Arbash Meinel
Update file and revision id generators. |
2810 |
'bzrlib.tests.test_generate_ids', |
|
2135.2.7
by Kent Gibson
Implement JAM's review suggestions. |
2811 |
'bzrlib.tests.test_globbing', |
|
1518
by Robert Collins
Merge from mbp. |
2812 |
'bzrlib.tests.test_gpg', |
2813 |
'bzrlib.tests.test_graph', |
|
2814 |
'bzrlib.tests.test_hashcache', |
|
|
2425.2.2
by Robert Collins
``bzr help`` now provides cross references to other help topics using the |
2815 |
'bzrlib.tests.test_help', |
|
2553.1.1
by Robert Collins
Give Hooks names. |
2816 |
'bzrlib.tests.test_hooks', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
2817 |
'bzrlib.tests.test_http', |
|
3111.1.6
by Vincent Ladeuil
Begin refactoring test_http.py into parameterized tests. |
2818 |
'bzrlib.tests.test_http_implementations', |
|
1786.1.8
by John Arbash Meinel
[merge] Johan Rydberg test updates |
2819 |
'bzrlib.tests.test_http_response', |
|
2298.5.1
by Alexander Belchenko
Bugfix #82086: Searching location of CA bundle for PyCurl in env variable (CURL_CA_BUNDLE), and on win32 along the PATH |
2820 |
'bzrlib.tests.test_https_ca_bundle', |
|
1518
by Robert Collins
Merge from mbp. |
2821 |
'bzrlib.tests.test_identitymap', |
|
1836.1.13
by John Arbash Meinel
Adding functions for getting user ignores. |
2822 |
'bzrlib.tests.test_ignores', |
|
2592.1.4
by Robert Collins
Create a GraphIndexBuilder. |
2823 |
'bzrlib.tests.test_index', |
|
2363.5.2
by Aaron Bentley
Implement layout description |
2824 |
'bzrlib.tests.test_info', |
|
1518
by Robert Collins
Merge from mbp. |
2825 |
'bzrlib.tests.test_inv', |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
2826 |
'bzrlib.tests.test_knit', |
|
1996.1.1
by John Arbash Meinel
Adding a ScopeReplacer class, which can replace itself on demand |
2827 |
'bzrlib.tests.test_lazy_import', |
|
2063.4.1
by John Arbash Meinel
bzrlib.lazy_regex.lazy_compile creates a proxy object around re.compile() |
2828 |
'bzrlib.tests.test_lazy_regex', |
|
3750.1.3
by Vincent Ladeuil
Cleanups. |
2829 |
'bzrlib.tests.test_lockable_files', |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
2830 |
'bzrlib.tests.test_lockdir', |
|
1518
by Robert Collins
Merge from mbp. |
2831 |
'bzrlib.tests.test_log', |
|
3750.1.3
by Vincent Ladeuil
Cleanups. |
2832 |
'bzrlib.tests.test_lru_cache', |
|
2493.2.3
by Ian Clatworthy
changes requested in jameinel's review incorporated |
2833 |
'bzrlib.tests.test_lsprof', |
|
2681.1.8
by Aaron Bentley
Add Thunderbird support to bzr send |
2834 |
'bzrlib.tests.test_mail_client', |
|
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
2835 |
'bzrlib.tests.test_memorytree', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
2836 |
'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 |
2837 |
'bzrlib.tests.test_merge3', |
|
1518
by Robert Collins
Merge from mbp. |
2838 |
'bzrlib.tests.test_merge_core', |
|
1551.12.2
by Aaron Bentley
Got directives round-tripping, with bundles and everything |
2839 |
'bzrlib.tests.test_merge_directive', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
2840 |
'bzrlib.tests.test_missing', |
|
1518
by Robert Collins
Merge from mbp. |
2841 |
'bzrlib.tests.test_msgeditor', |
|
2520.4.2
by Aaron Bentley
Integrate mpdiff into bazaar |
2842 |
'bzrlib.tests.test_multiparent', |
|
3335.1.1
by Jelmer Vernooij
Add tests for mutabletree hooks. |
2843 |
'bzrlib.tests.test_mutabletree', |
|
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
2844 |
'bzrlib.tests.test_nonascii', |
|
1518
by Robert Collins
Merge from mbp. |
2845 |
'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. |
2846 |
'bzrlib.tests.test_osutils', |
|
2192.1.2
by Alexander Belchenko
Tests for osutils.get_terminal_encoding() |
2847 |
'bzrlib.tests.test_osutils_encodings', |
|
2617.4.2
by Robert Collins
Add FileCollection support class. |
2848 |
'bzrlib.tests.test_pack', |
|
3582.3.1
by Martin Pool
Split pack repository tests into their own file and use scenarios |
2849 |
'bzrlib.tests.test_pack_repository', |
|
1558.15.6
by Aaron Bentley
Added more tests |
2850 |
'bzrlib.tests.test_patch', |
|
1185.82.9
by John Arbash Meinel
Moving patches testing into main test suite. |
2851 |
'bzrlib.tests.test_patches', |
|
1185.58.1
by John Arbash Meinel
Added new permissions test (currently don't pass) |
2852 |
'bzrlib.tests.test_permissions', |
|
1515
by Robert Collins
* Plugins with the same name in different directories in the bzr plugin |
2853 |
'bzrlib.tests.test_plugins', |
|
1551.2.27
by Aaron Bentley
Got propogation under test |
2854 |
'bzrlib.tests.test_progress', |
|
3302.9.22
by Vincent Ladeuil
bzrlib.tests.test_read_bundle use load_tests. |
2855 |
'bzrlib.tests.test_read_bundle', |
|
3750.1.3
by Vincent Ladeuil
Cleanups. |
2856 |
'bzrlib.tests.test_reconcile', |
|
2796.2.1
by Aaron Bentley
Begin work on reconfigure command |
2857 |
'bzrlib.tests.test_reconfigure', |
|
1911.4.3
by John Arbash Meinel
[merge] Adeodato Simó: change factory => registry |
2858 |
'bzrlib.tests.test_registry', |
|
1752.2.30
by Martin Pool
Start adding a RemoteBzrDir, etc |
2859 |
'bzrlib.tests.test_remote', |
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
2860 |
'bzrlib.tests.test_repository', |
|
1551.8.15
by Aaron Bentley
bug #54172: handle new directories properly in revert |
2861 |
'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 |
2862 |
'bzrlib.tests.test_revision', |
|
3298.2.7
by John Arbash Meinel
Rename test_revisionnamespaces => test_revisionspec |
2863 |
'bzrlib.tests.test_revisionspec', |
|
1773.2.1
by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids. |
2864 |
'bzrlib.tests.test_revisiontree', |
|
1185.47.1
by Martin Pool
[broken] start converting basic_io to more rfc822-like format |
2865 |
'bzrlib.tests.test_rio', |
|
3398.1.15
by Ian Clatworthy
search branch.rules and bazaar.rules for preferences |
2866 |
'bzrlib.tests.test_rules', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
2867 |
'bzrlib.tests.test_sampler', |
|
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
2868 |
'bzrlib.tests.test_selftest', |
|
1185.33.89
by Martin Pool
[patch] add a selftest test that the setup build script works (Alexander Belchenko) |
2869 |
'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. |
2870 |
'bzrlib.tests.test_sftp_transport', |
|
0.14.24
by Aaron Bentley
Merge with serialize-transform |
2871 |
'bzrlib.tests.test_shelf', |
|
0.16.89
by Aaron Bentley
Add tests for Shelver |
2872 |
'bzrlib.tests.test_shelf_ui', |
|
2018.6.1
by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS. |
2873 |
'bzrlib.tests.test_smart', |
|
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
2874 |
'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 |
2875 |
'bzrlib.tests.test_smart_transport', |
|
2535.2.1
by Adeodato Simó
New SMTPConnection class, a reduced version of that in bzr-email. |
2876 |
'bzrlib.tests.test_smtp_connection', |
|
1522
by Robert Collins
Test for the number of uses of self.working_tree() in branch.py |
2877 |
'bzrlib.tests.test_source', |
|
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
2878 |
'bzrlib.tests.test_ssh_transport', |
|
1551.6.19
by Aaron Bentley
Fix pending merge status on empty trees |
2879 |
'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 |
2880 |
'bzrlib.tests.test_store', |
|
2018.5.157
by Andrew Bennetts
Remove unnecessary trivial divergences from bzr.dev. |
2881 |
'bzrlib.tests.test_strace', |
|
1731.2.4
by Aaron Bentley
Ensure subsume works with Knit2 repos |
2882 |
'bzrlib.tests.test_subsume', |
|
2999.1.1
by Ian Clatworthy
migrate switch command into the core - was in BzrTools |
2883 |
'bzrlib.tests.test_switch', |
|
1534.2.1
by Robert Collins
Implement deprecated_method |
2884 |
'bzrlib.tests.test_symbol_versioning', |
|
2220.2.11
by mbp at sourcefrog
Get tag tests working again, stored in the Branch |
2885 |
'bzrlib.tests.test_tag', |
|
1518
by Robert Collins
Merge from mbp. |
2886 |
'bzrlib.tests.test_testament', |
|
1558.15.1
by Aaron Bentley
Add text_file function |
2887 |
'bzrlib.tests.test_textfile', |
|
1551.6.7
by Aaron Bentley
Implemented two-way merge, refactored weave merge |
2888 |
'bzrlib.tests.test_textmerge', |
|
1551.12.29
by Aaron Bentley
Copy and extend patch date formatting code, add patch-date parsing |
2889 |
'bzrlib.tests.test_timestamp', |
|
1518
by Robert Collins
Merge from mbp. |
2890 |
'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 |
2891 |
'bzrlib.tests.test_transactions', |
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
2892 |
'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 |
2893 |
'bzrlib.tests.test_transport', |
|
3302.9.21
by Vincent Ladeuil
bzrlib.tests.test_transport_implementations use load_tests. |
2894 |
'bzrlib.tests.test_transport_implementations', |
|
3675.1.1
by Martin Pool
Merge and update log+ transport decorator |
2895 |
'bzrlib.tests.test_transport_log', |
|
1852.8.2
by Robert Collins
Add InterTree class to represent InterTree operations. |
2896 |
'bzrlib.tests.test_tree', |
|
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
2897 |
'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 |
2898 |
'bzrlib.tests.test_tsort', |
|
1666.1.2
by Robert Collins
Fix race condition between end of stream and end of file with tuned_gzip. |
2899 |
'bzrlib.tests.test_tuned_gzip', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
2900 |
'bzrlib.tests.test_ui', |
|
3280.4.1
by John Arbash Meinel
Add uncommit --local. |
2901 |
'bzrlib.tests.test_uncommit', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
2902 |
'bzrlib.tests.test_upgrade', |
|
3602.2.2
by Martin Pool
Make tests for stacked upgrade scenario-based |
2903 |
'bzrlib.tests.test_upgrade_stacked', |
|
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
2904 |
'bzrlib.tests.test_urlutils', |
|
1819.1.8
by Martin Pool
Improved reporting of bzrlib revision_id |
2905 |
'bzrlib.tests.test_version', |
|
2022.1.1
by John Arbash Meinel
[merge] version-info plugin, and cleanup for layout in bzr |
2906 |
'bzrlib.tests.test_version_info', |
|
3750.1.3
by Vincent Ladeuil
Cleanups. |
2907 |
'bzrlib.tests.test_versionedfile', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
2908 |
'bzrlib.tests.test_weave', |
2909 |
'bzrlib.tests.test_whitebox', |
|
|
2617.5.1
by Kuno Meyer
Added direct unit tests for win32utils.glob_expand(). |
2910 |
'bzrlib.tests.test_win32utils', |
|
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
2911 |
'bzrlib.tests.test_workingtree', |
|
2255.2.121
by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file |
2912 |
'bzrlib.tests.test_workingtree_4', |
|
2018.4.1
by Andrew Bennetts
Add WSGI smart server. |
2913 |
'bzrlib.tests.test_wsgi', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
2914 |
'bzrlib.tests.test_xml', |
|
3302.9.15
by Vincent Ladeuil
bzrlib.tests.tree_implementations switched from test_suite() to |
2915 |
'bzrlib.tests.tree_implementations', |
|
3302.9.16
by Vincent Ladeuil
bzrlib.tests.workingtree_implementations switched from |
2916 |
'bzrlib.tests.workingtree_implementations', |
|
3750.1.3
by Vincent Ladeuil
Cleanups. |
2917 |
'bzrlib.util.tests.test_bencode', |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
2918 |
]
|
|
3302.9.23
by Vincent Ladeuil
Simplify test_suite(). |
2919 |
|
|
1707.2.2
by Robert Collins
Start on bench_add, an add benchtest. |
2920 |
loader = TestUtil.TestLoader() |
|
3193.1.6
by Vincent Ladeuil
Filter the whole test suite. |
2921 |
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2922 |
if starting_with: |
2923 |
starting_with = [test_prefix_alias_registry.resolve_alias(start) |
|
2924 |
for start in starting_with] |
|
|
3302.11.2
by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite. |
2925 |
# We take precedence over keep_only because *at loading time* using
|
2926 |
# both options means we will load less tests for the same final result.
|
|
|
3302.11.5
by Vincent Ladeuil
Fixed as per John's review. Also added a NEWS entry. |
2927 |
def interesting_module(name): |
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2928 |
for start in starting_with: |
2929 |
if ( |
|
2930 |
# Either the module name starts with the specified string
|
|
2931 |
name.startswith(start) |
|
2932 |
# or it may contain tests starting with the specified string
|
|
2933 |
or start.startswith(name) |
|
2934 |
):
|
|
2935 |
return True |
|
2936 |
return False |
|
|
3302.11.6
by Vincent Ladeuil
Fixed as per Martin and John reviews. Also fix a bug. |
2937 |
loader = TestUtil.FilteredByModuleTestLoader(interesting_module) |
|
3302.11.5
by Vincent Ladeuil
Fixed as per John's review. Also added a NEWS entry. |
2938 |
|
|
3302.11.2
by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite. |
2939 |
elif keep_only is not None: |
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2940 |
id_filter = TestIdList(keep_only) |
|
3302.8.12
by Vincent Ladeuil
Simplify tests.test_suite. |
2941 |
loader = TestUtil.FilteredByModuleTestLoader(id_filter.refers_to) |
|
3302.11.5
by Vincent Ladeuil
Fixed as per John's review. Also added a NEWS entry. |
2942 |
def interesting_module(name): |
2943 |
return id_filter.refers_to(name) |
|
2944 |
||
|
3302.11.2
by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite. |
2945 |
else: |
2946 |
loader = TestUtil.TestLoader() |
|
|
3302.11.5
by Vincent Ladeuil
Fixed as per John's review. Also added a NEWS entry. |
2947 |
def interesting_module(name): |
2948 |
# No filtering, all modules are interesting
|
|
2949 |
return True |
|
2950 |
||
|
3302.8.12
by Vincent Ladeuil
Simplify tests.test_suite. |
2951 |
suite = loader.suiteClass() |
|
3193.1.6
by Vincent Ladeuil
Filter the whole test suite. |
2952 |
|
2953 |
# modules building their suite with loadTestsFromModuleNames
|
|
|
3302.8.12
by Vincent Ladeuil
Simplify tests.test_suite. |
2954 |
suite.addTest(loader.loadTestsFromModuleNames(testmod_names)) |
|
3193.1.6
by Vincent Ladeuil
Filter the whole test suite. |
2955 |
|
|
3302.8.13
by Vincent Ladeuil
DocTests can now be filtered at module level too. |
2956 |
modules_to_doctest = [ |
2957 |
'bzrlib', |
|
|
3825.3.2
by Martin Pool
Correct example of branchbuilder and change to a doctest, and refactor |
2958 |
'bzrlib.branchbuilder', |
|
3302.8.13
by Vincent Ladeuil
DocTests can now be filtered at module level too. |
2959 |
'bzrlib.export', |
2960 |
'bzrlib.inventory', |
|
2961 |
'bzrlib.iterablefile', |
|
2962 |
'bzrlib.lockdir', |
|
2963 |
'bzrlib.merge3', |
|
2964 |
'bzrlib.option', |
|
|
3388.1.2
by Martin Pool
Add new symbol_versioning.deprecated_in |
2965 |
'bzrlib.symbol_versioning', |
|
3302.8.13
by Vincent Ladeuil
DocTests can now be filtered at module level too. |
2966 |
'bzrlib.tests', |
2967 |
'bzrlib.timestamp', |
|
2968 |
'bzrlib.version_info_formats.format_custom', |
|
2969 |
]
|
|
|
3302.8.12
by Vincent Ladeuil
Simplify tests.test_suite. |
2970 |
|
|
3302.8.13
by Vincent Ladeuil
DocTests can now be filtered at module level too. |
2971 |
for mod in modules_to_doctest: |
|
3302.11.2
by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite. |
2972 |
if not interesting_module(mod): |
|
3302.8.13
by Vincent Ladeuil
DocTests can now be filtered at module level too. |
2973 |
# No tests to keep here, move along
|
2974 |
continue
|
|
|
1996.3.5
by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again. |
2975 |
try: |
|
3825.3.4
by Martin Pool
Doc |
2976 |
# note that this really does mean "report only" -- doctest
|
2977 |
# still runs the rest of the examples
|
|
|
3825.3.3
by Martin Pool
Doctests now stop on the first failure |
2978 |
doc_suite = doctest.DocTestSuite(mod, |
|
3825.3.5
by Martin Pool
Fix tab damage |
2979 |
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE) |
|
1996.3.5
by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again. |
2980 |
except ValueError, e: |
|
3193.1.6
by Vincent Ladeuil
Filter the whole test suite. |
2981 |
print '**failed to get doctest for: %s\n%s' % (mod, e) |
|
1996.3.5
by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again. |
2982 |
raise
|
|
3825.3.1
by Martin Pool
selftest errors if modules said to have doctests don't have them |
2983 |
if len(doc_suite._tests) == 0: |
2984 |
raise errors.BzrError("no doctests found in %s" % (mod,)) |
|
|
3193.1.6
by Vincent Ladeuil
Filter the whole test suite. |
2985 |
suite.addTest(doc_suite) |
2986 |
||
|
2762.2.1
by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square |
2987 |
default_encoding = sys.getdefaultencoding() |
|
3221.4.1
by Martin Pool
Treat failure to load plugin test suites as a fatal error |
2988 |
for name, plugin in bzrlib.plugin.plugins().items(): |
|
3302.11.2
by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite. |
2989 |
if not interesting_module(plugin.module.__name__): |
2990 |
continue
|
|
|
3221.4.1
by Martin Pool
Treat failure to load plugin test suites as a fatal error |
2991 |
plugin_suite = plugin.test_suite() |
2992 |
# We used to catch ImportError here and turn it into just a warning,
|
|
2993 |
# but really if you don't have --no-plugins this should be a failure.
|
|
2994 |
# mbp 20080213 - see http://bugs.launchpad.net/bugs/189771
|
|
|
3302.8.12
by Vincent Ladeuil
Simplify tests.test_suite. |
2995 |
if plugin_suite is None: |
|
3302.8.21
by Vincent Ladeuil
Fixed as per Robert's review. |
2996 |
plugin_suite = plugin.load_plugin_tests(loader) |
|
3221.4.1
by Martin Pool
Treat failure to load plugin test suites as a fatal error |
2997 |
if plugin_suite is not None: |
2998 |
suite.addTest(plugin_suite) |
|
|
2762.2.1
by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square |
2999 |
if default_encoding != sys.getdefaultencoding(): |
3000 |
bzrlib.trace.warning( |
|
3001 |
'Plugin "%s" tried to reset default encoding to: %s', name, |
|
3002 |
sys.getdefaultencoding()) |
|
3003 |
reload(sys) |
|
3004 |
sys.setdefaultencoding(default_encoding) |
|
|
3302.3.1
by Vincent Ladeuil
Help identify duplicates IDs in test suite and missing tests in id |
3005 |
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
3006 |
if starting_with: |
|
3302.11.2
by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite. |
3007 |
suite = filter_suite_by_id_startswith(suite, starting_with) |
3008 |
||
|
3302.3.1
by Vincent Ladeuil
Help identify duplicates IDs in test suite and missing tests in id |
3009 |
if keep_only is not None: |
|
3302.8.12
by Vincent Ladeuil
Simplify tests.test_suite. |
3010 |
# Now that the referred modules have loaded their tests, keep only the
|
3011 |
# requested ones.
|
|
3012 |
suite = filter_suite_by_id_list(suite, id_filter) |
|
|
3302.3.1
by Vincent Ladeuil
Help identify duplicates IDs in test suite and missing tests in id |
3013 |
# Do some sanity checks on the id_list filtering
|
3014 |
not_found, duplicates = suite_matches_id_list(suite, keep_only) |
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
3015 |
if starting_with: |
|
3302.11.5
by Vincent Ladeuil
Fixed as per John's review. Also added a NEWS entry. |
3016 |
# The tester has used both keep_only and starting_with, so he is
|
3017 |
# already aware that some tests are excluded from the list, there
|
|
3018 |
# is no need to tell him which.
|
|
|
3302.11.2
by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite. |
3019 |
pass
|
3020 |
else: |
|
|
3302.11.5
by Vincent Ladeuil
Fixed as per John's review. Also added a NEWS entry. |
3021 |
# Some tests mentioned in the list are not in the test suite. The
|
3022 |
# list may be out of date, report to the tester.
|
|
|
3302.11.2
by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite. |
3023 |
for id in not_found: |
3024 |
bzrlib.trace.warning('"%s" not found in the test suite', id) |
|
|
3302.3.1
by Vincent Ladeuil
Help identify duplicates IDs in test suite and missing tests in id |
3025 |
for id in duplicates: |
3026 |
bzrlib.trace.warning('"%s" is used as an id by several tests', id) |
|
3027 |
||
|
1092.1.17
by Robert Collins
remove TEST_CLASSES dead code and provide a bzrlib.test_suite() convenience method |
3028 |
return suite |
|
764
by Martin Pool
- log messages from a particular test are printed if that test fails |
3029 |
|
|
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
3030 |
|
|
3302.8.16
by Vincent Ladeuil
Add an optional loader parameter needed when deploying the test |
3031 |
def multiply_tests_from_modules(module_name_list, scenario_iter, loader=None): |
|
2729.1.2
by Martin Pool
Add new multiply_tests_from_modules to give a simpler interface to test scenarios |
3032 |
"""Adapt all tests in some given modules to given scenarios. |
3033 |
||
3034 |
This is the recommended public interface for test parameterization.
|
|
3035 |
Typically the test_suite() method for a per-implementation test
|
|
3036 |
suite will call multiply_tests_from_modules and return the
|
|
3037 |
result.
|
|
3038 |
||
3039 |
:param module_name_list: List of fully-qualified names of test
|
|
3040 |
modules.
|
|
|
2729.1.3
by Martin Pool
TestScenarioAdapter must be a list, not an iter |
3041 |
:param scenario_iter: Iterable of pairs of (scenario_name,
|
|
2729.1.2
by Martin Pool
Add new multiply_tests_from_modules to give a simpler interface to test scenarios |
3042 |
scenario_param_dict).
|
|
3302.8.16
by Vincent Ladeuil
Add an optional loader parameter needed when deploying the test |
3043 |
:param loader: If provided, will be used instead of a new
|
3044 |
bzrlib.tests.TestLoader() instance.
|
|
|
2729.1.2
by Martin Pool
Add new multiply_tests_from_modules to give a simpler interface to test scenarios |
3045 |
|
3046 |
This returns a new TestSuite containing the cross product of
|
|
3047 |
all the tests in all the modules, each repeated for each scenario.
|
|
3048 |
Each test is adapted by adding the scenario name at the end
|
|
3049 |
of its name, and updating the test object's __dict__ with the
|
|
3050 |
scenario_param_dict.
|
|
3051 |
||
3052 |
>>> r = multiply_tests_from_modules(
|
|
3053 |
... ['bzrlib.tests.test_sampler'],
|
|
3054 |
... [('one', dict(param=1)),
|
|
3055 |
... ('two', dict(param=2))])
|
|
3056 |
>>> tests = list(iter_suite_tests(r))
|
|
3057 |
>>> len(tests)
|
|
3058 |
2
|
|
3059 |
>>> tests[0].id()
|
|
3060 |
'bzrlib.tests.test_sampler.DemoTest.test_nothing(one)'
|
|
3061 |
>>> tests[0].param
|
|
3062 |
1
|
|
3063 |
>>> tests[1].param
|
|
3064 |
2
|
|
3065 |
"""
|
|
|
3302.8.16
by Vincent Ladeuil
Add an optional loader parameter needed when deploying the test |
3066 |
# XXX: Isn't load_tests() a better way to provide the same functionality
|
3067 |
# without forcing a predefined TestScenarioApplier ? --vila 080215
|
|
3068 |
if loader is None: |
|
3069 |
loader = TestUtil.TestLoader() |
|
3070 |
||
3071 |
suite = loader.suiteClass() |
|
3072 |
||
|
2729.1.2
by Martin Pool
Add new multiply_tests_from_modules to give a simpler interface to test scenarios |
3073 |
adapter = TestScenarioApplier() |
|
2729.1.3
by Martin Pool
TestScenarioAdapter must be a list, not an iter |
3074 |
adapter.scenarios = list(scenario_iter) |
|
2729.1.2
by Martin Pool
Add new multiply_tests_from_modules to give a simpler interface to test scenarios |
3075 |
adapt_modules(module_name_list, adapter, loader, suite) |
3076 |
return suite |
|
3077 |
||
3078 |
||
|
2745.6.58
by Andrew Bennetts
Slightly neater test parameterisation in repository_implementations; extract a 'multiply_scenarios' function. |
3079 |
def multiply_scenarios(scenarios_left, scenarios_right): |
3080 |
"""Multiply two sets of scenarios. |
|
3081 |
||
3082 |
:returns: the cartesian product of the two sets of scenarios, that is
|
|
3083 |
a scenario for every possible combination of a left scenario and a
|
|
3084 |
right scenario.
|
|
3085 |
"""
|
|
3086 |
return [ |
|
3087 |
('%s,%s' % (left_name, right_name), |
|
3088 |
dict(left_dict.items() + right_dict.items())) |
|
3089 |
for left_name, left_dict in scenarios_left |
|
3090 |
for right_name, right_dict in scenarios_right] |
|
3091 |
||
3092 |
||
3093 |
||
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
3094 |
def adapt_modules(mods_list, adapter, loader, suite): |
3095 |
"""Adapt the modules in mods_list using adapter and add to suite.""" |
|
|
3221.10.1
by Robert Collins
Add add_inventory external reference interface tests and tweak broken test support function adapt_tests. |
3096 |
tests = loader.loadTestsFromModuleNames(mods_list) |
3097 |
adapt_tests(tests, adapter, suite) |
|
3098 |
||
3099 |
||
3100 |
def adapt_tests(tests_list, adapter, suite): |
|
3101 |
"""Adapt the tests in tests_list using adapter and add to suite.""" |
|
3102 |
for test in iter_suite_tests(tests_list): |
|
|
1707.2.2
by Robert Collins
Start on bench_add, an add benchtest. |
3103 |
suite.addTests(adapter.adapt(test)) |
|
2172.4.3
by Alexander Belchenko
Change name of option to '--clean-output' and provide tests |
3104 |
|
3105 |
||
|
2379.6.4
by Alexander Belchenko
Teach `bzr selftest --clean-output` to remove read-only files (win32-specific) |
3106 |
def _rmtree_temp_dir(dirname): |
|
2485.6.4
by Martin Pool
Move unicode handling code into _rmtree_temp_dir |
3107 |
# If LANG=C we probably have created some bogus paths
|
3108 |
# which rmtree(unicode) will fail to delete
|
|
3109 |
# so make sure we are using rmtree(str) to delete everything
|
|
3110 |
# except on win32, where rmtree(str) will fail
|
|
3111 |
# since it doesn't have the property of byte-stream paths
|
|
3112 |
# (they are either ascii or mbcs)
|
|
3113 |
if sys.platform == 'win32': |
|
3114 |
# make sure we are using the unicode win32 api
|
|
3115 |
dirname = unicode(dirname) |
|
3116 |
else: |
|
3117 |
dirname = dirname.encode(sys.getfilesystemencoding()) |
|
|
2379.6.4
by Alexander Belchenko
Teach `bzr selftest --clean-output` to remove read-only files (win32-specific) |
3118 |
try: |
3119 |
osutils.rmtree(dirname) |
|
3120 |
except OSError, e: |
|
3121 |
if sys.platform == 'win32' and e.errno == errno.EACCES: |
|
|
2911.6.1
by Blake Winton
Change 'print >> f,'s to 'f.write('s. |
3122 |
sys.stderr.write(('Permission denied: ' |
|
2379.6.4
by Alexander Belchenko
Teach `bzr selftest --clean-output` to remove read-only files (win32-specific) |
3123 |
'unable to remove testing dir '
|
|
2946.1.1
by Alexander Belchenko
trivial fix for string formatting in rmtree_temp_dir |
3124 |
'%s\n' % os.path.basename(dirname))) |
|
2379.6.4
by Alexander Belchenko
Teach `bzr selftest --clean-output` to remove read-only files (win32-specific) |
3125 |
else: |
3126 |
raise
|
|
3127 |
||
3128 |
||
|
2367.1.4
by Robert Collins
Add operating system Feature model to bzrlib.tests to allow writing tests |
3129 |
class Feature(object): |
3130 |
"""An operating system Feature.""" |
|
3131 |
||
3132 |
def __init__(self): |
|
3133 |
self._available = None |
|
3134 |
||
3135 |
def available(self): |
|
3136 |
"""Is the feature available? |
|
3137 |
||
3138 |
:return: True if the feature is available.
|
|
3139 |
"""
|
|
3140 |
if self._available is None: |
|
3141 |
self._available = self._probe() |
|
3142 |
return self._available |
|
3143 |
||
3144 |
def _probe(self): |
|
3145 |
"""Implement this method in concrete features. |
|
3146 |
||
3147 |
:return: True if the feature is available.
|
|
3148 |
"""
|
|
3149 |
raise NotImplementedError |
|
3150 |
||
3151 |
def __str__(self): |
|
3152 |
if getattr(self, 'feature_name', None): |
|
3153 |
return self.feature_name() |
|
3154 |
return self.__class__.__name__ |
|
|
2553.2.3
by Robert Collins
Split out the common test scenario support from the repository implementation specific code. |
3155 |
|
3156 |
||
|
2776.1.5
by Robert Collins
Add reasonably comprehensive tests for path last modified and per file graph behaviour. |
3157 |
class _SymlinkFeature(Feature): |
3158 |
||
3159 |
def _probe(self): |
|
3160 |
return osutils.has_symlinks() |
|
3161 |
||
3162 |
def feature_name(self): |
|
3163 |
return 'symlinks' |
|
3164 |
||
3165 |
SymlinkFeature = _SymlinkFeature() |
|
3166 |
||
3167 |
||
|
3136.1.1
by Aaron Bentley
Add support for hardlinks to TreeTransform |
3168 |
class _HardlinkFeature(Feature): |
3169 |
||
3170 |
def _probe(self): |
|
3171 |
return osutils.has_hardlinks() |
|
3172 |
||
3173 |
def feature_name(self): |
|
3174 |
return 'hardlinks' |
|
3175 |
||
3176 |
HardlinkFeature = _HardlinkFeature() |
|
3177 |
||
3178 |
||
|
2949.5.2
by Alexander Belchenko
John's review |
3179 |
class _OsFifoFeature(Feature): |
3180 |
||
3181 |
def _probe(self): |
|
3182 |
return getattr(os, 'mkfifo', None) |
|
3183 |
||
3184 |
def feature_name(self): |
|
3185 |
return 'filesystem fifos' |
|
3186 |
||
3187 |
OsFifoFeature = _OsFifoFeature() |
|
3188 |
||
3189 |
||
|
3477.1.2
by John Arbash Meinel
Rename UnicodeFilename => UnicodeFilenameFeature |
3190 |
class _UnicodeFilenameFeature(Feature): |
|
3477.1.1
by John Arbash Meinel
Move UnicodeFeature into a core 'tests' feature, rather than living in test_diff. |
3191 |
"""Does the filesystem support Unicode filenames?""" |
3192 |
||
3193 |
def _probe(self): |
|
3194 |
try: |
|
|
3526.2.1
by Martin von Gagern
Improved UnicodeFilenameFeature. |
3195 |
# Check for character combinations unlikely to be covered by any
|
3196 |
# single non-unicode encoding. We use the characters
|
|
3197 |
# - greek small letter alpha (U+03B1) and
|
|
3198 |
# - braille pattern dots-123456 (U+283F).
|
|
3199 |
os.stat(u'\u03b1\u283f') |
|
|
3477.1.1
by John Arbash Meinel
Move UnicodeFeature into a core 'tests' feature, rather than living in test_diff. |
3200 |
except UnicodeEncodeError: |
3201 |
return False |
|
3202 |
except (IOError, OSError): |
|
3203 |
# The filesystem allows the Unicode filename but the file doesn't
|
|
3204 |
# exist.
|
|
3205 |
return True |
|
3206 |
else: |
|
3207 |
# The filesystem allows the Unicode filename and the file exists,
|
|
3208 |
# for some reason.
|
|
3209 |
return True |
|
3210 |
||
|
3477.1.2
by John Arbash Meinel
Rename UnicodeFilename => UnicodeFilenameFeature |
3211 |
UnicodeFilenameFeature = _UnicodeFilenameFeature() |
|
3477.1.1
by John Arbash Meinel
Move UnicodeFeature into a core 'tests' feature, rather than living in test_diff. |
3212 |
|
3213 |
||
|
2553.2.3
by Robert Collins
Split out the common test scenario support from the repository implementation specific code. |
3214 |
class TestScenarioApplier(object): |
3215 |
"""A tool to apply scenarios to tests.""" |
|
3216 |
||
3217 |
def adapt(self, test): |
|
3218 |
"""Return a TestSuite containing a copy of test for each scenario.""" |
|
3219 |
result = unittest.TestSuite() |
|
3220 |
for scenario in self.scenarios: |
|
3221 |
result.addTest(self.adapt_test_to_scenario(test, scenario)) |
|
3222 |
return result |
|
3223 |
||
3224 |
def adapt_test_to_scenario(self, test, scenario): |
|
3225 |
"""Copy test and apply scenario to it. |
|
3226 |
||
3227 |
:param test: A test to adapt.
|
|
3228 |
:param scenario: A tuple describing the scenarion.
|
|
3229 |
The first element of the tuple is the new test id.
|
|
3230 |
The second element is a dict containing attributes to set on the
|
|
3231 |
test.
|
|
3232 |
:return: The adapted test.
|
|
3233 |
"""
|
|
3234 |
from copy import deepcopy |
|
3235 |
new_test = deepcopy(test) |
|
3236 |
for name, value in scenario[1].items(): |
|
3237 |
setattr(new_test, name, value) |
|
|
2553.3.1
by Robert Collins
Remove unneeded inner function in adapt_test_to_scenario. |
3238 |
new_id = "%s(%s)" % (new_test.id(), scenario[0]) |
3239 |
new_test.id = lambda: new_id |
|
|
2553.2.3
by Robert Collins
Split out the common test scenario support from the repository implementation specific code. |
3240 |
return new_test |
|
2785.1.5
by Alexander Belchenko
support for non-ascii BZR_HOME in show_version() |
3241 |
|
3242 |
||
3243 |
def probe_unicode_in_user_encoding(): |
|
3244 |
"""Try to encode several unicode strings to use in unicode-aware tests. |
|
3245 |
Return first successfull match.
|
|
3246 |
||
3247 |
:return: (unicode value, encoded plain string value) or (None, None)
|
|
3248 |
"""
|
|
3249 |
possible_vals = [u'm\xb5', u'\xe1', u'\u0410'] |
|
3250 |
for uni_val in possible_vals: |
|
3251 |
try: |
|
|
3224.5.4
by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding. |
3252 |
str_val = uni_val.encode(osutils.get_user_encoding()) |
|
2785.1.5
by Alexander Belchenko
support for non-ascii BZR_HOME in show_version() |
3253 |
except UnicodeEncodeError: |
3254 |
# Try a different character
|
|
3255 |
pass
|
|
3256 |
else: |
|
3257 |
return uni_val, str_val |
|
3258 |
return None, None |
|
|
2804.4.1
by Alexander Belchenko
some win32-specific fixes for selftest |
3259 |
|
3260 |
||
|
2839.6.2
by Alexander Belchenko
changes after Martin's review |
3261 |
def probe_bad_non_ascii(encoding): |
|
2804.4.1
by Alexander Belchenko
some win32-specific fixes for selftest |
3262 |
"""Try to find [bad] character with code [128..255] |
|
2839.6.2
by Alexander Belchenko
changes after Martin's review |
3263 |
that cannot be decoded to unicode in some encoding.
|
|
2804.4.1
by Alexander Belchenko
some win32-specific fixes for selftest |
3264 |
Return None if all non-ascii characters is valid
|
|
2839.6.2
by Alexander Belchenko
changes after Martin's review |
3265 |
for given encoding.
|
|
2804.4.1
by Alexander Belchenko
some win32-specific fixes for selftest |
3266 |
"""
|
3267 |
for i in xrange(128, 256): |
|
3268 |
char = chr(i) |
|
3269 |
try: |
|
|
2839.6.2
by Alexander Belchenko
changes after Martin's review |
3270 |
char.decode(encoding) |
|
2804.4.1
by Alexander Belchenko
some win32-specific fixes for selftest |
3271 |
except UnicodeDecodeError: |
3272 |
return char |
|
3273 |
return None |
|
|
2917.3.1
by Vincent Ladeuil
Separate transport from test server. |
3274 |
|
3275 |
||
3276 |
class _FTPServerFeature(Feature): |
|
3277 |
"""Some tests want an FTP Server, check if one is available. |
|
3278 |
||
3279 |
Right now, the only way this is available is if 'medusa' is installed.
|
|
3280 |
http://www.amk.ca/python/code/medusa.html
|
|
3281 |
"""
|
|
3282 |
||
3283 |
def _probe(self): |
|
3284 |
try: |
|
|
2949.3.3
by Vincent Ladeuil
Fix reference to FTPServer, forgotten in the previous renaming. |
3285 |
import bzrlib.tests.ftp_server |
|
2917.3.1
by Vincent Ladeuil
Separate transport from test server. |
3286 |
return True |
3287 |
except ImportError: |
|
3288 |
return False |
|
3289 |
||
3290 |
def feature_name(self): |
|
3291 |
return 'FTPServer' |
|
3292 |
||
3293 |
FTPServerFeature = _FTPServerFeature() |
|
|
3063.1.1
by Alexander Belchenko
Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758). |
3294 |
|
3295 |
||
|
3287.20.2
by John Arbash Meinel
Raise a clear error about the offending filename when there is a filename with bad characters. |
3296 |
class _UnicodeFilename(Feature): |
3297 |
"""Does the filesystem support Unicode filenames?""" |
|
3298 |
||
3299 |
def _probe(self): |
|
3300 |
try: |
|
3301 |
os.stat(u'\u03b1') |
|
3302 |
except UnicodeEncodeError: |
|
3303 |
return False |
|
3304 |
except (IOError, OSError): |
|
3305 |
# The filesystem allows the Unicode filename but the file doesn't
|
|
3306 |
# exist.
|
|
3307 |
return True |
|
3308 |
else: |
|
3309 |
# The filesystem allows the Unicode filename and the file exists,
|
|
3310 |
# for some reason.
|
|
3311 |
return True |
|
3312 |
||
3313 |
UnicodeFilename = _UnicodeFilename() |
|
3314 |
||
3315 |
||
3316 |
class _UTF8Filesystem(Feature): |
|
3317 |
"""Is the filesystem UTF-8?""" |
|
3318 |
||
3319 |
def _probe(self): |
|
3320 |
if osutils._fs_enc.upper() in ('UTF-8', 'UTF8'): |
|
3321 |
return True |
|
3322 |
return False |
|
3323 |
||
3324 |
UTF8Filesystem = _UTF8Filesystem() |
|
3325 |
||
3326 |
||
|
3063.1.1
by Alexander Belchenko
Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758). |
3327 |
class _CaseInsensitiveFilesystemFeature(Feature): |
|
3638.3.5
by Vincent Ladeuil
John's review feebdack: don't call chown unconditionally. |
3328 |
"""Check if underlying filesystem is case-insensitive |
|
3063.1.1
by Alexander Belchenko
Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758). |
3329 |
(e.g. on Windows, Cygwin, MacOS)
|
3330 |
"""
|
|
3331 |
||
3332 |
def _probe(self): |
|
3333 |
if TestCaseWithMemoryTransport.TEST_ROOT is None: |
|
3334 |
root = osutils.mkdtemp(prefix='testbzr-', suffix='.tmp') |
|
3335 |
TestCaseWithMemoryTransport.TEST_ROOT = root |
|
3336 |
else: |
|
3337 |
root = TestCaseWithMemoryTransport.TEST_ROOT |
|
3338 |
tdir = osutils.mkdtemp(prefix='case-sensitive-probe-', suffix='', |
|
3339 |
dir=root) |
|
3340 |
name_a = osutils.pathjoin(tdir, 'a') |
|
3341 |
name_A = osutils.pathjoin(tdir, 'A') |
|
3342 |
os.mkdir(name_a) |
|
3343 |
result = osutils.isdir(name_A) |
|
3344 |
_rmtree_temp_dir(tdir) |
|
3345 |
return result |
|
3346 |
||
3347 |
def feature_name(self): |
|
3348 |
return 'case-insensitive filesystem' |
|
3349 |
||
3350 |
CaseInsensitiveFilesystemFeature = _CaseInsensitiveFilesystemFeature() |