bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
5557.1.7
by John Arbash Meinel
Merge in the bzr.dev 5582 |
1 |
# Copyright (C) 2005-2011 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
|
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
608
by Martin Pool
- Split selftests out into a new module and start changing them |
16 |
|
|
5131.2.5
by Martin
Add module docstring to bzrlib.tests |
17 |
"""Testing framework extensions"""
|
|
609
by Martin Pool
- cleanup test code |
18 |
|
|
1535
by Martin Pool
todo idea from John |
19 |
# TODO: Perhaps there should be an API to find out if bzr running under the
|
20 |
# test suite -- some plugins might want to avoid making intrusive changes if
|
|
21 |
# this is the case. However, we want behaviour under to test to diverge as
|
|
22 |
# little as possible, so this should be used rarely if it's added at all.
|
|
23 |
# (Suggestion from j-a-meinel, 2005-11-24)
|
|
24 |
||
|
1553.5.68
by Martin Pool
Add new TestCaseWithTransport.assertIsDirectory() and tests |
25 |
# NOTE: Some classes in here use camelCaseNaming() rather than
|
26 |
# underscore_naming(). That's for consistency with unittest; it's not the
|
|
27 |
# general style of bzrlib. Please continue that consistency when adding e.g.
|
|
28 |
# new assertFoo() methods.
|
|
29 |
||
|
2485.6.6
by Martin Pool
Put test root directory (containing per-test directories) in TMPDIR |
30 |
import atexit |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
31 |
import codecs |
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
32 |
import copy |
|
1185.1.29
by Robert Collins
merge merge tweaks from aaron, which includes latest .dev |
33 |
from cStringIO import StringIO |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
34 |
import difflib |
|
1740.6.1
by Martin Pool
Remove Scratch objects used by doctests |
35 |
import doctest |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
36 |
import errno |
|
5365.3.1
by Andrew Bennetts
Better (and simpler) algorithm for partition_tests. |
37 |
import itertools |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
38 |
import logging |
39 |
import os |
|
|
5412.1.4
by Martin
Fix errors on three selftest tests by splitting report_tests_starting out of startTests |
40 |
import platform |
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
41 |
import pprint |
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
42 |
import random |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
43 |
import re |
|
2530.3.1
by Martin Pool
Cleanup old variations on run_bzr in the test suite |
44 |
import shlex |
|
1530.1.17
by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible. |
45 |
import stat |
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
46 |
import subprocess |
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
47 |
import sys |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
48 |
import tempfile |
|
3406.1.2
by Vincent Ladeuil
Fix as per Robert's review. |
49 |
import threading |
|
3084.1.1
by Andrew Bennetts
Add a --coverage option to selftest. |
50 |
import time |
|
4794.1.8
by Robert Collins
Move the passing of test logs to the result to be via the getDetails API and remove all public use of TestCase._get_log. |
51 |
import traceback |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
52 |
import unittest |
|
2485.6.5
by Martin Pool
Remove keep_output option |
53 |
import warnings |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
54 |
|
|
4794.1.1
by Robert Collins
Derive bzr's TestCase from testtools.testcase.TestCase. |
55 |
import testtools |
|
4922.1.2
by Martin Pool
Better guards on checks of testtools versions |
56 |
# nb: check this before importing anything else from within it
|
57 |
_testtools_version = getattr(testtools, '__version__', ()) |
|
|
5418.5.1
by Martin
Change the minimum version of testtools required for selftest to 0.9.5 |
58 |
if _testtools_version < (0, 9, 5): |
59 |
raise ImportError("need at least testtools 0.9.5: %s is %r" |
|
|
4922.1.2
by Martin Pool
Better guards on checks of testtools versions |
60 |
% (testtools.__file__, _testtools_version)) |
|
4794.1.6
by Robert Collins
Add a details object to bzr tests containing the test log. May currently result in failures show the log twice (but will now show the log in --subunit mode [which includes --parallel]). |
61 |
from testtools import content |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
62 |
|
|
5574.4.4
by Vincent Ladeuil
Fix weird testools/python-2.4 dependency leading to failure on pqm. |
63 |
import bzrlib |
|
2095.5.3
by Martin Pool
Disable all debug_flags when running blackbox tests |
64 |
from bzrlib import ( |
|
3567.4.12
by John Arbash Meinel
Expose the branch building framework to the test suite. |
65 |
branchbuilder, |
|
2095.5.3
by Martin Pool
Disable all debug_flags when running blackbox tests |
66 |
bzrdir, |
|
4634.90.2
by Andrew Bennetts
Clear chk_map page cache in TestCase._run_bzr_core, causes blackbox.test_log to fail without fix in previous revision. |
67 |
chk_map, |
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
68 |
commands as _mod_commands, |
|
4695.3.2
by Vincent Ladeuil
Simplified and claried as per Robert's review. |
69 |
config, |
|
2095.5.3
by Martin Pool
Disable all debug_flags when running blackbox tests |
70 |
debug, |
71 |
errors, |
|
|
4119.3.1
by Robert Collins
Create a single registry of all Hooks classes, removing the test suite knowledge of such hooks and allowing plugins to sensibly and safely define new hooks. |
72 |
hooks, |
|
3331.4.1
by Robert Collins
* -Dlock when passed to the selftest (e.g. ``bzr -Dlock selftest``) will |
73 |
lock as _mod_lock, |
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
74 |
lockdir, |
|
2095.5.3
by Martin Pool
Disable all debug_flags when running blackbox tests |
75 |
memorytree, |
76 |
osutils, |
|
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
77 |
plugin as _mod_plugin, |
|
5436.2.1
by Andrew Bennetts
Add bzrlib.pyutils, which has get_named_object, a wrapper around __import__. |
78 |
pyutils, |
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
79 |
ui, |
|
2095.5.3
by Martin Pool
Disable all debug_flags when running blackbox tests |
80 |
urlutils, |
|
3649.6.2
by Vincent Ladeuil
Replace aliases in selftest --starting-with option. |
81 |
registry, |
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
82 |
symbol_versioning, |
83 |
trace, |
|
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
84 |
transport as _mod_transport, |
|
2292.1.1
by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file. |
85 |
workingtree, |
|
2095.5.3
by Martin Pool
Disable all debug_flags when running blackbox tests |
86 |
)
|
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
87 |
try: |
88 |
import bzrlib.lsprof |
|
89 |
except ImportError: |
|
90 |
# lsprof not available
|
|
91 |
pass
|
|
|
5495.1.1
by Andrew Bennetts
Remove unused definition of ForwardingResult, and switch all code to use the testtools name for it. Also remove a few unused imports. |
92 |
from bzrlib.smart import client, request |
|
5017.3.45
by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry. |
93 |
from bzrlib.transport import ( |
94 |
memory, |
|
95 |
pathfilter, |
|
96 |
)
|
|
|
5017.3.6
by Vincent Ladeuil
Fix some fallouts of moving test servers around. |
97 |
from bzrlib.tests import ( |
98 |
test_server, |
|
99 |
TestUtil, |
|
|
5200.2.3
by Robert Collins
Make 'pydoc bzrlib.tests.build_tree_shape' useful. |
100 |
treeshape, |
|
5017.3.6
by Vincent Ladeuil
Fix some fallouts of moving test servers around. |
101 |
)
|
|
4580.2.1
by Martin Pool
TestUIFactory no longer needs to pretend to be its own ProgressView |
102 |
from bzrlib.ui import NullProgressView |
|
4449.3.18
by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name |
103 |
from bzrlib.ui.text import TextUIFactory |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
104 |
|
|
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) |
105 |
# Mark this python module as being part of the implementation
|
106 |
# of unittest: this gives us better tracebacks where the last
|
|
107 |
# shown frame is the test code, not our assertXYZ.
|
|
|
2598.5.7
by Aaron Bentley
Updates from review |
108 |
__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) |
109 |
|
|
5017.3.6
by Vincent Ladeuil
Fix some fallouts of moving test servers around. |
110 |
default_transport = test_server.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. |
111 |
|
|
4985.1.3
by Vincent Ladeuil
Change it to a more usable form. |
112 |
|
113 |
_unitialized_attr = object() |
|
114 |
"""A sentinel needed to act as a default value in a method signature."""
|
|
115 |
||
116 |
||
|
4573.2.3
by Robert Collins
Support python 2.4. |
117 |
# Subunit result codes, defined here to prevent a hard dependency on subunit.
|
118 |
SUBUNIT_SEEK_SET = 0 |
|
119 |
SUBUNIT_SEEK_CUR = 1 |
|
120 |
||
|
5404.2.1
by John Arbash Meinel
Fix bug #627438 by restoring TestSuite and TestLoader. |
121 |
# These are intentionally brought into this namespace. That way plugins, etc
|
122 |
# can just "from bzrlib.tests import TestCase, TestLoader, etc"
|
|
123 |
TestSuite = TestUtil.TestSuite |
|
124 |
TestLoader = TestUtil.TestLoader |
|
|
1185.82.7
by John Arbash Meinel
Adding patches.py into bzrlib, including the tests into the test suite. |
125 |
|
|
5574.7.1
by Vincent Ladeuil
Implement a fixture for isolating tests from ``os.environ``. |
126 |
# Tests should run in a clean and clearly defined environment. The goal is to
|
127 |
# keep them isolated from the running environment as mush as possible. The test
|
|
128 |
# framework ensures the variables defined below are set (or deleted if the
|
|
129 |
# value is None) before a test is run and reset to their original value after
|
|
130 |
# the test is run. Generally if some code depends on an environment variable,
|
|
131 |
# the tests should start without this variable in the environment. There are a
|
|
132 |
# few exceptions but you shouldn't violate this rule lightly.
|
|
133 |
isolated_environ = { |
|
134 |
'BZR_HOME': None, |
|
|
5574.6.7
by Vincent Ladeuil
Set HOME to None in isolated_environ and rename DocTestSuite to BzrDocTestSuite to reduce confusion (I still think it's a bad name space usage :) |
135 |
'HOME': None, |
|
5574.7.1
by Vincent Ladeuil
Implement a fixture for isolating tests from ``os.environ``. |
136 |
# bzr now uses the Win32 API and doesn't rely on APPDATA, but the
|
137 |
# tests do check our impls match APPDATA
|
|
138 |
'BZR_EDITOR': None, # test_msgeditor manipulates this variable |
|
139 |
'VISUAL': None, |
|
140 |
'EDITOR': None, |
|
141 |
'BZR_EMAIL': None, |
|
142 |
'BZREMAIL': None, # may still be present in the environment |
|
143 |
'EMAIL': 'jrandom@example.com', # set EMAIL as bzr does not guess |
|
144 |
'BZR_PROGRESS_BAR': None, |
|
145 |
'BZR_LOG': None, |
|
146 |
'BZR_PLUGIN_PATH': None, |
|
147 |
'BZR_DISABLE_PLUGINS': None, |
|
148 |
'BZR_PLUGINS_AT': None, |
|
149 |
'BZR_CONCURRENCY': None, |
|
150 |
# Make sure that any text ui tests are consistent regardless of
|
|
151 |
# the environment the test case is run in; you may want tests that
|
|
152 |
# test other combinations. 'dumb' is a reasonable guess for tests
|
|
153 |
# going to a pipe or a StringIO.
|
|
154 |
'TERM': 'dumb', |
|
155 |
'LINES': '25', |
|
156 |
'COLUMNS': '80', |
|
157 |
'BZR_COLUMNS': '80', |
|
158 |
# Disable SSH Agent
|
|
159 |
'SSH_AUTH_SOCK': None, |
|
160 |
# Proxies
|
|
161 |
'http_proxy': None, |
|
162 |
'HTTP_PROXY': None, |
|
163 |
'https_proxy': None, |
|
164 |
'HTTPS_PROXY': None, |
|
165 |
'no_proxy': None, |
|
166 |
'NO_PROXY': None, |
|
167 |
'all_proxy': None, |
|
168 |
'ALL_PROXY': None, |
|
169 |
# Nobody cares about ftp_proxy, FTP_PROXY AFAIK. So far at
|
|
170 |
# least. If you do (care), please update this comment
|
|
171 |
# -- vila 20080401
|
|
172 |
'ftp_proxy': None, |
|
173 |
'FTP_PROXY': None, |
|
174 |
'BZR_REMOTE_PATH': None, |
|
175 |
# Generally speaking, we don't want apport reporting on crashes in
|
|
176 |
# the test envirnoment unless we're specifically testing apport,
|
|
177 |
# so that it doesn't leak into the real system environment. We
|
|
178 |
# use an env var so it propagates to subprocesses.
|
|
179 |
'APPORT_DISABLE': '1', |
|
180 |
}
|
|
181 |
||
182 |
||
183 |
def override_os_environ(test, env=None): |
|
184 |
"""Modify os.environ keeping a copy. |
|
185 |
|
|
186 |
:param test: A test instance
|
|
187 |
||
188 |
:param env: A dict containing variable definitions to be installed
|
|
189 |
"""
|
|
190 |
if env is None: |
|
191 |
env = isolated_environ |
|
192 |
test._original_os_environ = dict([(var, value) |
|
193 |
for var, value in os.environ.iteritems()]) |
|
194 |
for var, value in env.iteritems(): |
|
195 |
osutils.set_or_unset_env(var, value) |
|
196 |
if var not in test._original_os_environ: |
|
197 |
# The var is new, add it with a value of None, so
|
|
198 |
# restore_os_environ will delete it
|
|
199 |
test._original_os_environ[var] = None |
|
200 |
||
201 |
||
202 |
def restore_os_environ(test): |
|
203 |
"""Restore os.environ to its original state. |
|
204 |
||
205 |
:param test: A test instance previously passed to override_os_environ.
|
|
206 |
"""
|
|
207 |
for var, value in test._original_os_environ.iteritems(): |
|
208 |
# Restore the original value (or delete it if the value has been set to
|
|
209 |
# None in override_os_environ).
|
|
210 |
osutils.set_or_unset_env(var, value) |
|
211 |
||
212 |
||
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
213 |
class ExtendedTestResult(testtools.TextTestResult): |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
214 |
"""Accepts, reports and accumulates the results of running tests. |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
215 |
|
|
2817.5.1
by Vincent Ladeuil
Catch leaking tests. |
216 |
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 |
217 |
profiling, benchmarking, stopping as soon as a test fails, and
|
218 |
skipping tests. There are further-specialized subclasses for
|
|
219 |
different types of display.
|
|
220 |
||
221 |
When a test finishes, in whatever way, it calls one of the addSuccess,
|
|
222 |
addFailure or addError classes. These in turn may redirect to a more
|
|
223 |
specific case for the special test results supported by our extended
|
|
224 |
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 |
225 |
|
226 |
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 |
227 |
"""
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
228 |
|
|
1185.62.21
by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test. |
229 |
stop_early = False |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
230 |
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
231 |
def __init__(self, stream, descriptions, verbosity, |
232 |
bench_history=None, |
|
|
4271.2.1
by Robert Collins
Move test prelude and suffix output to ExtendedTestResult |
233 |
strict=False, |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
234 |
):
|
|
1819.1.8
by Martin Pool
Improved reporting of bzrlib revision_id |
235 |
"""Construct new TestResult. |
236 |
||
237 |
:param bench_history: Optionally, a writable file object to accumulate
|
|
238 |
benchmark results.
|
|
239 |
"""
|
|
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
240 |
testtools.TextTestResult.__init__(self, stream) |
|
1819.1.1
by Carl Friedrich Bolz
(lifeless, cfbolz, hpk): Give the test result object an optional benchmark |
241 |
if bench_history is not None: |
|
1819.1.8
by Martin Pool
Improved reporting of bzrlib revision_id |
242 |
from bzrlib.version import _get_bzr_source_tree |
243 |
src_tree = _get_bzr_source_tree() |
|
244 |
if src_tree: |
|
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
245 |
try: |
246 |
revision_id = src_tree.get_parent_ids()[0] |
|
247 |
except IndexError: |
|
248 |
# XXX: if this is a brand new tree, do the same as if there
|
|
249 |
# is no branch.
|
|
250 |
revision_id = '' |
|
|
1819.1.8
by Martin Pool
Improved reporting of bzrlib revision_id |
251 |
else: |
252 |
# XXX: If there's no branch, what should we do?
|
|
253 |
revision_id = '' |
|
|
1819.1.4
by Jan Balster
save the revison id for every benchmark run in .perf-history |
254 |
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 |
255 |
self._bench_history = bench_history |
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
256 |
self.ui = ui.ui_factory |
|
4573.2.1
by Robert Collins
Don't call countTestCases from TextTestRunner.run, rather let tests decide if they want to be counted. |
257 |
self.num_tests = 0 |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
258 |
self.error_count = 0 |
259 |
self.failure_count = 0 |
|
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
260 |
self.known_failure_count = 0 |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
261 |
self.skip_count = 0 |
|
2729.1.1
by Martin Pool
Add TestNotApplicable exception and handling of it; document test parameterization |
262 |
self.not_applicable_count = 0 |
|
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
263 |
self.unsupported = {} |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
264 |
self.count = 0 |
265 |
self._overall_start_time = time.time() |
|
|
4271.2.1
by Robert Collins
Move test prelude and suffix output to ExtendedTestResult |
266 |
self._strict = strict |
|
5412.1.1
by Martin
Move leak detection code from TestCase to ExtendedTestResult and clean up |
267 |
self._first_thread_leaker_id = None |
268 |
self._tests_leaking_threads_count = 0 |
|
|
5459.5.2
by Martin
Add handler to record the traceback from testtools cases to get BZR_TEST_PDB working again |
269 |
self._traceback_from_test = None |
|
4271.2.1
by Robert Collins
Move test prelude and suffix output to ExtendedTestResult |
270 |
|
|
4650.1.6
by Robert Collins
Fix interface skew between bzr selftest and python unittest - use stopTestRun not done to end test runs. |
271 |
def stopTestRun(self): |
|
4650.1.7
by Robert Collins
Push result reporting thoroughly into TestResult. |
272 |
run = self.testsRun |
273 |
actionTaken = "Ran" |
|
274 |
stopTime = time.time() |
|
275 |
timeTaken = stopTime - self.startTime |
|
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
276 |
# GZ 2010-07-19: Seems testtools has no printErrors method, and though
|
277 |
# the parent class method is similar have to duplicate
|
|
278 |
self._show_list('ERROR', self.errors) |
|
279 |
self._show_list('FAIL', self.failures) |
|
280 |
self.stream.write(self.sep2) |
|
281 |
self.stream.write("%s %d test%s in %.3fs\n\n" % (actionTaken, |
|
|
4650.1.7
by Robert Collins
Push result reporting thoroughly into TestResult. |
282 |
run, run != 1 and "s" or "", timeTaken)) |
283 |
if not self.wasSuccessful(): |
|
284 |
self.stream.write("FAILED (") |
|
285 |
failed, errored = map(len, (self.failures, self.errors)) |
|
286 |
if failed: |
|
287 |
self.stream.write("failures=%d" % failed) |
|
288 |
if errored: |
|
289 |
if failed: self.stream.write(", ") |
|
290 |
self.stream.write("errors=%d" % errored) |
|
291 |
if self.known_failure_count: |
|
292 |
if failed or errored: self.stream.write(", ") |
|
293 |
self.stream.write("known_failure_count=%d" % |
|
294 |
self.known_failure_count) |
|
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
295 |
self.stream.write(")\n") |
|
4650.1.7
by Robert Collins
Push result reporting thoroughly into TestResult. |
296 |
else: |
297 |
if self.known_failure_count: |
|
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
298 |
self.stream.write("OK (known_failures=%d)\n" % |
|
4650.1.7
by Robert Collins
Push result reporting thoroughly into TestResult. |
299 |
self.known_failure_count) |
300 |
else: |
|
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
301 |
self.stream.write("OK\n") |
|
4650.1.7
by Robert Collins
Push result reporting thoroughly into TestResult. |
302 |
if self.skip_count > 0: |
303 |
skipped = self.skip_count |
|
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
304 |
self.stream.write('%d test%s skipped\n' % |
|
4650.1.7
by Robert Collins
Push result reporting thoroughly into TestResult. |
305 |
(skipped, skipped != 1 and "s" or "")) |
306 |
if self.unsupported: |
|
307 |
for feature, count in sorted(self.unsupported.items()): |
|
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
308 |
self.stream.write("Missing feature '%s' skipped %d tests.\n" % |
|
4650.1.7
by Robert Collins
Push result reporting thoroughly into TestResult. |
309 |
(feature, count)) |
|
4271.2.1
by Robert Collins
Move test prelude and suffix output to ExtendedTestResult |
310 |
if self._strict: |
311 |
ok = self.wasStrictlySuccessful() |
|
312 |
else: |
|
313 |
ok = self.wasSuccessful() |
|
|
5412.1.1
by Martin
Move leak detection code from TestCase to ExtendedTestResult and clean up |
314 |
if self._first_thread_leaker_id: |
|
4271.2.2
by Robert Collins
Move thread leak reporting to ExtendedTestResult. |
315 |
self.stream.write( |
316 |
'%s is leaking threads among %d leaking tests.\n' % ( |
|
|
5412.1.1
by Martin
Move leak detection code from TestCase to ExtendedTestResult and clean up |
317 |
self._first_thread_leaker_id, |
318 |
self._tests_leaking_threads_count)) |
|
|
4731.2.8
by Vincent Ladeuil
Collect and shutdown clients for SmartTCPServer_for_testing. |
319 |
# We don't report the main thread as an active one.
|
|
4732.2.1
by Vincent Ladeuil
Clearer thread leaks reports. |
320 |
self.stream.write( |
321 |
'%d non-main threads were left active in the end.\n' |
|
|
5412.1.1
by Martin
Move leak detection code from TestCase to ExtendedTestResult and clean up |
322 |
% (len(self._active_threads) - 1)) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
323 |
|
|
4789.29.1
by Robert Collins
Show test ids not descriptions when reporting error/failures in tests. |
324 |
def getDescription(self, test): |
325 |
return test.id() |
|
326 |
||
|
4794.1.10
by Robert Collins
Add benchmark time details object. |
327 |
def _extractBenchmarkTime(self, testCase, details=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). |
328 |
"""Add a benchmark time for the current test case.""" |
|
4794.1.10
by Robert Collins
Add benchmark time details object. |
329 |
if details and 'benchtime' in details: |
330 |
return float(''.join(details['benchtime'].iter_bytes())) |
|
|
2695.1.2
by Martin Pool
_benchmarkTime should not be an attribute of ExtendedTestResult, because it only applies to the most recent test reported |
331 |
return getattr(testCase, "_benchtime", None) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
332 |
|
|
1707.2.3
by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool). |
333 |
def _elapsedTestTimeString(self): |
334 |
"""Return a time string for the overall time the current test has taken.""" |
|
|
5445.1.1
by Martin
Use times from testtools for individual test case timings |
335 |
return self._formatTime(self._delta_to_float( |
336 |
self._now() - self._start_datetime)) |
|
|
1707.2.3
by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool). |
337 |
|
|
2695.1.2
by Martin Pool
_benchmarkTime should not be an attribute of ExtendedTestResult, because it only applies to the most recent test reported |
338 |
def _testTimeString(self, testCase): |
339 |
benchmark_time = self._extractBenchmarkTime(testCase) |
|
340 |
if benchmark_time is not None: |
|
|
4536.5.2
by Martin Pool
Reserve less space for test elapsed time; more space for test name |
341 |
return 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). |
342 |
else: |
|
4536.5.5
by Martin Pool
More selftest display test tweaks |
343 |
return 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). |
344 |
|
345 |
def _formatTime(self, seconds): |
|
346 |
"""Format seconds as milliseconds with leading spaces.""" |
|
|
2196.1.1
by Martin Pool
better formatting of benchmark output so it doesn't wrap |
347 |
# some benchmarks can take thousands of seconds to run, so we need 8
|
348 |
# places
|
|
349 |
return "%8dms" % (1000 * seconds) |
|
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
350 |
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
351 |
def _shortened_test_description(self, test): |
352 |
what = test.id() |
|
|
5050.10.4
by Martin Pool
Remove more selftest --benchmark references |
353 |
what = re.sub(r'^bzrlib\.tests\.', '', what) |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
354 |
return what |
|
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
355 |
|
|
5459.5.2
by Martin
Add handler to record the traceback from testtools cases to get BZR_TEST_PDB working again |
356 |
# GZ 2010-10-04: Cloned tests may end up harmlessly calling this method
|
357 |
# multiple times in a row, because the handler is added for
|
|
358 |
# each test but the container list is shared between cases.
|
|
359 |
# See lp:498869 lp:625574 and lp:637725 for background.
|
|
360 |
def _record_traceback_from_test(self, exc_info): |
|
361 |
"""Store the traceback from passed exc_info tuple till""" |
|
362 |
self._traceback_from_test = exc_info[2] |
|
363 |
||
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
364 |
def startTest(self, test): |
|
5340.6.2
by Martin
Replace remaining to unittest.TestResult methods with super |
365 |
super(ExtendedTestResult, self).startTest(test) |
|
4271.2.1
by Robert Collins
Move test prelude and suffix output to ExtendedTestResult |
366 |
if self.count == 0: |
367 |
self.startTests() |
|
|
5412.1.5
by Martin
Move test count addition into startTest from report methods in subclasses |
368 |
self.count += 1 |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
369 |
self.report_test_start(test) |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
370 |
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). |
371 |
self._recordTestStartTime() |
|
5459.5.2
by Martin
Add handler to record the traceback from testtools cases to get BZR_TEST_PDB working again |
372 |
# Make testtools cases give us the real traceback on failure
|
373 |
addOnException = getattr(test, "addOnException", None) |
|
374 |
if addOnException is not None: |
|
375 |
addOnException(self._record_traceback_from_test) |
|
|
5580.2.1
by Martin
Do thread leak detection on bzrlib TestCase instances only rather than anything with addCleanup |
376 |
# Only check for thread leaks on bzrlib derived test cases
|
377 |
if isinstance(test, TestCase): |
|
378 |
test.addCleanup(self._check_leaked_threads, test) |
|
|
1707.2.3
by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool). |
379 |
|
|
4271.2.1
by Robert Collins
Move test prelude and suffix output to ExtendedTestResult |
380 |
def startTests(self): |
|
5412.1.4
by Martin
Fix errors on three selftest tests by splitting report_tests_starting out of startTests |
381 |
self.report_tests_starting() |
|
5412.1.1
by Martin
Move leak detection code from TestCase to ExtendedTestResult and clean up |
382 |
self._active_threads = threading.enumerate() |
383 |
||
|
5459.5.2
by Martin
Add handler to record the traceback from testtools cases to get BZR_TEST_PDB working again |
384 |
def stopTest(self, test): |
385 |
self._traceback_from_test = None |
|
386 |
||
|
5412.1.1
by Martin
Move leak detection code from TestCase to ExtendedTestResult and clean up |
387 |
def _check_leaked_threads(self, test): |
|
5412.1.6
by Martin
Document the less obvious code and note future reporting plans, as requested in review by vila |
388 |
"""See if any threads have leaked since last call |
389 |
||
390 |
A sample of live threads is stored in the _active_threads attribute,
|
|
391 |
when this method runs it compares the current live threads and any not
|
|
392 |
in the previous sample are treated as having leaked.
|
|
393 |
"""
|
|
|
5412.1.1
by Martin
Move leak detection code from TestCase to ExtendedTestResult and clean up |
394 |
now_active_threads = set(threading.enumerate()) |
395 |
threads_leaked = now_active_threads.difference(self._active_threads) |
|
396 |
if threads_leaked: |
|
397 |
self._report_thread_leak(test, threads_leaked, now_active_threads) |
|
398 |
self._tests_leaking_threads_count += 1 |
|
399 |
if self._first_thread_leaker_id is None: |
|
400 |
self._first_thread_leaker_id = test.id() |
|
401 |
self._active_threads = now_active_threads |
|
|
4271.2.1
by Robert Collins
Move test prelude and suffix output to ExtendedTestResult |
402 |
|
|
1707.2.3
by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool). |
403 |
def _recordTestStartTime(self): |
404 |
"""Record that a test has started.""" |
|
|
5445.1.1
by Martin
Use times from testtools for individual test case timings |
405 |
self._start_datetime = self._now() |
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
406 |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
407 |
def addError(self, test, err): |
|
2695.1.1
by Martin Pool
Fix problem if the first test is missing a dependency |
408 |
"""Tell result that test finished with an error. |
409 |
||
410 |
Called from the TestCase run() method when the test
|
|
411 |
fails with an unexpected error.
|
|
412 |
"""
|
|
|
5459.5.2
by Martin
Add handler to record the traceback from testtools cases to get BZR_TEST_PDB working again |
413 |
self._post_mortem(self._traceback_from_test) |
|
5340.6.2
by Martin
Replace remaining to unittest.TestResult methods with super |
414 |
super(ExtendedTestResult, self).addError(test, err) |
|
4780.1.3
by Robert Collins
TestNotApplicable handling improved for compatibility with stdlib TestResult objects. |
415 |
self.error_count += 1 |
416 |
self.report_error(test, err) |
|
417 |
if self.stop_early: |
|
418 |
self.stop() |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
419 |
|
420 |
def addFailure(self, test, err): |
|
|
2695.1.1
by Martin Pool
Fix problem if the first test is missing a dependency |
421 |
"""Tell result that test failed. |
422 |
||
423 |
Called from the TestCase run() method when the test
|
|
424 |
fails because e.g. an assert() method failed.
|
|
425 |
"""
|
|
|
5459.5.2
by Martin
Add handler to record the traceback from testtools cases to get BZR_TEST_PDB working again |
426 |
self._post_mortem(self._traceback_from_test) |
|
5340.6.2
by Martin
Replace remaining to unittest.TestResult methods with super |
427 |
super(ExtendedTestResult, self).addFailure(test, err) |
|
4780.1.4
by Robert Collins
Switch reporting of KnownFailure to be Python2.7 compatible. |
428 |
self.failure_count += 1 |
429 |
self.report_failure(test, err) |
|
430 |
if self.stop_early: |
|
431 |
self.stop() |
|
|
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
432 |
|
|
4794.1.10
by Robert Collins
Add benchmark time details object. |
433 |
def addSuccess(self, test, details=None): |
|
2695.1.1
by Martin Pool
Fix problem if the first test is missing a dependency |
434 |
"""Tell result that test completed successfully. |
435 |
||
436 |
Called from the TestCase run()
|
|
437 |
"""
|
|
|
1819.1.3
by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history |
438 |
if self._bench_history is not None: |
|
4794.1.10
by Robert Collins
Add benchmark time details object. |
439 |
benchmark_time = self._extractBenchmarkTime(test, details) |
|
2695.1.2
by Martin Pool
_benchmarkTime should not be an attribute of ExtendedTestResult, because it only applies to the most recent test reported |
440 |
if benchmark_time is not None: |
|
1819.1.3
by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history |
441 |
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 |
442 |
self._formatTime(benchmark_time), |
|
1819.1.3
by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history |
443 |
test.id())) |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
444 |
self.report_success(test) |
|
5340.6.2
by Martin
Replace remaining to unittest.TestResult methods with super |
445 |
super(ExtendedTestResult, self).addSuccess(test) |
|
3224.4.4
by Andrew Bennetts
Tweak clearing of _log_contents (idea from John). |
446 |
test._log_contents = '' |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
447 |
|
|
4780.1.4
by Robert Collins
Switch reporting of KnownFailure to be Python2.7 compatible. |
448 |
def addExpectedFailure(self, test, err): |
|
2695.1.1
by Martin Pool
Fix problem if the first test is missing a dependency |
449 |
self.known_failure_count += 1 |
450 |
self.report_known_failure(test, err) |
|
451 |
||
452 |
def addNotSupported(self, test, feature): |
|
453 |
"""The test will not be run because of a missing feature. |
|
454 |
"""
|
|
455 |
# this can be called in two different ways: it may be that the
|
|
|
4780.1.1
by Robert Collins
Make addUnsupported more compatible with other TestResults. |
456 |
# test started running, and then raised (through requireFeature)
|
|
2695.1.1
by Martin Pool
Fix problem if the first test is missing a dependency |
457 |
# UnavailableFeature. Alternatively this method can be called
|
|
4780.1.1
by Robert Collins
Make addUnsupported more compatible with other TestResults. |
458 |
# while probing for features before running the test code proper; in
|
459 |
# that case we will see startTest and stopTest, but the test will
|
|
460 |
# never actually run.
|
|
|
2695.1.1
by Martin Pool
Fix problem if the first test is missing a dependency |
461 |
self.unsupported.setdefault(str(feature), 0) |
462 |
self.unsupported[str(feature)] += 1 |
|
463 |
self.report_unsupported(test, feature) |
|
464 |
||
|
4063.1.1
by Robert Collins
Move skipped test detection to TestCase, and make reporting use an addSkip method as per testtools. |
465 |
def addSkip(self, test, reason): |
466 |
"""A test has not run for 'reason'.""" |
|
467 |
self.skip_count += 1 |
|
468 |
self.report_skip(test, reason) |
|
469 |
||
|
4780.1.3
by Robert Collins
TestNotApplicable handling improved for compatibility with stdlib TestResult objects. |
470 |
def addNotApplicable(self, test, reason): |
471 |
self.not_applicable_count += 1 |
|
472 |
self.report_not_applicable(test, reason) |
|
|
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
473 |
|
|
5459.5.2
by Martin
Add handler to record the traceback from testtools cases to get BZR_TEST_PDB working again |
474 |
def _post_mortem(self, tb=None): |
|
4685.1.1
by Robert Collins
Use BZR_TEST_PDB=1 to trigger post_mortems in test failures. |
475 |
"""Start a PDB post mortem session.""" |
476 |
if os.environ.get('BZR_TEST_PDB', None): |
|
|
5459.5.2
by Martin
Add handler to record the traceback from testtools cases to get BZR_TEST_PDB working again |
477 |
import pdb |
478 |
pdb.post_mortem(tb) |
|
|
4685.1.1
by Robert Collins
Use BZR_TEST_PDB=1 to trigger post_mortems in test failures. |
479 |
|
|
4573.2.1
by Robert Collins
Don't call countTestCases from TextTestRunner.run, rather let tests decide if they want to be counted. |
480 |
def progress(self, offset, whence): |
481 |
"""The test is adjusting the count of tests to run.""" |
|
|
4573.2.3
by Robert Collins
Support python 2.4. |
482 |
if whence == SUBUNIT_SEEK_SET: |
|
4573.2.1
by Robert Collins
Don't call countTestCases from TextTestRunner.run, rather let tests decide if they want to be counted. |
483 |
self.num_tests = offset |
|
4573.2.3
by Robert Collins
Support python 2.4. |
484 |
elif whence == SUBUNIT_SEEK_CUR: |
|
4573.2.1
by Robert Collins
Don't call countTestCases from TextTestRunner.run, rather let tests decide if they want to be counted. |
485 |
self.num_tests += offset |
486 |
else: |
|
487 |
raise errors.BzrError("Unknown whence %r" % whence) |
|
488 |
||
|
5412.1.4
by Martin
Fix errors on three selftest tests by splitting report_tests_starting out of startTests |
489 |
def report_tests_starting(self): |
490 |
"""Display information before the test run begins""" |
|
491 |
if getattr(sys, 'frozen', None) is None: |
|
492 |
bzr_path = osutils.realpath(sys.argv[0]) |
|
493 |
else: |
|
494 |
bzr_path = sys.executable |
|
495 |
self.stream.write( |
|
496 |
'bzr selftest: %s\n' % (bzr_path,)) |
|
497 |
self.stream.write( |
|
498 |
' %s\n' % ( |
|
499 |
bzrlib.__path__[0],)) |
|
500 |
self.stream.write( |
|
501 |
' bzr-%s python-%s %s\n' % ( |
|
502 |
bzrlib.version_string, |
|
503 |
bzrlib._format_version_tuple(sys.version_info), |
|
504 |
platform.platform(aliased=1), |
|
505 |
))
|
|
506 |
self.stream.write('\n') |
|
507 |
||
|
5412.1.3
by Martin
Add tests for test case thread leak detection |
508 |
def report_test_start(self, test): |
509 |
"""Display information on the test just about to be run""" |
|
510 |
||
|
5412.1.1
by Martin
Move leak detection code from TestCase to ExtendedTestResult and clean up |
511 |
def _report_thread_leak(self, test, leaked_threads, active_threads): |
512 |
"""Display information on a test that leaked one or more threads""" |
|
|
5412.1.6
by Martin
Document the less obvious code and note future reporting plans, as requested in review by vila |
513 |
# GZ 2010-09-09: A leak summary reported separately from the general
|
514 |
# thread debugging would be nice. Tests under subunit
|
|
515 |
# need something not using stream, perhaps adding a
|
|
516 |
# testtools details object would be fitting.
|
|
|
5412.1.1
by Martin
Move leak detection code from TestCase to ExtendedTestResult and clean up |
517 |
if 'threads' in selftest_debug_flags: |
518 |
self.stream.write('%s is leaking, active is now %d\n' % |
|
519 |
(test.id(), len(active_threads))) |
|
520 |
||
|
4650.1.8
by Robert Collins
Push all starting up reporting down into startTestRun. |
521 |
def startTestRun(self): |
|
4650.1.7
by Robert Collins
Push result reporting thoroughly into TestResult. |
522 |
self.startTime = time.time() |
523 |
||
|
2095.4.1
by Martin Pool
Better progress bars during tests |
524 |
def report_success(self, test): |
525 |
pass
|
|
526 |
||
|
2658.3.1
by Daniel Watkins
Added ExtendedTestResult.wasStrictlySuccessful. |
527 |
def wasStrictlySuccessful(self): |
528 |
if self.unsupported or self.known_failure_count: |
|
529 |
return False |
|
530 |
return self.wasSuccessful() |
|
531 |
||
532 |
||
|
2095.4.1
by Martin Pool
Better progress bars during tests |
533 |
class TextTestResult(ExtendedTestResult): |
534 |
"""Displays progress and results of tests in text form""" |
|
535 |
||
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
536 |
def __init__(self, stream, descriptions, verbosity, |
537 |
bench_history=None, |
|
538 |
pb=None, |
|
|
4271.2.1
by Robert Collins
Move test prelude and suffix output to ExtendedTestResult |
539 |
strict=None, |
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
540 |
):
|
541 |
ExtendedTestResult.__init__(self, stream, descriptions, verbosity, |
|
|
4573.2.1
by Robert Collins
Don't call countTestCases from TextTestRunner.run, rather let tests decide if they want to be counted. |
542 |
bench_history, strict) |
|
4580.3.2
by Martin Pool
TextTestResult now clears off the pb when the tests are done |
543 |
# We no longer pass them around, but just rely on the UIFactory stack
|
544 |
# for state
|
|
545 |
if pb is not None: |
|
546 |
warnings.warn("Passing pb to TextTestResult is deprecated") |
|
547 |
self.pb = self.ui.nested_progress_bar() |
|
|
2095.4.5
by mbp at sourcefrog
Use regular progress-bar classes, not a special mechanism |
548 |
self.pb.show_pct = False |
549 |
self.pb.show_spinner = False |
|
|
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
550 |
self.pb.show_eta = False, |
|
2095.4.5
by mbp at sourcefrog
Use regular progress-bar classes, not a special mechanism |
551 |
self.pb.show_count = False |
552 |
self.pb.show_bar = False |
|
|
4580.3.3
by Martin Pool
Test progress bar has zero latency so it's more accurate |
553 |
self.pb.update_latency = 0 |
|
4580.3.5
by Martin Pool
selftest sets ProgressTask.show_transport_activity off |
554 |
self.pb.show_transport_activity = False |
|
2095.4.5
by mbp at sourcefrog
Use regular progress-bar classes, not a special mechanism |
555 |
|
|
4650.1.6
by Robert Collins
Fix interface skew between bzr selftest and python unittest - use stopTestRun not done to end test runs. |
556 |
def stopTestRun(self): |
|
4580.3.6
by Martin Pool
TextTestResult should also clear pb before done() |
557 |
# called when the tests that are going to run have run
|
558 |
self.pb.clear() |
|
|
4650.1.7
by Robert Collins
Push result reporting thoroughly into TestResult. |
559 |
self.pb.finished() |
|
4650.1.6
by Robert Collins
Fix interface skew between bzr selftest and python unittest - use stopTestRun not done to end test runs. |
560 |
super(TextTestResult, self).stopTestRun() |
|
4580.3.6
by Martin Pool
TextTestResult should also clear pb before done() |
561 |
|
|
5425.3.2
by Martin
Delay writing test start reports to inside first test run |
562 |
def report_tests_starting(self): |
563 |
super(TextTestResult, self).report_tests_starting() |
|
|
4103.3.2
by Martin Pool
Remove trailing punctuation from progress messages |
564 |
self.pb.update('[test 0/%d] Starting' % (self.num_tests)) |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
565 |
|
566 |
def _progress_prefix_text(self): |
|
|
3297.1.1
by Martin Pool
More concise display of test progress bar |
567 |
# the longer this text, the less space we have to show the test
|
568 |
# name...
|
|
569 |
a = '[%d' % self.count # total that have been run |
|
570 |
# tests skipped as known not to be relevant are not important enough
|
|
571 |
# to show here
|
|
572 |
## if self.skip_count:
|
|
573 |
## a += ', %d skip' % self.skip_count
|
|
574 |
## if self.known_failure_count:
|
|
575 |
## a += '+%dX' % self.known_failure_count
|
|
|
4573.2.1
by Robert Collins
Don't call countTestCases from TextTestRunner.run, rather let tests decide if they want to be counted. |
576 |
if self.num_tests: |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
577 |
a +='/%d' % self.num_tests |
|
3297.1.1
by Martin Pool
More concise display of test progress bar |
578 |
a += ' in ' |
579 |
runtime = time.time() - self._overall_start_time |
|
580 |
if runtime >= 60: |
|
581 |
a += '%dm%ds' % (runtime / 60, runtime % 60) |
|
582 |
else: |
|
583 |
a += '%ds' % runtime |
|
|
4917.1.1
by Martin Pool
Test progress bar now lumps together tests that error and those that fail |
584 |
total_fail_count = self.error_count + self.failure_count |
585 |
if total_fail_count: |
|
586 |
a += ', %d failed' % total_fail_count |
|
|
4721.1.1
by Martin Pool
Stop showing the number of tests due to missing features in the test progress bar. |
587 |
# if self.unsupported:
|
588 |
# a += ', %d missing' % len(self.unsupported)
|
|
|
2095.4.3
by Martin Pool
Tweak test display a bit more |
589 |
a += ']' |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
590 |
return a |
591 |
||
592 |
def report_test_start(self, test): |
|
|
2095.4.5
by mbp at sourcefrog
Use regular progress-bar classes, not a special mechanism |
593 |
self.pb.update( |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
594 |
self._progress_prefix_text() |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
595 |
+ ' ' |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
596 |
+ self._shortened_test_description(test)) |
597 |
||
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
598 |
def _test_description(self, test): |
|
2598.4.1
by Martin Pool
Remove obsolete --clean-output, --keep-output, --numbered-dirs selftest options (thanks Alexander) |
599 |
return self._shortened_test_description(test) |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
600 |
|
|
2095.4.3
by Martin Pool
Tweak test display a bit more |
601 |
def report_error(self, test, err): |
|
5159.2.1
by Vincent Ladeuil
bzrlib.tests.TextTestResult should use self.stream not ui.note. |
602 |
self.stream.write('ERROR: %s\n %s\n' % ( |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
603 |
self._test_description(test), |
|
2095.4.3
by Martin Pool
Tweak test display a bit more |
604 |
err[1], |
|
4471.2.2
by Martin Pool
Deprecate ProgressTask.note |
605 |
))
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
606 |
|
|
2095.4.3
by Martin Pool
Tweak test display a bit more |
607 |
def report_failure(self, test, err): |
|
5159.2.1
by Vincent Ladeuil
bzrlib.tests.TextTestResult should use self.stream not ui.note. |
608 |
self.stream.write('FAIL: %s\n %s\n' % ( |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
609 |
self._test_description(test), |
|
2095.4.3
by Martin Pool
Tweak test display a bit more |
610 |
err[1], |
|
4471.2.2
by Martin Pool
Deprecate ProgressTask.note |
611 |
))
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
612 |
|
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
613 |
def report_known_failure(self, test, err): |
|
4794.1.15
by Robert Collins
Review feedback. |
614 |
pass
|
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
615 |
|
|
4063.1.1
by Robert Collins
Move skipped test detection to TestCase, and make reporting use an addSkip method as per testtools. |
616 |
def report_skip(self, test, reason): |
|
2729.1.1
by Martin Pool
Add TestNotApplicable exception and handling of it; document test parameterization |
617 |
pass
|
618 |
||
|
4780.1.3
by Robert Collins
TestNotApplicable handling improved for compatibility with stdlib TestResult objects. |
619 |
def report_not_applicable(self, test, reason): |
|
2729.1.1
by Martin Pool
Add TestNotApplicable exception and handling of it; document test parameterization |
620 |
pass
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
621 |
|
|
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
622 |
def report_unsupported(self, test, feature): |
623 |
"""test cannot be run because feature is missing.""" |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
624 |
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
625 |
|
626 |
class VerboseTestResult(ExtendedTestResult): |
|
627 |
"""Produce long output, with one line per test run plus times""" |
|
628 |
||
629 |
def _ellipsize_to_right(self, a_string, final_width): |
|
630 |
"""Truncate and pad a string, keeping the right hand side""" |
|
631 |
if len(a_string) > final_width: |
|
632 |
result = '...' + a_string[3-final_width:] |
|
633 |
else: |
|
634 |
result = a_string |
|
635 |
return result.ljust(final_width) |
|
636 |
||
|
5425.3.2
by Martin
Delay writing test start reports to inside first test run |
637 |
def report_tests_starting(self): |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
638 |
self.stream.write('running %d tests...\n' % self.num_tests) |
|
5425.3.2
by Martin
Delay writing test start reports to inside first test run |
639 |
super(VerboseTestResult, self).report_tests_starting() |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
640 |
|
641 |
def report_test_start(self, test): |
|
642 |
name = self._shortened_test_description(test) |
|
|
4747.3.6
by Vincent Ladeuil
terminal_width can now returns None. |
643 |
width = osutils.terminal_width() |
644 |
if width is not None: |
|
645 |
# width needs space for 6 char status, plus 1 for slash, plus an
|
|
646 |
# 11-char time string, plus a trailing blank
|
|
647 |
# when NUMBERED_DIRS: plus 5 chars on test number, plus 1 char on
|
|
648 |
# space
|
|
649 |
self.stream.write(self._ellipsize_to_right(name, width-18)) |
|
650 |
else: |
|
651 |
self.stream.write(name) |
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
652 |
self.stream.flush() |
653 |
||
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
654 |
def _error_summary(self, err): |
655 |
indent = ' ' * 4 |
|
656 |
return '%s%s' % (indent, err[1]) |
|
657 |
||
|
2095.4.3
by Martin Pool
Tweak test display a bit more |
658 |
def report_error(self, test, err): |
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
659 |
self.stream.write('ERROR %s\n%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 |
660 |
% (self._testTimeString(test), |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
661 |
self._error_summary(err))) |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
662 |
|
|
2095.4.3
by Martin Pool
Tweak test display a bit more |
663 |
def report_failure(self, test, err): |
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
664 |
self.stream.write(' FAIL %s\n%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 |
665 |
% (self._testTimeString(test), |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
666 |
self._error_summary(err))) |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
667 |
|
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
668 |
def report_known_failure(self, test, err): |
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
669 |
self.stream.write('XFAIL %s\n%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 |
670 |
% (self._testTimeString(test), |
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
671 |
self._error_summary(err))) |
672 |
||
|
2095.4.1
by Martin Pool
Better progress bars during tests |
673 |
def report_success(self, test): |
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
674 |
self.stream.write(' OK %s\n' % self._testTimeString(test)) |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
675 |
for bench_called, stats in getattr(test, '_benchcalls', []): |
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
676 |
self.stream.write('LSProf output for %s(%s, %s)\n' % bench_called) |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
677 |
stats.pprint(file=self.stream) |
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
678 |
# flush the stream so that we get smooth output. This verbose mode is
|
679 |
# used to show the output in PQM.
|
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
680 |
self.stream.flush() |
681 |
||
|
4063.1.1
by Robert Collins
Move skipped test detection to TestCase, and make reporting use an addSkip method as per testtools. |
682 |
def report_skip(self, test, reason): |
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
683 |
self.stream.write(' SKIP %s\n%s\n' |
|
4063.1.1
by Robert Collins
Move skipped test detection to TestCase, and make reporting use an addSkip method as per testtools. |
684 |
% (self._testTimeString(test), reason)) |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
685 |
|
|
4780.1.3
by Robert Collins
TestNotApplicable handling improved for compatibility with stdlib TestResult objects. |
686 |
def report_not_applicable(self, test, reason): |
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
687 |
self.stream.write(' N/A %s\n %s\n' |
|
4780.1.3
by Robert Collins
TestNotApplicable handling improved for compatibility with stdlib TestResult objects. |
688 |
% (self._testTimeString(test), reason)) |
|
2729.1.1
by Martin Pool
Add TestNotApplicable exception and handling of it; document test parameterization |
689 |
|
|
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
690 |
def report_unsupported(self, test, feature): |
691 |
"""test cannot be run because feature is missing.""" |
|
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
692 |
self.stream.write("NODEP %s\n The feature '%s' is not available.\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 |
693 |
%(self._testTimeString(test), feature)) |
|
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
694 |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
695 |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
696 |
class TextTestRunner(object): |
|
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
697 |
stop_on_failure = False |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
698 |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
699 |
def __init__(self, |
700 |
stream=sys.stderr, |
|
701 |
descriptions=0, |
|
702 |
verbosity=1, |
|
|
2379.6.3
by Alexander Belchenko
Rework NUMBERED_DIRS usage to keep test_selftest.py passing the tests on win32 |
703 |
bench_history=None, |
|
4271.2.1
by Robert Collins
Move test prelude and suffix output to ExtendedTestResult |
704 |
strict=False, |
|
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
705 |
result_decorators=None, |
|
2379.6.3
by Alexander Belchenko
Rework NUMBERED_DIRS usage to keep test_selftest.py passing the tests on win32 |
706 |
):
|
|
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
707 |
"""Create a TextTestRunner. |
708 |
||
709 |
:param result_decorators: An optional list of decorators to apply
|
|
710 |
to the result object being used by the runner. Decorators are
|
|
711 |
applied left to right - the first element in the list is the
|
|
712 |
innermost decorator.
|
|
713 |
"""
|
|
|
4794.1.8
by Robert Collins
Move the passing of test logs to the result to be via the getDetails API and remove all public use of TestCase._get_log. |
714 |
# stream may know claim to know to write unicode strings, but in older
|
715 |
# pythons this goes sufficiently wrong that it is a bad idea. (
|
|
716 |
# specifically a built in file with encoding 'UTF-8' will still try
|
|
717 |
# to encode using ascii.
|
|
718 |
new_encoding = osutils.get_terminal_encoding() |
|
|
4794.1.12
by Robert Collins
Create a StreamWriter helper that doesn't trigger implicit decode('ascii') on write(a_str). |
719 |
codec = codecs.lookup(new_encoding) |
|
4794.1.21
by Robert Collins
Python 2.4 doesn't use CodecInfo, so do a type check on the result of codecs.lookup. |
720 |
if type(codec) is tuple: |
721 |
# Python 2.4
|
|
722 |
encode = codec[0] |
|
723 |
else: |
|
724 |
encode = codec.encode |
|
|
5410.2.1
by Martin
Escape unprintable test result output rather than aborting selftest |
725 |
# GZ 2010-09-08: Really we don't want to be writing arbitrary bytes,
|
726 |
# so should swap to the plain codecs.StreamWriter
|
|
727 |
stream = osutils.UnicodeOrBytesToBytesWriter(encode, stream, |
|
728 |
"backslashreplace") |
|
|
4794.1.8
by Robert Collins
Move the passing of test logs to the result to be via the getDetails API and remove all public use of TestCase._get_log. |
729 |
stream.encoding = new_encoding |
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
730 |
self.stream = stream |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
731 |
self.descriptions = descriptions |
732 |
self.verbosity = verbosity |
|
|
1819.1.2
by Carl Friedrich Bolz
(lifeless, cfbolz, hpk): Add a benchmark output parameter to TextTestRunner. |
733 |
self._bench_history = bench_history |
|
4271.2.1
by Robert Collins
Move test prelude and suffix output to ExtendedTestResult |
734 |
self._strict = strict |
|
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
735 |
self._result_decorators = result_decorators or [] |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
736 |
|
737 |
def run(self, test): |
|
738 |
"Run the given test case or test suite."
|
|
|
2095.4.1
by Martin Pool
Better progress bars during tests |
739 |
if self.verbosity == 1: |
740 |
result_class = TextTestResult |
|
741 |
elif self.verbosity >= 2: |
|
742 |
result_class = VerboseTestResult |
|
|
4650.1.8
by Robert Collins
Push all starting up reporting down into startTestRun. |
743 |
original_result = result_class(self.stream, |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
744 |
self.descriptions, |
745 |
self.verbosity, |
|
746 |
bench_history=self._bench_history, |
|
|
4271.2.1
by Robert Collins
Move test prelude and suffix output to ExtendedTestResult |
747 |
strict=self._strict, |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
748 |
)
|
|
4650.1.8
by Robert Collins
Push all starting up reporting down into startTestRun. |
749 |
# Signal to result objects that look at stop early policy to stop,
|
750 |
original_result.stop_early = self.stop_on_failure |
|
751 |
result = original_result |
|
|
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
752 |
for decorator in self._result_decorators: |
|
4650.1.8
by Robert Collins
Push all starting up reporting down into startTestRun. |
753 |
result = decorator(result) |
754 |
result.stop_early = self.stop_on_failure |
|
755 |
result.startTestRun() |
|
756 |
try: |
|
757 |
test.run(result) |
|
758 |
finally: |
|
759 |
result.stopTestRun() |
|
760 |
# higher level code uses our extended protocol to determine
|
|
761 |
# what exit code to give.
|
|
762 |
return original_result |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
763 |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
764 |
|
|
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
765 |
def iter_suite_tests(suite): |
766 |
"""Return all tests in a suite, recursing through nested suites""" |
|
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
767 |
if isinstance(suite, unittest.TestCase): |
768 |
yield suite |
|
769 |
elif isinstance(suite, unittest.TestSuite): |
|
|
4205.3.1
by Robert Collins
Refactor tests.run_suite to be more data driven, making it shorter and able to be extended more easily. |
770 |
for item in suite: |
|
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
771 |
for r in iter_suite_tests(item): |
772 |
yield r |
|
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
773 |
else: |
774 |
raise Exception('unknown type %r for object %r' |
|
775 |
% (type(suite), suite)) |
|
|
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
776 |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
777 |
|
|
4794.1.2
by Robert Collins
First cut at testtools support: rename, remove TestCase.run() and change testcase tests to not assume the same instance runs (for cleaner testing at this point). |
778 |
TestSkipped = testtools.testcase.TestSkipped |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
779 |
|
780 |
||
|
2729.1.1
by Martin Pool
Add TestNotApplicable exception and handling of it; document test parameterization |
781 |
class TestNotApplicable(TestSkipped): |
782 |
"""A test is not applicable to the situation where it was run. |
|
783 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
784 |
This is only normally raised by parameterized tests, if they find that
|
785 |
the instance they're constructed upon does not support one aspect
|
|
|
2729.1.1
by Martin Pool
Add TestNotApplicable exception and handling of it; document test parameterization |
786 |
of its interface.
|
787 |
"""
|
|
788 |
||
789 |
||
|
4794.1.8
by Robert Collins
Move the passing of test logs to the result to be via the getDetails API and remove all public use of TestCase._get_log. |
790 |
# traceback._some_str fails to format exceptions that have the default
|
791 |
# __str__ which does an implicit ascii conversion. However, repr() on those
|
|
792 |
# objects works, for all that its not quite what the doctor may have ordered.
|
|
793 |
def _clever_some_str(value): |
|
794 |
try: |
|
795 |
return str(value) |
|
796 |
except: |
|
797 |
try: |
|
798 |
return repr(value).replace('\\n', '\n') |
|
799 |
except: |
|
800 |
return '<unprintable %s object>' % type(value).__name__ |
|
801 |
||
802 |
traceback._some_str = _clever_some_str |
|
803 |
||
804 |
||
|
4794.1.16
by Robert Collins
Clearer comment on KnownFailure deprecation. |
805 |
# deprecated - use self.knownFailure(), or self.expectFailure.
|
|
4794.1.15
by Robert Collins
Review feedback. |
806 |
KnownFailure = testtools.testcase._ExpectedFailure |
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
807 |
|
808 |
||
|
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
809 |
class UnavailableFeature(Exception): |
810 |
"""A feature required for this test was not available. |
|
811 |
||
|
4780.1.1
by Robert Collins
Make addUnsupported more compatible with other TestResults. |
812 |
This can be considered a specialised form of SkippedTest.
|
813 |
||
|
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
814 |
The feature should be used to construct the exception.
|
815 |
"""
|
|
816 |
||
817 |
||
|
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 |
818 |
class StringIOWrapper(object): |
819 |
"""A wrapper around cStringIO which just adds an encoding attribute. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
820 |
|
|
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 |
821 |
Internally we can check sys.stdout to see what the output encoding
|
822 |
should be. However, cStringIO has no encoding attribute that we can
|
|
823 |
set. So we wrap it instead.
|
|
824 |
"""
|
|
825 |
encoding='ascii' |
|
826 |
_cstring = None |
|
827 |
||
828 |
def __init__(self, s=None): |
|
829 |
if s is not None: |
|
830 |
self.__dict__['_cstring'] = StringIO(s) |
|
831 |
else: |
|
832 |
self.__dict__['_cstring'] = StringIO() |
|
833 |
||
834 |
def __getattr__(self, name, getattr=getattr): |
|
835 |
return getattr(self.__dict__['_cstring'], name) |
|
836 |
||
837 |
def __setattr__(self, name, val): |
|
838 |
if name == 'encoding': |
|
839 |
self.__dict__['encoding'] = val |
|
840 |
else: |
|
841 |
return setattr(self._cstring, name, val) |
|
842 |
||
843 |
||
|
4449.3.18
by Martin Pool
Fuse CLIUIFactory and TextUIFactory and deprecate the old name |
844 |
class TestUIFactory(TextUIFactory): |
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
845 |
"""A UI Factory for testing. |
846 |
||
847 |
Hide the progress bar but emit note()s.
|
|
848 |
Redirect stdin.
|
|
849 |
Allows get_password to be tested without real tty attached.
|
|
|
4580.2.1
by Martin Pool
TestUIFactory no longer needs to pretend to be its own ProgressView |
850 |
|
851 |
See also CannedInputUIFactory which lets you provide programmatic input in
|
|
852 |
a structured way.
|
|
|
2294.4.1
by Vincent Ladeuil
Add a UIFactory.get_login method, fix tests. |
853 |
"""
|
|
4580.3.9
by Martin Pool
doc |
854 |
# TODO: Capture progress events at the model level and allow them to be
|
855 |
# observed by tests that care.
|
|
|
4580.3.11
by Martin Pool
merge trunk |
856 |
#
|
|
4580.2.1
by Martin Pool
TestUIFactory no longer needs to pretend to be its own ProgressView |
857 |
# XXX: Should probably unify more with CannedInputUIFactory or a
|
858 |
# particular configuration of TextUIFactory, or otherwise have a clearer
|
|
859 |
# idea of how they're supposed to be different.
|
|
|
5243.1.2
by Martin
Point launchpad links in comments at production server rather than edge |
860 |
# See https://bugs.launchpad.net/bzr/+bug/408213
|
|
2294.4.1
by Vincent Ladeuil
Add a UIFactory.get_login method, fix tests. |
861 |
|
|
4237.2.1
by Vincent Ladeuil
Stop requiring a tty for CLIUIFactory and derivatives. |
862 |
def __init__(self, stdout=None, stderr=None, stdin=None): |
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
863 |
if stdin is not None: |
864 |
# We use a StringIOWrapper to be able to test various
|
|
865 |
# encodings, but the user is still responsible to
|
|
866 |
# encode the string and to set the encoding attribute
|
|
867 |
# of StringIOWrapper.
|
|
|
4237.2.1
by Vincent Ladeuil
Stop requiring a tty for CLIUIFactory and derivatives. |
868 |
stdin = StringIOWrapper(stdin) |
869 |
super(TestUIFactory, self).__init__(stdin, stdout, stderr) |
|
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
870 |
|
|
4237.2.1
by Vincent Ladeuil
Stop requiring a tty for CLIUIFactory and derivatives. |
871 |
def get_non_echoed_password(self): |
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
872 |
"""Get password from stdin without trying to handle the echo mode""" |
873 |
password = self.stdin.readline() |
|
874 |
if not password: |
|
875 |
raise EOFError |
|
876 |
if password[-1] == '\n': |
|
877 |
password = password[:-1] |
|
878 |
return password |
|
|
2294.4.1
by Vincent Ladeuil
Add a UIFactory.get_login method, fix tests. |
879 |
|
|
4463.1.2
by Martin Pool
merge trunk |
880 |
def make_progress_view(self): |
881 |
return NullProgressView() |
|
882 |
||
|
2294.4.1
by Vincent Ladeuil
Add a UIFactory.get_login method, fix tests. |
883 |
|
|
5574.6.8
by Vincent Ladeuil
Fix typo, rename BzrDocTestSuite to IsolatedDocTestSuite to dodge the name space controversy and make the intent clearer, add an indirection for setUp/tearDown to prepare more isolation for doctests. |
884 |
def isolated_doctest_setUp(test): |
885 |
override_os_environ(test) |
|
886 |
||
887 |
||
888 |
def isolated_doctest_tearDown(test): |
|
889 |
restore_os_environ(test) |
|
890 |
||
891 |
||
892 |
def IsolatedDocTestSuite(*args, **kwargs): |
|
|
5574.7.3
by Vincent Ladeuil
Some test infrastructure for tests.DocTestSuite. |
893 |
"""Overrides doctest.DocTestSuite to handle isolation. |
894 |
||
895 |
The method is really a factory and users are expected to use it as such.
|
|
896 |
"""
|
|
|
5574.6.8
by Vincent Ladeuil
Fix typo, rename BzrDocTestSuite to IsolatedDocTestSuite to dodge the name space controversy and make the intent clearer, add an indirection for setUp/tearDown to prepare more isolation for doctests. |
897 |
|
898 |
kwargs['setUp'] = isolated_doctest_setUp |
|
899 |
kwargs['tearDown'] = isolated_doctest_tearDown |
|
|
5574.7.3
by Vincent Ladeuil
Some test infrastructure for tests.DocTestSuite. |
900 |
return doctest.DocTestSuite(*args, **kwargs) |
901 |
||
902 |
||
|
4794.1.1
by Robert Collins
Derive bzr's TestCase from testtools.testcase.TestCase. |
903 |
class TestCase(testtools.TestCase): |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
904 |
"""Base class for bzr unit tests. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
905 |
|
906 |
Tests that need access to disk resources should subclass
|
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
907 |
TestCaseInTempDir not TestCase.
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
908 |
|
909 |
Error and debug log messages are redirected from their usual
|
|
910 |
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. |
911 |
retrieved by _get_log(). We use a real OS file, not an in-memory object,
|
912 |
so that it can also capture file IO. When the test completes this file
|
|
913 |
is read into memory and removed from disk.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
914 |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
915 |
There are also convenience functions to invoke bzr's command-line
|
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
916 |
routine, and to build and check bzr trees.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
917 |
|
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
918 |
In addition to the usual method of overriding tearDown(), this class also
|
|
5425.2.2
by Andrew Bennetts
Remove addCleanup (testtools implements this for us), remove some unused imports. |
919 |
allows subclasses to register cleanup functions via addCleanup, which are
|
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
920 |
run in order as the object is torn down. It's less likely this will be
|
921 |
accidentally overlooked.
|
|
922 |
"""
|
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
923 |
|
|
5404.1.1
by Andrew Bennetts
Use StringIO rather than real files on disk for log files in tests. |
924 |
_log_file = None |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
925 |
# record lsprof data when performing benchmark calls.
|
926 |
_gather_lsprof_in_benchmarks = False |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
927 |
|
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
928 |
def __init__(self, methodName='testMethod'): |
929 |
super(TestCase, self).__init__(methodName) |
|
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
930 |
self._directory_isolation = True |
|
4794.1.2
by Robert Collins
First cut at testtools support: rename, remove TestCase.run() and change testcase tests to not assume the same instance runs (for cleaner testing at this point). |
931 |
self.exception_handlers.insert(0, |
932 |
(UnavailableFeature, self._do_unsupported_or_skip)) |
|
933 |
self.exception_handlers.insert(0, |
|
934 |
(TestNotApplicable, self._do_not_applicable)) |
|
|
4794.1.8
by Robert Collins
Move the passing of test logs to the result to be via the getDetails API and remove all public use of TestCase._get_log. |
935 |
|
936 |
def setUp(self): |
|
937 |
super(TestCase, self).setUp() |
|
938 |
for feature in getattr(self, '_test_needs_features', []): |
|
939 |
self.requireFeature(feature) |
|
|
4794.1.7
by Robert Collins
Remove references to _get_log from test_selftest. |
940 |
self._log_contents = None |
|
4794.1.6
by Robert Collins
Add a details object to bzr tests containing the test log. May currently result in failures show the log twice (but will now show the log in --subunit mode [which includes --parallel]). |
941 |
self.addDetail("log", content.Content(content.ContentType("text", |
942 |
"plain", {"charset": "utf8"}), |
|
|
5387.2.3
by John Arbash Meinel
Remove unnecessary change. |
943 |
lambda:[self._get_log(keep_log_file=True)])) |
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
944 |
self._cleanEnvironment() |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
945 |
self._silenceUI() |
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
946 |
self._startLogFile() |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
947 |
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) |
948 |
self._benchtime = None |
|
2423.1.1
by Martin Pool
fix import order dependency that broke benchmarks |
949 |
self._clear_hooks() |
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
950 |
self._track_transports() |
|
3331.4.1
by Robert Collins
* -Dlock when passed to the selftest (e.g. ``bzr -Dlock selftest``) will |
951 |
self._track_locks() |
|
2560.1.1
by Robert Collins
Make debug.debug_flags be isolated for all tests. |
952 |
self._clear_debug_flags() |
|
5463.1.1
by Martin Pool
Isolate bzrlib.trace._verbosity_level per test case |
953 |
# Isolate global verbosity level, to make sure it's reproducible
|
954 |
# between tests. We should get rid of this altogether: bug 656694. --
|
|
955 |
# mbp 20101008
|
|
956 |
self.overrideAttr(bzrlib.trace, '_verbosity_level', 0) |
|
|
3406.1.2
by Vincent Ladeuil
Fix as per Robert's review. |
957 |
|
|
4084.2.1
by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects. |
958 |
def debug(self): |
959 |
# debug a frame up.
|
|
960 |
import pdb |
|
961 |
pdb.Pdb().set_trace(sys._getframe().f_back) |
|
962 |
||
|
5387.2.1
by John Arbash Meinel
Filter out the 'log' information for skipped, xfail, and n/a. |
963 |
def discardDetail(self, name): |
964 |
"""Extend the addDetail, getDetails api so we can remove a detail. |
|
965 |
||
966 |
eg. bzr always adds the 'log' detail at startup, but we don't want to
|
|
967 |
include it for skipped, xfail, etc tests.
|
|
968 |
||
969 |
It is safe to call this for a detail that doesn't exist, in case this
|
|
970 |
gets called multiple times.
|
|
971 |
"""
|
|
972 |
# We cheat. details is stored in __details which means we shouldn't
|
|
973 |
# touch it. but getDetails() returns the dict directly, so we can
|
|
974 |
# mutate it.
|
|
975 |
details = self.getDetails() |
|
976 |
if name in details: |
|
977 |
del details[name] |
|
978 |
||
|
2560.1.1
by Robert Collins
Make debug.debug_flags be isolated for all tests. |
979 |
def _clear_debug_flags(self): |
980 |
"""Prevent externally set debug flags affecting tests. |
|
|
3882.6.20
by John Arbash Meinel
Clear out the InventoryEntry caches as part of the test suite. |
981 |
|
|
2560.1.1
by Robert Collins
Make debug.debug_flags be isolated for all tests. |
982 |
Tests that want to use debug flags can just set them in the
|
983 |
debug_flags set during setup/teardown.
|
|
984 |
"""
|
|
|
4985.1.5
by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity |
985 |
# Start with a copy of the current debug flags we can safely modify.
|
986 |
self.overrideAttr(debug, 'debug_flags', set(debug.debug_flags)) |
|
|
3390.1.1
by Andrew Bennetts
Add --debugflags/-E option to selftest. |
987 |
if 'allow_debug' not in selftest_debug_flags: |
|
3302.2.1
by Andrew Bennetts
Add -Dselftest_debug debug flag. |
988 |
debug.debug_flags.clear() |
|
4523.4.12
by John Arbash Meinel
Update the test_selftest tests so that they pass again. |
989 |
if 'disable_lock_checks' not in selftest_debug_flags: |
990 |
debug.debug_flags.add('strict_locks') |
|
|
2423.1.1
by Martin Pool
fix import order dependency that broke benchmarks |
991 |
|
992 |
def _clear_hooks(self): |
|
|
2245.1.1
by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers |
993 |
# prevent hooks affecting tests
|
|
5436.2.1
by Andrew Bennetts
Add bzrlib.pyutils, which has get_named_object, a wrapper around __import__. |
994 |
known_hooks = hooks.known_hooks |
|
4119.3.1
by Robert Collins
Create a single registry of all Hooks classes, removing the test suite knowledge of such hooks and allowing plugins to sensibly and safely define new hooks. |
995 |
self._preserved_hooks = {} |
|
5436.2.1
by Andrew Bennetts
Add bzrlib.pyutils, which has get_named_object, a wrapper around __import__. |
996 |
for key, (parent, name) in known_hooks.iter_parent_objects(): |
997 |
current_hooks = getattr(parent, name) |
|
|
4119.3.1
by Robert Collins
Create a single registry of all Hooks classes, removing the test suite knowledge of such hooks and allowing plugins to sensibly and safely define new hooks. |
998 |
self._preserved_hooks[parent] = (name, current_hooks) |
|
2245.1.1
by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers |
999 |
self.addCleanup(self._restoreHooks) |
|
5436.2.1
by Andrew Bennetts
Add bzrlib.pyutils, which has get_named_object, a wrapper around __import__. |
1000 |
for key, (parent, name) in known_hooks.iter_parent_objects(): |
1001 |
factory = known_hooks.get(key) |
|
|
4119.3.1
by Robert Collins
Create a single registry of all Hooks classes, removing the test suite knowledge of such hooks and allowing plugins to sensibly and safely define new hooks. |
1002 |
setattr(parent, name, factory()) |
|
4160.2.4
by Andrew Bennetts
Use BzrDir pre_open hook to jail request code from accessing transports other than the backing transport. |
1003 |
# this hook should always be installed
|
1004 |
request._install_hook() |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1005 |
|
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
1006 |
def disable_directory_isolation(self): |
1007 |
"""Turn off directory isolation checks.""" |
|
1008 |
self._directory_isolation = False |
|
1009 |
||
1010 |
def enable_directory_isolation(self): |
|
1011 |
"""Enable directory isolation checks.""" |
|
1012 |
self._directory_isolation = True |
|
1013 |
||
|
2095.4.1
by Martin Pool
Better progress bars during tests |
1014 |
def _silenceUI(self): |
1015 |
"""Turn off UI for duration of test""" |
|
1016 |
# by default the UI is off; tests can turn it on if they want it.
|
|
|
4985.1.5
by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity |
1017 |
self.overrideAttr(ui, 'ui_factory', ui.SilentUIFactory()) |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
1018 |
|
|
3331.4.1
by Robert Collins
* -Dlock when passed to the selftest (e.g. ``bzr -Dlock selftest``) will |
1019 |
def _check_locks(self): |
1020 |
"""Check that all lock take/release actions have been paired.""" |
|
|
4523.4.9
by John Arbash Meinel
Change the flags around a bit. |
1021 |
# We always check for mismatched locks. If a mismatch is found, we
|
1022 |
# fail unless -Edisable_lock_checks is supplied to selftest, in which
|
|
1023 |
# case we just print a warning.
|
|
|
3331.4.1
by Robert Collins
* -Dlock when passed to the selftest (e.g. ``bzr -Dlock selftest``) will |
1024 |
# unhook:
|
1025 |
acquired_locks = [lock for action, lock in self._lock_actions |
|
|
4327.1.4
by Vincent Ladeuil
Fix lock test failures by taking lock breaking into account. |
1026 |
if action == 'acquired'] |
|
3331.4.1
by Robert Collins
* -Dlock when passed to the selftest (e.g. ``bzr -Dlock selftest``) will |
1027 |
released_locks = [lock for action, lock in self._lock_actions |
|
4327.1.4
by Vincent Ladeuil
Fix lock test failures by taking lock breaking into account. |
1028 |
if action == 'released'] |
1029 |
broken_locks = [lock for action, lock in self._lock_actions |
|
1030 |
if action == 'broken'] |
|
|
3331.4.1
by Robert Collins
* -Dlock when passed to the selftest (e.g. ``bzr -Dlock selftest``) will |
1031 |
# trivially, given the tests for lock acquistion and release, if we
|
|
4327.1.4
by Vincent Ladeuil
Fix lock test failures by taking lock breaking into account. |
1032 |
# have as many in each list, it should be ok. Some lock tests also
|
1033 |
# break some locks on purpose and should be taken into account by
|
|
1034 |
# considering that breaking a lock is just a dirty way of releasing it.
|
|
1035 |
if len(acquired_locks) != (len(released_locks) + len(broken_locks)): |
|
1036 |
message = ('Different number of acquired and ' |
|
1037 |
'released or broken locks. (%s, %s + %s)' % |
|
1038 |
(acquired_locks, released_locks, broken_locks)) |
|
|
4523.4.9
by John Arbash Meinel
Change the flags around a bit. |
1039 |
if not self._lock_check_thorough: |
1040 |
# Rather than fail, just warn
|
|
1041 |
print "Broken test %s: %s" % (self, message) |
|
1042 |
return
|
|
|
3331.4.1
by Robert Collins
* -Dlock when passed to the selftest (e.g. ``bzr -Dlock selftest``) will |
1043 |
self.fail(message) |
1044 |
||
1045 |
def _track_locks(self): |
|
1046 |
"""Track lock activity during tests.""" |
|
1047 |
self._lock_actions = [] |
|
|
4523.4.9
by John Arbash Meinel
Change the flags around a bit. |
1048 |
if 'disable_lock_checks' in selftest_debug_flags: |
1049 |
self._lock_check_thorough = False |
|
1050 |
else: |
|
1051 |
self._lock_check_thorough = True |
|
|
4985.2.1
by Vincent Ladeuil
Deploy addAttrCleanup on the whole test suite. |
1052 |
|
|
3331.4.1
by Robert Collins
* -Dlock when passed to the selftest (e.g. ``bzr -Dlock selftest``) will |
1053 |
self.addCleanup(self._check_locks) |
|
4327.1.4
by Vincent Ladeuil
Fix lock test failures by taking lock breaking into account. |
1054 |
_mod_lock.Lock.hooks.install_named_hook('lock_acquired', |
1055 |
self._lock_acquired, None) |
|
1056 |
_mod_lock.Lock.hooks.install_named_hook('lock_released', |
|
1057 |
self._lock_released, None) |
|
1058 |
_mod_lock.Lock.hooks.install_named_hook('lock_broken', |
|
1059 |
self._lock_broken, None) |
|
|
3331.4.1
by Robert Collins
* -Dlock when passed to the selftest (e.g. ``bzr -Dlock selftest``) will |
1060 |
|
1061 |
def _lock_acquired(self, result): |
|
1062 |
self._lock_actions.append(('acquired', result)) |
|
1063 |
||
1064 |
def _lock_released(self, result): |
|
1065 |
self._lock_actions.append(('released', result)) |
|
1066 |
||
|
4327.1.4
by Vincent Ladeuil
Fix lock test failures by taking lock breaking into account. |
1067 |
def _lock_broken(self, result): |
1068 |
self._lock_actions.append(('broken', result)) |
|
1069 |
||
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
1070 |
def permit_dir(self, name): |
1071 |
"""Permit a directory to be used by this test. See permit_url.""" |
|
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
1072 |
name_transport = _mod_transport.get_transport(name) |
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
1073 |
self.permit_url(name) |
1074 |
self.permit_url(name_transport.base) |
|
1075 |
||
1076 |
def permit_url(self, url): |
|
1077 |
"""Declare that url is an ok url to use in this test. |
|
1078 |
|
|
1079 |
Do this for memory transports, temporary test directory etc.
|
|
1080 |
|
|
1081 |
Do not do this for the current working directory, /tmp, or any other
|
|
1082 |
preexisting non isolated url.
|
|
1083 |
"""
|
|
1084 |
if not url.endswith('/'): |
|
1085 |
url += '/' |
|
1086 |
self._bzr_selftest_roots.append(url) |
|
1087 |
||
1088 |
def permit_source_tree_branch_repo(self): |
|
1089 |
"""Permit the source tree bzr is running from to be opened. |
|
1090 |
||
1091 |
Some code such as bzrlib.version attempts to read from the bzr branch
|
|
1092 |
that bzr is executing from (if any). This method permits that directory
|
|
1093 |
to be used in the test suite.
|
|
1094 |
"""
|
|
1095 |
path = self.get_source_path() |
|
|
4691.2.5
by Robert Collins
Handle attempted directory access to the source tree by tracing rather than post-success inspection. |
1096 |
self.record_directory_isolation() |
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
1097 |
try: |
1098 |
try: |
|
|
4691.2.5
by Robert Collins
Handle attempted directory access to the source tree by tracing rather than post-success inspection. |
1099 |
workingtree.WorkingTree.open(path) |
|
4691.2.4
by Robert Collins
Handle NotBranchError when looking up source tree. |
1100 |
except (errors.NotBranchError, errors.NoWorkingTree): |
|
4797.72.1
by Vincent Ladeuil
Skip tests that needs a bzr source tree when there isn't one. |
1101 |
raise TestSkipped('Needs a working tree of bzr sources') |
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
1102 |
finally: |
1103 |
self.enable_directory_isolation() |
|
1104 |
||
1105 |
def _preopen_isolate_transport(self, transport): |
|
1106 |
"""Check that all transport openings are done in the test work area.""" |
|
|
4634.43.20
by Andrew Bennetts
Merge from bzr.dev, resolving conflicts. |
1107 |
while isinstance(transport, pathfilter.PathFilteringTransport): |
1108 |
# Unwrap pathfiltered transports
|
|
1109 |
transport = transport.server.backing_transport.clone( |
|
1110 |
transport._filter('.')) |
|
1111 |
url = transport.base |
|
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
1112 |
# ReadonlySmartTCPServer_for_testing decorates the backing transport
|
1113 |
# urls it is given by prepending readonly+. This is appropriate as the
|
|
1114 |
# client shouldn't know that the server is readonly (or not readonly).
|
|
1115 |
# We could register all servers twice, with readonly+ prepending, but
|
|
1116 |
# that makes for a long list; this is about the same but easier to
|
|
1117 |
# read.
|
|
1118 |
if url.startswith('readonly+'): |
|
1119 |
url = url[len('readonly+'):] |
|
1120 |
self._preopen_isolate_url(url) |
|
1121 |
||
1122 |
def _preopen_isolate_url(self, url): |
|
1123 |
if not self._directory_isolation: |
|
1124 |
return
|
|
|
4691.2.5
by Robert Collins
Handle attempted directory access to the source tree by tracing rather than post-success inspection. |
1125 |
if self._directory_isolation == 'record': |
1126 |
self._bzr_selftest_roots.append(url) |
|
1127 |
return
|
|
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
1128 |
# This prevents all transports, including e.g. sftp ones backed on disk
|
1129 |
# from working unless they are explicitly granted permission. We then
|
|
1130 |
# depend on the code that sets up test transports to check that they are
|
|
1131 |
# appropriately isolated and enable their use by calling
|
|
1132 |
# self.permit_transport()
|
|
1133 |
if not osutils.is_inside_any(self._bzr_selftest_roots, url): |
|
1134 |
raise errors.BzrError("Attempt to escape test isolation: %r %r" |
|
1135 |
% (url, self._bzr_selftest_roots)) |
|
1136 |
||
|
4691.2.5
by Robert Collins
Handle attempted directory access to the source tree by tracing rather than post-success inspection. |
1137 |
def record_directory_isolation(self): |
1138 |
"""Gather accessed directories to permit later access. |
|
1139 |
|
|
1140 |
This is used for tests that access the branch bzr is running from.
|
|
1141 |
"""
|
|
1142 |
self._directory_isolation = "record" |
|
1143 |
||
|
4659.1.2
by Robert Collins
Refactor creation and shutdown of test servers to use a common helper, |
1144 |
def start_server(self, transport_server, backing_server=None): |
1145 |
"""Start transport_server for this test. |
|
1146 |
||
1147 |
This starts the server, registers a cleanup for it and permits the
|
|
1148 |
server's urls to be used.
|
|
1149 |
"""
|
|
1150 |
if backing_server is None: |
|
|
4934.3.3
by Martin Pool
Rename Server.setUp to Server.start_server |
1151 |
transport_server.start_server() |
|
4659.1.2
by Robert Collins
Refactor creation and shutdown of test servers to use a common helper, |
1152 |
else: |
|
4934.3.3
by Martin Pool
Rename Server.setUp to Server.start_server |
1153 |
transport_server.start_server(backing_server) |
|
4934.3.1
by Martin Pool
Rename Server.tearDown to .stop_server |
1154 |
self.addCleanup(transport_server.stop_server) |
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
1155 |
# Obtain a real transport because if the server supplies a password, it
|
1156 |
# will be hidden from the base on the client side.
|
|
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
1157 |
t = _mod_transport.get_transport(transport_server.get_url()) |
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
1158 |
# Some transport servers effectively chroot the backing transport;
|
1159 |
# others like SFTPServer don't - users of the transport can walk up the
|
|
1160 |
# transport to read the entire backing transport. This wouldn't matter
|
|
1161 |
# except that the workdir tests are given - and that they expect the
|
|
1162 |
# server's url to point at - is one directory under the safety net. So
|
|
1163 |
# Branch operations into the transport will attempt to walk up one
|
|
1164 |
# directory. Chrooting all servers would avoid this but also mean that
|
|
1165 |
# we wouldn't be testing directly against non-root urls. Alternatively
|
|
1166 |
# getting the test framework to start the server with a backing server
|
|
1167 |
# at the actual safety net directory would work too, but this then
|
|
1168 |
# means that the self.get_url/self.get_transport methods would need
|
|
1169 |
# to transform all their results. On balance its cleaner to handle it
|
|
1170 |
# here, and permit a higher url when we have one of these transports.
|
|
1171 |
if t.base.endswith('/work/'): |
|
1172 |
# we have safety net/test root/work
|
|
1173 |
t = t.clone('../..') |
|
|
5017.3.18
by Vincent Ladeuil
Move SmartTCPServer_for_testing and friends to bzrlib.tests.test_server |
1174 |
elif isinstance(transport_server, |
1175 |
test_server.SmartTCPServer_for_testing): |
|
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
1176 |
# The smart server adds a path similar to work, which is traversed
|
1177 |
# up from by the client. But the server is chrooted - the actual
|
|
1178 |
# backing transport is not escaped from, and VFS requests to the
|
|
1179 |
# root will error (because they try to escape the chroot).
|
|
1180 |
t2 = t.clone('..') |
|
1181 |
while t2.base != t.base: |
|
1182 |
t = t2 |
|
1183 |
t2 = t.clone('..') |
|
1184 |
self.permit_url(t.base) |
|
1185 |
||
1186 |
def _track_transports(self): |
|
1187 |
"""Install checks for transport usage.""" |
|
1188 |
# TestCase has no safe place it can write to.
|
|
1189 |
self._bzr_selftest_roots = [] |
|
1190 |
# Currently the easiest way to be sure that nothing is going on is to
|
|
1191 |
# hook into bzr dir opening. This leaves a small window of error for
|
|
1192 |
# transport tests, but they are well known, and we can improve on this
|
|
1193 |
# step.
|
|
1194 |
bzrdir.BzrDir.hooks.install_named_hook("pre_open", |
|
1195 |
self._preopen_isolate_transport, "Check bzr directories are safe.") |
|
|
4659.1.2
by Robert Collins
Refactor creation and shutdown of test servers to use a common helper, |
1196 |
|
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
1197 |
def _ndiff_strings(self, a, b): |
|
1185.16.67
by Martin Pool
- assertEqualDiff handles strings without trailing newline |
1198 |
"""Return ndiff between two strings containing lines. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1199 |
|
|
1185.16.67
by Martin Pool
- assertEqualDiff handles strings without trailing newline |
1200 |
A trailing newline is added if missing to make the strings
|
1201 |
print properly."""
|
|
1202 |
if b and b[-1] != '\n': |
|
1203 |
b += '\n' |
|
1204 |
if a and a[-1] != '\n': |
|
1205 |
a += '\n' |
|
|
1185.16.21
by Martin Pool
- tweak diff shown by assertEqualDiff |
1206 |
difflines = difflib.ndiff(a.splitlines(True), |
1207 |
b.splitlines(True), |
|
1208 |
linejunk=lambda x: False, |
|
1209 |
charjunk=lambda x: False) |
|
1210 |
return ''.join(difflines) |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1211 |
|
|
2255.2.190
by Martin Pool
assertEqual can take an option message |
1212 |
def assertEqual(self, a, b, message=''): |
|
2360.1.2
by John Arbash Meinel
Add an overzealous test, for Unicode support of _iter_changes. |
1213 |
try: |
1214 |
if a == b: |
|
1215 |
return
|
|
1216 |
except UnicodeError, e: |
|
1217 |
# If we can't compare without getting a UnicodeError, then
|
|
1218 |
# obviously they are different
|
|
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
1219 |
trace.mutter('UnicodeError: %s', e) |
|
2255.2.190
by Martin Pool
assertEqual can take an option message |
1220 |
if message: |
1221 |
message += '\n' |
|
1222 |
raise AssertionError("%snot equal:\na = %s\nb = %s\n" |
|
1223 |
% (message, |
|
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
1224 |
pprint.pformat(a), pprint.pformat(b))) |
|
2255.2.185
by Martin Pool
assertEqual uses pformat to show results |
1225 |
|
1226 |
assertEquals = assertEqual |
|
1227 |
||
|
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. |
1228 |
def assertEqualDiff(self, a, b, message=None): |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
1229 |
"""Assert two texts are equal, if not raise an exception. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1230 |
|
1231 |
This is intended for use with multi-line strings where it can
|
|
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
1232 |
be hard to find the differences by eye.
|
1233 |
"""
|
|
1234 |
# TODO: perhaps override assertEquals to call this for strings?
|
|
1235 |
if a == b: |
|
1236 |
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. |
1237 |
if message is None: |
1238 |
message = "texts not equal:\n" |
|
|
4680.1.1
by Vincent Ladeuil
Surprisingly, assertEqualDiff was wrong. |
1239 |
if a + '\n' == b: |
1240 |
message = 'first string is missing a final newline.\n' |
|
|
3468.2.2
by Martin Pool
Better message re final newlines from assertEqualDiff |
1241 |
if a == b + '\n': |
|
4680.1.2
by Vincent Ladeuil
Blessed be the tests that protect the imprudent :) |
1242 |
message = 'second string is missing a final newline.\n' |
|
2555.3.3
by Martin Pool
Simple lock tracing in LockDir |
1243 |
raise AssertionError(message + |
1244 |
self._ndiff_strings(a, b)) |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1245 |
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
1246 |
def assertEqualMode(self, mode, mode_test): |
1247 |
self.assertEqual(mode, mode_test, |
|
1248 |
'mode mismatch %o != %o' % (mode, mode_test)) |
|
1249 |
||
|
4807.2.2
by John Arbash Meinel
Move all the stat comparison and platform checkning code to assertEqualStat. |
1250 |
def assertEqualStat(self, expected, actual): |
|
3709.3.2
by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat. |
1251 |
"""assert that expected and actual are the same stat result. |
1252 |
||
1253 |
:param expected: A stat result.
|
|
1254 |
:param actual: A stat result.
|
|
1255 |
:raises AssertionError: If the expected and actual stat values differ
|
|
1256 |
other than by atime.
|
|
1257 |
"""
|
|
|
4789.24.1
by John Arbash Meinel
os.lstat() != os.fstat() for the st_ino field on windows |
1258 |
self.assertEqual(expected.st_size, actual.st_size, |
1259 |
'st_size did not match') |
|
1260 |
self.assertEqual(expected.st_mtime, actual.st_mtime, |
|
1261 |
'st_mtime did not match') |
|
1262 |
self.assertEqual(expected.st_ctime, actual.st_ctime, |
|
1263 |
'st_ctime did not match') |
|
|
4807.2.3
by John Arbash Meinel
It helps if you get the platform check right. |
1264 |
if sys.platform != 'win32': |
|
4807.2.2
by John Arbash Meinel
Move all the stat comparison and platform checkning code to assertEqualStat. |
1265 |
# On Win32 both 'dev' and 'ino' cannot be trusted. In python2.4 it
|
1266 |
# is 'dev' that varies, in python 2.5 (6?) it is st_ino that is
|
|
1267 |
# odd. Regardless we shouldn't actually try to assert anything
|
|
1268 |
# about their values
|
|
1269 |
self.assertEqual(expected.st_dev, actual.st_dev, |
|
1270 |
'st_dev did not match') |
|
|
4789.24.1
by John Arbash Meinel
os.lstat() != os.fstat() for the st_ino field on windows |
1271 |
self.assertEqual(expected.st_ino, actual.st_ino, |
1272 |
'st_ino did not match') |
|
1273 |
self.assertEqual(expected.st_mode, actual.st_mode, |
|
1274 |
'st_mode did not match') |
|
|
3709.3.2
by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat. |
1275 |
|
|
4144.1.1
by Robert Collins
New assertLength method based on one Martin has squirreled away somewhere. |
1276 |
def assertLength(self, length, obj_with_len): |
1277 |
"""Assert that obj_with_len is of length length.""" |
|
1278 |
if len(obj_with_len) != length: |
|
1279 |
self.fail("Incorrect length: wanted %d, got %d for %r" % ( |
|
1280 |
length, len(obj_with_len), obj_with_len)) |
|
1281 |
||
|
4634.85.11
by Andrew Bennetts
Suppress most errors from Branch.unlock too. |
1282 |
def assertLogsError(self, exception_class, func, *args, **kwargs): |
1283 |
"""Assert that func(*args, **kwargs) quietly logs a specific exception. |
|
1284 |
"""
|
|
1285 |
captured = [] |
|
1286 |
orig_log_exception_quietly = trace.log_exception_quietly |
|
1287 |
try: |
|
1288 |
def capture(): |
|
1289 |
orig_log_exception_quietly() |
|
1290 |
captured.append(sys.exc_info()) |
|
1291 |
trace.log_exception_quietly = capture |
|
1292 |
func(*args, **kwargs) |
|
1293 |
finally: |
|
1294 |
trace.log_exception_quietly = orig_log_exception_quietly |
|
1295 |
self.assertLength(1, captured) |
|
1296 |
err = captured[0][1] |
|
1297 |
self.assertIsInstance(err, exception_class) |
|
1298 |
return err |
|
1299 |
||
|
2474.1.68
by John Arbash Meinel
Review feedback from Martin, mostly documentation updates. |
1300 |
def assertPositive(self, val): |
1301 |
"""Assert that val is greater than 0.""" |
|
1302 |
self.assertTrue(val > 0, 'expected a positive value, but got %s' % val) |
|
1303 |
||
1304 |
def assertNegative(self, val): |
|
1305 |
"""Assert that val is less than 0.""" |
|
1306 |
self.assertTrue(val < 0, 'expected a negative value, but got %s' % val) |
|
1307 |
||
|
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
1308 |
def assertStartsWith(self, s, prefix): |
1309 |
if not s.startswith(prefix): |
|
1310 |
raise AssertionError('string %r does not start with %r' % (s, prefix)) |
|
1311 |
||
1312 |
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. |
1313 |
"""Asserts that s ends with suffix.""" |
1314 |
if not s.endswith(suffix): |
|
|
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
1315 |
raise AssertionError('string %r does not end with %r' % (s, suffix)) |
|
1185.16.42
by Martin Pool
- Add assertContainsRe |
1316 |
|
|
3940.1.1
by Ian Clatworthy
support flags when asserting re's in tests |
1317 |
def assertContainsRe(self, haystack, needle_re, flags=0): |
|
1185.16.42
by Martin Pool
- Add assertContainsRe |
1318 |
"""Assert that a contains something matching a regular expression.""" |
|
3940.1.1
by Ian Clatworthy
support flags when asserting re's in tests |
1319 |
if not re.search(needle_re, haystack, flags): |
|
2555.3.1
by Martin Pool
Better messages from assertContainsRe |
1320 |
if '\n' in haystack or len(haystack) > 60: |
1321 |
# a long string, format it in a more readable way
|
|
1322 |
raise AssertionError( |
|
1323 |
'pattern "%s" not found in\n"""\\\n%s"""\n' |
|
1324 |
% (needle_re, haystack)) |
|
1325 |
else: |
|
1326 |
raise AssertionError('pattern "%s" not found in "%s"' |
|
1327 |
% (needle_re, haystack)) |
|
|
1442.1.70
by Robert Collins
Add assertFileEqual to TestCaseInTempDir. |
1328 |
|
|
3940.1.1
by Ian Clatworthy
support flags when asserting re's in tests |
1329 |
def assertNotContainsRe(self, haystack, needle_re, flags=0): |
|
1185.84.3
by Aaron Bentley
Hide diffs for old revisions in bundles |
1330 |
"""Assert that a does not match a regular expression""" |
|
3940.1.1
by Ian Clatworthy
support flags when asserting re's in tests |
1331 |
if re.search(needle_re, haystack, flags): |
|
1185.84.3
by Aaron Bentley
Hide diffs for old revisions in bundles |
1332 |
raise AssertionError('pattern "%s" found in "%s"' |
1333 |
% (needle_re, haystack)) |
|
1334 |
||
|
5017.2.1
by Martin Pool
Add assertContainsString |
1335 |
def assertContainsString(self, haystack, needle): |
1336 |
if haystack.find(needle) == -1: |
|
1337 |
self.fail("string %r not found in '''%s'''" % (needle, haystack)) |
|
1338 |
||
|
5598.1.1
by Soren Hansen
Fix PEP-8 violation in PythonVersionInfoBuilder's output |
1339 |
def assertNotContainsString(self, haystack, needle): |
1340 |
if haystack.find(needle) != -1: |
|
1341 |
self.fail("string %r found in '''%s'''" % (needle, haystack)) |
|
1342 |
||
|
1553.5.3
by Martin Pool
[patch] Rename TestCase.AssertSubset to assertSubset for consistency (Jan Hudec) |
1343 |
def assertSubset(self, sublist, superlist): |
|
1185.46.8
by Aaron Bentley
bzr add reports ignored patterns. |
1344 |
"""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) |
1345 |
missing = set(sublist) - set(superlist) |
|
1185.46.8
by Aaron Bentley
bzr add reports ignored patterns. |
1346 |
if len(missing) > 0: |
|
2695.1.4
by Martin Pool
Much faster assertSubset using sets, not O(n**2) |
1347 |
raise AssertionError("value(s) %r not present in container %r" % |
|
1185.46.8
by Aaron Bentley
bzr add reports ignored patterns. |
1348 |
(missing, superlist)) |
1349 |
||
|
2004.1.29
by v.ladeuil+lp at free
New tests for http range requests handling. |
1350 |
def assertListRaises(self, excClass, func, *args, **kwargs): |
1351 |
"""Fail unless excClass is raised when the iterator from func is used. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1352 |
|
|
2004.1.29
by v.ladeuil+lp at free
New tests for http range requests handling. |
1353 |
Many functions can return generators this makes sure
|
1354 |
to wrap them in a list() call to make sure the whole generator
|
|
1355 |
is run, and that the proper exception is raised.
|
|
1356 |
"""
|
|
1357 |
try: |
|
1358 |
list(func(*args, **kwargs)) |
|
|
3287.20.1
by John Arbash Meinel
Update assertListRaises so that it returns the exception. |
1359 |
except excClass, e: |
1360 |
return e |
|
|
2004.1.29
by v.ladeuil+lp at free
New tests for http range requests handling. |
1361 |
else: |
1362 |
if getattr(excClass,'__name__', None) is not None: |
|
1363 |
excName = excClass.__name__ |
|
1364 |
else: |
|
1365 |
excName = str(excClass) |
|
1366 |
raise self.failureException, "%s not raised" % excName |
|
1367 |
||
|
2399.1.7
by John Arbash Meinel
Cleanup bzrlib/benchmarks/* so that everything at least has a valid doc string. |
1368 |
def assertRaises(self, excClass, callableObj, *args, **kwargs): |
|
2323.5.5
by Martin Pool
override TestCase.assertRaises to return the exception |
1369 |
"""Assert that a callable raises a particular exception. |
1370 |
||
|
2323.5.9
by Martin Pool
Clear up assertRaises (r=robert) |
1371 |
: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. |
1372 |
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. |
1373 |
:param callableObj: A callable, will be passed ``*args`` and
|
1374 |
``**kwargs``.
|
|
|
2323.5.9
by Martin Pool
Clear up assertRaises (r=robert) |
1375 |
|
|
2323.5.5
by Martin Pool
override TestCase.assertRaises to return the exception |
1376 |
Returns the exception so that you can examine it.
|
1377 |
"""
|
|
1378 |
try: |
|
|
2399.1.10
by John Arbash Meinel
fix assertRaises to use the right parameter... |
1379 |
callableObj(*args, **kwargs) |
|
2323.5.5
by Martin Pool
override TestCase.assertRaises to return the exception |
1380 |
except excClass, e: |
1381 |
return e |
|
1382 |
else: |
|
1383 |
if getattr(excClass,'__name__', None) is not None: |
|
1384 |
excName = excClass.__name__ |
|
1385 |
else: |
|
|
2323.5.9
by Martin Pool
Clear up assertRaises (r=robert) |
1386 |
# probably a tuple
|
|
2323.5.5
by Martin Pool
override TestCase.assertRaises to return the exception |
1387 |
excName = str(excClass) |
1388 |
raise self.failureException, "%s not raised" % excName |
|
1389 |
||
|
2220.1.13
by Marius Kruger
Remove assertNone |
1390 |
def assertIs(self, left, right, message=None): |
|
1185.68.1
by Aaron Bentley
test transactions |
1391 |
if not (left is right): |
|
2220.1.13
by Marius Kruger
Remove assertNone |
1392 |
if message is not None: |
1393 |
raise AssertionError(message) |
|
1394 |
else: |
|
1395 |
raise AssertionError("%r is not %r." % (left, right)) |
|
1396 |
||
1397 |
def assertIsNot(self, left, right, message=None): |
|
1398 |
if (left is right): |
|
1399 |
if message is not None: |
|
1400 |
raise AssertionError(message) |
|
1401 |
else: |
|
1402 |
raise AssertionError("%r is %r." % (left, right)) |
|
|
2220.1.4
by Marius Kruger
* bzrlib/tests/__init__ |
1403 |
|
|
1530.1.21
by Robert Collins
Review feedback fixes. |
1404 |
def assertTransportMode(self, transport, path, mode): |
|
4031.3.1
by Frank Aspell
Fixing various typos |
1405 |
"""Fail if a path does not have mode "mode". |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1406 |
|
|
1651.1.3
by Martin Pool
Use transport._can_roundtrip_unix_modebits to decide whether to check transport results |
1407 |
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. |
1408 |
"""
|
|
1651.1.3
by Martin Pool
Use transport._can_roundtrip_unix_modebits to decide whether to check transport results |
1409 |
if not transport._can_roundtrip_unix_modebits(): |
|
1530.1.17
by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible. |
1410 |
return
|
1411 |
path_stat = transport.stat(path) |
|
1412 |
actual_mode = stat.S_IMODE(path_stat.st_mode) |
|
|
3508.1.22
by Vincent Ladeuil
Fix python2.4 failures. |
1413 |
self.assertEqual(mode, actual_mode, |
|
3508.1.15
by Vincent Ladeuil
Tweak chmod bits output for easier debug. |
1414 |
'mode of %r incorrect (%s != %s)' |
1415 |
% (path, oct(mode), oct(actual_mode))) |
|
|
1530.1.17
by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible. |
1416 |
|
|
2823.1.4
by Vincent Ladeuil
Use assertIsSameRealPath to avoid OSX aliasing (specifically /tmp |
1417 |
def assertIsSameRealPath(self, path1, path2): |
1418 |
"""Fail if path1 and path2 points to different files""" |
|
|
2823.1.11
by Vincent Ladeuil
Review feedback. |
1419 |
self.assertEqual(osutils.realpath(path1), |
1420 |
osutils.realpath(path2), |
|
1421 |
"apparent paths:\na = %s\nb = %s\n," % (path1, path2)) |
|
|
2823.1.4
by Vincent Ladeuil
Use assertIsSameRealPath to avoid OSX aliasing (specifically /tmp |
1422 |
|
|
4449.3.12
by Martin Pool
assertIsInstance can take an extra message |
1423 |
def assertIsInstance(self, obj, kls, msg=None): |
1424 |
"""Fail if obj is not an instance of kls |
|
1425 |
|
|
1426 |
:param msg: Supplementary message to show if the assertion fails.
|
|
1427 |
"""
|
|
|
1540.3.22
by Martin Pool
[patch] Add TestCase.assertIsInstance |
1428 |
if not isinstance(obj, kls): |
|
4449.3.12
by Martin Pool
assertIsInstance can take an extra message |
1429 |
m = "%r is an instance of %s rather than %s" % ( |
1430 |
obj, obj.__class__, kls) |
|
1431 |
if msg: |
|
1432 |
m += ": " + msg |
|
1433 |
self.fail(m) |
|
|
1540.3.22
by Martin Pool
[patch] Add TestCase.assertIsInstance |
1434 |
|
|
3173.1.10
by Martin Pool
Move assertFileEqual to TestCase base class as it's generally usable |
1435 |
def assertFileEqual(self, content, path): |
1436 |
"""Fail if path does not contain 'content'.""" |
|
1437 |
self.failUnlessExists(path) |
|
1438 |
f = file(path, 'rb') |
|
1439 |
try: |
|
1440 |
s = f.read() |
|
1441 |
finally: |
|
1442 |
f.close() |
|
1443 |
self.assertEqualDiff(content, s) |
|
1444 |
||
|
5131.2.1
by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings |
1445 |
def assertDocstring(self, expected_docstring, obj): |
1446 |
"""Fail if obj does not have expected_docstring""" |
|
1447 |
if __doc__ is None: |
|
1448 |
# With -OO the docstring should be None instead
|
|
1449 |
self.assertIs(obj.__doc__, None) |
|
1450 |
else: |
|
1451 |
self.assertEqual(expected_docstring, obj.__doc__) |
|
1452 |
||
|
3173.1.12
by Martin Pool
Add test_push_log_file |
1453 |
def failUnlessExists(self, path): |
1454 |
"""Fail unless path or paths, which may be abs or relative, exist.""" |
|
1455 |
if not isinstance(path, basestring): |
|
1456 |
for p in path: |
|
1457 |
self.failUnlessExists(p) |
|
1458 |
else: |
|
1459 |
self.failUnless(osutils.lexists(path),path+" does not exist") |
|
1460 |
||
1461 |
def failIfExists(self, path): |
|
1462 |
"""Fail if path or paths, which may be abs or relative, exist.""" |
|
1463 |
if not isinstance(path, basestring): |
|
1464 |
for p in path: |
|
1465 |
self.failIfExists(p) |
|
1466 |
else: |
|
1467 |
self.failIf(osutils.lexists(path),path+" exists") |
|
1468 |
||
|
2592.3.243
by Martin Pool
Rename TestCase._capture_warnings |
1469 |
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 |
1470 |
"""A helper for callDeprecated and applyDeprecated. |
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
1471 |
|
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1472 |
:param a_callable: A callable to call.
|
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
1473 |
:param args: The positional arguments for the callable
|
1474 |
: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 |
1475 |
: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. |
1476 |
a_callable(``*args``, ``**kwargs``).
|
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
1477 |
"""
|
1478 |
local_warnings = [] |
|
|
2067.3.3
by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes |
1479 |
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 |
1480 |
# we've hooked into a deprecation specific callpath,
|
1481 |
# only deprecations should getting sent via it.
|
|
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
1482 |
self.assertEqual(cls, DeprecationWarning) |
1483 |
local_warnings.append(msg) |
|
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1484 |
original_warning_method = symbol_versioning.warn |
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
1485 |
symbol_versioning.set_warning_method(capture_warnings) |
1486 |
try: |
|
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1487 |
result = a_callable(*args, **kwargs) |
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
1488 |
finally: |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1489 |
symbol_versioning.set_warning_method(original_warning_method) |
1490 |
return (local_warnings, result) |
|
1491 |
||
1492 |
def applyDeprecated(self, deprecation_format, a_callable, *args, **kwargs): |
|
1493 |
"""Call a deprecated callable without warning the user. |
|
1494 |
||
|
2530.3.3
by Martin Pool
Clean up some callers that use varargs syntax for run_bzr, but don't |
1495 |
Note that this only captures warnings raised by symbol_versioning.warn,
|
1496 |
not other callers that go direct to the warning module.
|
|
1497 |
||
|
2697.2.2
by Martin Pool
deprecate Branch.append_revision |
1498 |
To test that a deprecated method raises an error, do something like
|
1499 |
this::
|
|
1500 |
||
|
3400.3.6
by Martin Pool
Remove code deprecated prior to 1.1 and its tests |
1501 |
self.assertRaises(errors.ReservedId,
|
1502 |
self.applyDeprecated,
|
|
1503 |
deprecated_in((1, 5, 0)),
|
|
1504 |
br.append_revision,
|
|
1505 |
'current:')
|
|
|
2697.2.2
by Martin Pool
deprecate Branch.append_revision |
1506 |
|
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1507 |
: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. |
1508 |
should have been deprecated with. This is the same type as the
|
1509 |
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 |
1510 |
callable is not deprecated with this format, an assertion error
|
1511 |
will be raised.
|
|
1512 |
: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. |
1513 |
a regular function. It will be called with ``*args`` and
|
1514 |
``**kwargs``.
|
|
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1515 |
:param args: The positional arguments for the callable
|
1516 |
: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. |
1517 |
: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 |
1518 |
"""
|
|
2592.3.243
by Martin Pool
Rename TestCase._capture_warnings |
1519 |
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 |
1520 |
*args, **kwargs) |
1521 |
expected_first_warning = symbol_versioning.deprecation_string( |
|
1522 |
a_callable, deprecation_format) |
|
1523 |
if len(call_warnings) == 0: |
|
|
2255.7.47
by Robert Collins
Improve applyDeprecated warning message. |
1524 |
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 |
1525 |
a_callable) |
1526 |
self.assertEqual(expected_first_warning, call_warnings[0]) |
|
1527 |
return result |
|
1528 |
||
|
2592.3.242
by Martin Pool
New method TestCase.call_catch_warnings |
1529 |
def callCatchWarnings(self, fn, *args, **kw): |
1530 |
"""Call a callable that raises python warnings. |
|
1531 |
||
1532 |
The caller's responsible for examining the returned warnings.
|
|
1533 |
||
1534 |
If the callable raises an exception, the exception is not
|
|
1535 |
caught and propagates up to the caller. In that case, the list
|
|
1536 |
of warnings is not available.
|
|
1537 |
||
1538 |
:returns: ([warning_object, ...], fn_result)
|
|
1539 |
"""
|
|
|
2592.3.246
by Andrew Bennetts
Override warnings.filters in callCatchWarnings, to insulate it from -Werror. |
1540 |
# XXX: This is not perfect, because it completely overrides the
|
1541 |
# warnings filters, and some code may depend on suppressing particular
|
|
1542 |
# warnings. It's the easiest way to insulate ourselves from -Werror,
|
|
1543 |
# though. -- Andrew, 20071062
|
|
|
2592.3.242
by Martin Pool
New method TestCase.call_catch_warnings |
1544 |
wlist = [] |
|
3734.5.3
by Vincent Ladeuil
Martin's review feedback. |
1545 |
def _catcher(message, category, filename, lineno, file=None, line=None): |
|
2592.3.242
by Martin Pool
New method TestCase.call_catch_warnings |
1546 |
# despite the name, 'message' is normally(?) a Warning subclass
|
1547 |
# instance
|
|
1548 |
wlist.append(message) |
|
1549 |
saved_showwarning = warnings.showwarning |
|
|
2592.3.246
by Andrew Bennetts
Override warnings.filters in callCatchWarnings, to insulate it from -Werror. |
1550 |
saved_filters = warnings.filters |
|
2592.3.242
by Martin Pool
New method TestCase.call_catch_warnings |
1551 |
try: |
1552 |
warnings.showwarning = _catcher |
|
|
2592.3.246
by Andrew Bennetts
Override warnings.filters in callCatchWarnings, to insulate it from -Werror. |
1553 |
warnings.filters = [] |
|
2592.3.242
by Martin Pool
New method TestCase.call_catch_warnings |
1554 |
result = fn(*args, **kw) |
1555 |
finally: |
|
1556 |
warnings.showwarning = saved_showwarning |
|
|
2592.3.246
by Andrew Bennetts
Override warnings.filters in callCatchWarnings, to insulate it from -Werror. |
1557 |
warnings.filters = saved_filters |
|
2592.3.242
by Martin Pool
New method TestCase.call_catch_warnings |
1558 |
return wlist, result |
1559 |
||
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1560 |
def callDeprecated(self, expected, callable, *args, **kwargs): |
1561 |
"""Assert that a callable is deprecated in a particular way. |
|
1562 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1563 |
This is a very precise test for unusual requirements. The
|
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1564 |
applyDeprecated helper function is probably more suited for most tests
|
1565 |
as it allows you to simply specify the deprecation format being used
|
|
1566 |
and will ensure that that is issued for the function being called.
|
|
1567 |
||
|
2530.3.3
by Martin Pool
Clean up some callers that use varargs syntax for run_bzr, but don't |
1568 |
Note that this only captures warnings raised by symbol_versioning.warn,
|
|
2592.3.242
by Martin Pool
New method TestCase.call_catch_warnings |
1569 |
not other callers that go direct to the warning module. To catch
|
1570 |
general warnings, use callCatchWarnings.
|
|
|
2530.3.3
by Martin Pool
Clean up some callers that use varargs syntax for run_bzr, but don't |
1571 |
|
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1572 |
:param expected: a list of the deprecation warnings expected, in order
|
1573 |
:param callable: The callable to call
|
|
1574 |
:param args: The positional arguments for the callable
|
|
1575 |
:param kwargs: The keyword arguments for the callable
|
|
1576 |
"""
|
|
|
2592.3.243
by Martin Pool
Rename TestCase._capture_warnings |
1577 |
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 |
1578 |
*args, **kwargs) |
1579 |
self.assertEqual(expected, call_warnings) |
|
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
1580 |
return result |
1581 |
||
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
1582 |
def _startLogFile(self): |
1583 |
"""Send bzr and test log messages to a temporary file. |
|
1584 |
||
1585 |
The file is removed as the test is torn down.
|
|
1586 |
"""
|
|
|
5404.1.1
by Andrew Bennetts
Use StringIO rather than real files on disk for log files in tests. |
1587 |
self._log_file = StringIO() |
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
1588 |
self._log_memento = trace.push_log_file(self._log_file) |
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
1589 |
self.addCleanup(self._finishLogFile) |
1590 |
||
1591 |
def _finishLogFile(self): |
|
1592 |
"""Finished with the log file. |
|
1593 |
||
|
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
1594 |
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. |
1595 |
"""
|
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
1596 |
if trace._trace_file: |
|
4794.1.9
by Robert Collins
Double \n was deliberate for RandomDecorator. |
1597 |
# flush the log file, to get all content
|
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
1598 |
trace._trace_file.flush() |
1599 |
trace.pop_log_file(self._log_memento) |
|
|
4794.1.9
by Robert Collins
Double \n was deliberate for RandomDecorator. |
1600 |
# Cache the log result and delete the file on disk
|
1601 |
self._get_log(False) |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1602 |
|
|
4523.4.12
by John Arbash Meinel
Update the test_selftest tests so that they pass again. |
1603 |
def thisFailsStrictLockCheck(self): |
|
4523.4.11
by John Arbash Meinel
Update the tests, adding a test for -Edisable_lock_checks. |
1604 |
"""It is known that this test would fail with -Dstrict_locks. |
1605 |
||
1606 |
By default, all tests are run with strict lock checking unless
|
|
1607 |
-Edisable_lock_checks is supplied. However there are some tests which
|
|
1608 |
we know fail strict locks at this point that have not been fixed.
|
|
1609 |
They should call this function to disable the strict checking.
|
|
|
4523.4.12
by John Arbash Meinel
Update the test_selftest tests so that they pass again. |
1610 |
|
1611 |
This should be used sparingly, it is much better to fix the locking
|
|
1612 |
issues rather than papering over the problem by calling this function.
|
|
|
4523.4.11
by John Arbash Meinel
Update the tests, adding a test for -Edisable_lock_checks. |
1613 |
"""
|
1614 |
debug.debug_flags.discard('strict_locks') |
|
1615 |
||
|
4985.1.5
by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity |
1616 |
def overrideAttr(self, obj, attr_name, new=_unitialized_attr): |
1617 |
"""Overrides an object attribute restoring it after the test. |
|
1618 |
||
1619 |
:param obj: The object that will be mutated.
|
|
1620 |
||
1621 |
:param attr_name: The attribute name we want to preserve/override in
|
|
1622 |
the object.
|
|
1623 |
||
1624 |
:param new: The optional value we want to set the attribute to.
|
|
|
4955.6.1
by Vincent Ladeuil
Implement test.addAttrCleanup. |
1625 |
|
1626 |
:returns: The actual attr value.
|
|
1627 |
"""
|
|
1628 |
value = getattr(obj, attr_name) |
|
1629 |
# The actual value is captured by the call below
|
|
1630 |
self.addCleanup(setattr, obj, attr_name, value) |
|
|
4985.1.3
by Vincent Ladeuil
Change it to a more usable form. |
1631 |
if new is not _unitialized_attr: |
1632 |
setattr(obj, attr_name, new) |
|
|
4955.6.1
by Vincent Ladeuil
Implement test.addAttrCleanup. |
1633 |
return value |
1634 |
||
|
5570.3.11
by Vincent Ladeuil
Make overrideEnv returns the value to make it even closer to overrideAttr. |
1635 |
def overrideEnv(self, name, new): |
|
5574.3.2
by Vincent Ladeuil
Fix typo, the test is thinner when the overrideEnv is cleaned up ;0) |
1636 |
"""Set an environment variable, and reset it after the test. |
|
5570.3.17
by Vincent Ladeuil
Final tweaks and doc. |
1637 |
|
1638 |
:param name: The environment variable name.
|
|
1639 |
||
|
5570.3.11
by Vincent Ladeuil
Make overrideEnv returns the value to make it even closer to overrideAttr. |
1640 |
:param new: The value to set the variable to. If None, the
|
|
5570.3.3
by Vincent Ladeuil
Introduce a more robust way to override environment variables (not deployed yet). |
1641 |
variable is deleted from the environment.
|
|
5570.3.11
by Vincent Ladeuil
Make overrideEnv returns the value to make it even closer to overrideAttr. |
1642 |
|
1643 |
:returns: The actual variable value.
|
|
|
5570.3.3
by Vincent Ladeuil
Introduce a more robust way to override environment variables (not deployed yet). |
1644 |
"""
|
|
5570.3.11
by Vincent Ladeuil
Make overrideEnv returns the value to make it even closer to overrideAttr. |
1645 |
value = osutils.set_or_unset_env(name, new) |
1646 |
self.addCleanup(osutils.set_or_unset_env, name, value) |
|
1647 |
return value |
|
|
5570.3.3
by Vincent Ladeuil
Introduce a more robust way to override environment variables (not deployed yet). |
1648 |
|
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
1649 |
def _cleanEnvironment(self): |
|
5574.7.1
by Vincent Ladeuil
Implement a fixture for isolating tests from ``os.environ``. |
1650 |
for name, value in isolated_environ.iteritems(): |
|
5570.3.5
by Vincent Ladeuil
_cleanEnvironment can use overrideEnv, this prepare future cleanups. |
1651 |
self.overrideEnv(name, value) |
|
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
1652 |
|
|
2245.1.1
by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers |
1653 |
def _restoreHooks(self): |
|
4119.3.1
by Robert Collins
Create a single registry of all Hooks classes, removing the test suite knowledge of such hooks and allowing plugins to sensibly and safely define new hooks. |
1654 |
for klass, (name, hooks) in self._preserved_hooks.items(): |
1655 |
setattr(klass, name, hooks) |
|
|
2245.1.1
by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers |
1656 |
|
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
1657 |
def knownFailure(self, reason): |
1658 |
"""This test has failed for some known reason.""" |
|
1659 |
raise KnownFailure(reason) |
|
1660 |
||
|
5387.2.1
by John Arbash Meinel
Filter out the 'log' information for skipped, xfail, and n/a. |
1661 |
def _suppress_log(self): |
1662 |
"""Remove the log info from details.""" |
|
1663 |
self.discardDetail('log') |
|
1664 |
||
|
4063.1.1
by Robert Collins
Move skipped test detection to TestCase, and make reporting use an addSkip method as per testtools. |
1665 |
def _do_skip(self, result, reason): |
|
5387.2.1
by John Arbash Meinel
Filter out the 'log' information for skipped, xfail, and n/a. |
1666 |
self._suppress_log() |
|
4063.1.1
by Robert Collins
Move skipped test detection to TestCase, and make reporting use an addSkip method as per testtools. |
1667 |
addSkip = getattr(result, 'addSkip', None) |
1668 |
if not callable(addSkip): |
|
|
4780.1.1
by Robert Collins
Make addUnsupported more compatible with other TestResults. |
1669 |
result.addSuccess(result) |
|
4063.1.1
by Robert Collins
Move skipped test detection to TestCase, and make reporting use an addSkip method as per testtools. |
1670 |
else: |
1671 |
addSkip(self, reason) |
|
1672 |
||
|
4794.1.2
by Robert Collins
First cut at testtools support: rename, remove TestCase.run() and change testcase tests to not assume the same instance runs (for cleaner testing at this point). |
1673 |
@staticmethod
|
1674 |
def _do_known_failure(self, result, e): |
|
|
5387.2.1
by John Arbash Meinel
Filter out the 'log' information for skipped, xfail, and n/a. |
1675 |
self._suppress_log() |
|
4780.1.4
by Robert Collins
Switch reporting of KnownFailure to be Python2.7 compatible. |
1676 |
err = sys.exc_info() |
1677 |
addExpectedFailure = getattr(result, 'addExpectedFailure', None) |
|
1678 |
if addExpectedFailure is not None: |
|
1679 |
addExpectedFailure(self, err) |
|
1680 |
else: |
|
1681 |
result.addSuccess(self) |
|
1682 |
||
|
4794.1.2
by Robert Collins
First cut at testtools support: rename, remove TestCase.run() and change testcase tests to not assume the same instance runs (for cleaner testing at this point). |
1683 |
@staticmethod
|
|
4780.1.3
by Robert Collins
TestNotApplicable handling improved for compatibility with stdlib TestResult objects. |
1684 |
def _do_not_applicable(self, result, e): |
|
4780.1.5
by Robert Collins
Fix fallback of NotApplicable to Skip. |
1685 |
if not e.args: |
1686 |
reason = 'No reason given' |
|
1687 |
else: |
|
1688 |
reason = e.args[0] |
|
|
5387.2.1
by John Arbash Meinel
Filter out the 'log' information for skipped, xfail, and n/a. |
1689 |
self._suppress_log () |
|
4780.1.3
by Robert Collins
TestNotApplicable handling improved for compatibility with stdlib TestResult objects. |
1690 |
addNotApplicable = getattr(result, 'addNotApplicable', None) |
1691 |
if addNotApplicable is not None: |
|
1692 |
result.addNotApplicable(self, reason) |
|
1693 |
else: |
|
1694 |
self._do_skip(result, reason) |
|
1695 |
||
|
4794.1.2
by Robert Collins
First cut at testtools support: rename, remove TestCase.run() and change testcase tests to not assume the same instance runs (for cleaner testing at this point). |
1696 |
@staticmethod
|
|
5387.2.4
by John Arbash Meinel
Add tests for when we should and shouldn't get a 'log' in the details. |
1697 |
def _report_skip(self, result, err): |
1698 |
"""Override the default _report_skip. |
|
1699 |
||
1700 |
We want to strip the 'log' detail. If we waint until _do_skip, it has
|
|
1701 |
already been formatted into the 'reason' string, and we can't pull it
|
|
1702 |
out again.
|
|
1703 |
"""
|
|
1704 |
self._suppress_log() |
|
1705 |
super(TestCase, self)._report_skip(self, result, err) |
|
1706 |
||
1707 |
@staticmethod
|
|
1708 |
def _report_expected_failure(self, result, err): |
|
1709 |
"""Strip the log. |
|
1710 |
||
1711 |
See _report_skip for motivation.
|
|
1712 |
"""
|
|
1713 |
self._suppress_log() |
|
1714 |
super(TestCase, self)._report_expected_failure(self, result, err) |
|
|
5387.2.1
by John Arbash Meinel
Filter out the 'log' information for skipped, xfail, and n/a. |
1715 |
|
1716 |
@staticmethod
|
|
|
4794.1.2
by Robert Collins
First cut at testtools support: rename, remove TestCase.run() and change testcase tests to not assume the same instance runs (for cleaner testing at this point). |
1717 |
def _do_unsupported_or_skip(self, result, e): |
1718 |
reason = e.args[0] |
|
|
5387.2.1
by John Arbash Meinel
Filter out the 'log' information for skipped, xfail, and n/a. |
1719 |
self._suppress_log() |
|
4780.1.1
by Robert Collins
Make addUnsupported more compatible with other TestResults. |
1720 |
addNotSupported = getattr(result, 'addNotSupported', None) |
1721 |
if addNotSupported is not None: |
|
1722 |
result.addNotSupported(self, reason) |
|
1723 |
else: |
|
1724 |
self._do_skip(result, reason) |
|
1725 |
||
|
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) |
1726 |
def time(self, callable, *args, **kwargs): |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
1727 |
"""Run callable and accrue the time it takes to the benchmark time. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1728 |
|
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
1729 |
If lsprofiling is enabled (i.e. by --lsprof-time to bzr selftest) then
|
1730 |
this will cause lsprofile statistics to be gathered and stored in
|
|
1731 |
self._benchcalls.
|
|
1732 |
"""
|
|
|
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) |
1733 |
if self._benchtime is None: |
|
4794.1.10
by Robert Collins
Add benchmark time details object. |
1734 |
self.addDetail('benchtime', content.Content(content.ContentType( |
1735 |
"text", "plain"), lambda:[str(self._benchtime)])) |
|
|
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) |
1736 |
self._benchtime = 0 |
1737 |
start = time.time() |
|
1738 |
try: |
|
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
1739 |
if not self._gather_lsprof_in_benchmarks: |
1740 |
return callable(*args, **kwargs) |
|
1741 |
else: |
|
1742 |
# record this benchmark
|
|
1743 |
ret, stats = bzrlib.lsprof.profile(callable, *args, **kwargs) |
|
1744 |
stats.sort() |
|
1745 |
self._benchcalls.append(((callable, args, kwargs), stats)) |
|
1746 |
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) |
1747 |
finally: |
1748 |
self._benchtime += time.time() - start |
|
1749 |
||
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1750 |
def log(self, *args): |
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
1751 |
trace.mutter(*args) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1752 |
|
|
4794.1.9
by Robert Collins
Double \n was deliberate for RandomDecorator. |
1753 |
def _get_log(self, keep_log_file=False): |
|
4794.1.15
by Robert Collins
Review feedback. |
1754 |
"""Internal helper to get the log from bzrlib.trace for this test. |
1755 |
||
1756 |
Please use self.getDetails, or self.get_log to access this in test case
|
|
1757 |
code.
|
|
|
2725.1.1
by Robert Collins
Add -Devil flag to highlight the use of problematic API calls. |
1758 |
|
1759 |
:param keep_log_file: When True, if the log is still a file on disk
|
|
1760 |
leave it as a file on disk. When False, if the log is still a file
|
|
1761 |
on disk, the log file is deleted and the log preserved as
|
|
1762 |
self._log_contents.
|
|
1763 |
:return: A string containing the log.
|
|
1764 |
"""
|
|
|
4794.1.7
by Robert Collins
Remove references to _get_log from test_selftest. |
1765 |
if self._log_contents is not None: |
|
4794.1.9
by Robert Collins
Double \n was deliberate for RandomDecorator. |
1766 |
try: |
1767 |
self._log_contents.decode('utf8') |
|
1768 |
except UnicodeDecodeError: |
|
1769 |
unicodestr = self._log_contents.decode('utf8', 'replace') |
|
1770 |
self._log_contents = unicodestr.encode('utf8') |
|
|
4794.1.7
by Robert Collins
Remove references to _get_log from test_selftest. |
1771 |
return self._log_contents |
|
5404.1.1
by Andrew Bennetts
Use StringIO rather than real files on disk for log files in tests. |
1772 |
if self._log_file is not None: |
1773 |
log_contents = self._log_file.getvalue() |
|
|
4794.1.9
by Robert Collins
Double \n was deliberate for RandomDecorator. |
1774 |
try: |
1775 |
log_contents.decode('utf8') |
|
1776 |
except UnicodeDecodeError: |
|
1777 |
unicodestr = log_contents.decode('utf8', 'replace') |
|
1778 |
log_contents = unicodestr.encode('utf8') |
|
|
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
1779 |
if not keep_log_file: |
|
4794.1.9
by Robert Collins
Double \n was deliberate for RandomDecorator. |
1780 |
self._log_file = None |
1781 |
# Permit multiple calls to get_log until we clean it up in
|
|
1782 |
# finishLogFile
|
|
|
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
1783 |
self._log_contents = log_contents |
1784 |
return log_contents |
|
1785 |
else: |
|
|
5404.1.1
by Andrew Bennetts
Use StringIO rather than real files on disk for log files in tests. |
1786 |
return "No log file content." |
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
1787 |
|
|
4794.1.15
by Robert Collins
Review feedback. |
1788 |
def get_log(self): |
1789 |
"""Get a unicode string containing the log from bzrlib.trace. |
|
1790 |
||
1791 |
Undecodable characters are replaced.
|
|
1792 |
"""
|
|
1793 |
return u"".join(self.getDetails()['log'].iter_text()) |
|
1794 |
||
|
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
1795 |
def requireFeature(self, feature): |
1796 |
"""This test requires a specific feature is available. |
|
1797 |
||
1798 |
:raises UnavailableFeature: When feature is not available.
|
|
1799 |
"""
|
|
1800 |
if not feature.available(): |
|
1801 |
raise UnavailableFeature(feature) |
|
1802 |
||
|
2530.3.2
by Martin Pool
Refactoring run_bzr code into more of a common base. |
1803 |
def _run_bzr_autosplit(self, args, retcode, encoding, stdin, |
1804 |
working_dir): |
|
|
2530.3.3
by Martin Pool
Clean up some callers that use varargs syntax for run_bzr, but don't |
1805 |
"""Run bazaar command line, splitting up a string command line.""" |
1806 |
if isinstance(args, basestring): |
|
|
2804.4.1
by Alexander Belchenko
some win32-specific fixes for selftest |
1807 |
# shlex don't understand unicode strings,
|
1808 |
# so args should be plain string (bialix 20070906)
|
|
1809 |
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 |
1810 |
return self._run_bzr_core(args, retcode=retcode, |
1811 |
encoding=encoding, stdin=stdin, working_dir=working_dir, |
|
1812 |
)
|
|
1813 |
||
1814 |
def _run_bzr_core(self, args, retcode, encoding, stdin, |
|
1815 |
working_dir): |
|
|
4634.90.2
by Andrew Bennetts
Clear chk_map page cache in TestCase._run_bzr_core, causes blackbox.test_log to fail without fix in previous revision. |
1816 |
# Clear chk_map page cache, because the contents are likely to mask
|
1817 |
# locking errors.
|
|
1818 |
chk_map.clear_cache() |
|
|
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 |
1819 |
if encoding is None: |
|
3224.5.4
by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding. |
1820 |
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 |
1821 |
stdout = StringIOWrapper() |
1822 |
stderr = StringIOWrapper() |
|
1823 |
stdout.encoding = encoding |
|
1824 |
stderr.encoding = encoding |
|
1825 |
||
|
2530.3.2
by Martin Pool
Refactoring run_bzr code into more of a common base. |
1826 |
self.log('run bzr: %r', args) |
|
1185.43.5
by Martin Pool
Update log message quoting |
1827 |
# FIXME: don't call into logging here
|
|
1185.3.20
by Martin Pool
- run_bzr_captured also includes logged errors in |
1828 |
handler = logging.StreamHandler(stderr) |
1829 |
handler.setLevel(logging.INFO) |
|
1830 |
logger = logging.getLogger('') |
|
1831 |
logger.addHandler(handler) |
|
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
1832 |
old_ui_factory = ui.ui_factory |
1833 |
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 |
1834 |
|
1835 |
cwd = None |
|
1836 |
if working_dir is not None: |
|
1837 |
cwd = osutils.getcwd() |
|
1838 |
os.chdir(working_dir) |
|
1839 |
||
|
1185.3.20
by Martin Pool
- run_bzr_captured also includes logged errors in |
1840 |
try: |
|
4815.3.5
by Gordon Tyler
Fixed try/except/finally to try/try/except/finally for Python 2.4 compatibility. |
1841 |
try: |
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
1842 |
result = self.apply_redirected( |
1843 |
ui.ui_factory.stdin, |
|
|
4815.3.5
by Gordon Tyler
Fixed try/except/finally to try/try/except/finally for Python 2.4 compatibility. |
1844 |
stdout, stderr, |
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
1845 |
_mod_commands.run_bzr_catch_user_errors, |
|
4815.3.5
by Gordon Tyler
Fixed try/except/finally to try/try/except/finally for Python 2.4 compatibility. |
1846 |
args) |
1847 |
except KeyboardInterrupt: |
|
|
4815.3.8
by Vincent Ladeuil
Fix too long lines. |
1848 |
# Reraise KeyboardInterrupt with contents of redirected stdout
|
1849 |
# and stderr as arguments, for tests which are interested in
|
|
1850 |
# stdout and stderr and are expecting the exception.
|
|
|
4815.3.5
by Gordon Tyler
Fixed try/except/finally to try/try/except/finally for Python 2.4 compatibility. |
1851 |
out = stdout.getvalue() |
1852 |
err = stderr.getvalue() |
|
1853 |
if out: |
|
1854 |
self.log('output:\n%r', out) |
|
1855 |
if err: |
|
1856 |
self.log('errors:\n%r', err) |
|
1857 |
raise KeyboardInterrupt(out, err) |
|
|
1185.3.20
by Martin Pool
- run_bzr_captured also includes logged errors in |
1858 |
finally: |
1859 |
logger.removeHandler(handler) |
|
|
2294.4.4
by Vincent Ladeuil
Provide a better implementation for testing passwords. |
1860 |
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 |
1861 |
if cwd is not None: |
1862 |
os.chdir(cwd) |
|
|
1685.1.69
by Wouter van Heyst
merge bzr.dev 1740 |
1863 |
|
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
1864 |
out = stdout.getvalue() |
1865 |
err = stderr.getvalue() |
|
1866 |
if out: |
|
|
1185.85.72
by John Arbash Meinel
Fix some of the tests. |
1867 |
self.log('output:\n%r', out) |
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
1868 |
if err: |
|
1185.85.72
by John Arbash Meinel
Fix some of the tests. |
1869 |
self.log('errors:\n%r', err) |
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
1870 |
if retcode is not None: |
|
2292.1.32
by Marius Kruger
* tests/__init__.run_bzr |
1871 |
self.assertEquals(retcode, result, |
1872 |
message='Unexpected return code') |
|
|
4665.5.15
by Vincent Ladeuil
Catch the retcode for all commands. |
1873 |
return result, out, err |
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
1874 |
|
|
2830.2.5
by Martin Pool
Deprecated ``run_bzr_decode``; use the new ``output_encoding`` parameter to |
1875 |
def run_bzr(self, args, retcode=0, encoding=None, stdin=None, |
1876 |
working_dir=None, error_regexes=[], output_encoding=None): |
|
|
1119
by Martin Pool
doc |
1877 |
"""Invoke bzr, as if it were run from the command line. |
1878 |
||
|
2530.3.2
by Martin Pool
Refactoring run_bzr code into more of a common base. |
1879 |
The argument list should not include the bzr program name - the
|
1880 |
first argument is normally the bzr command. Arguments may be
|
|
1881 |
passed in three ways:
|
|
1882 |
||
1883 |
1- A list of strings, eg ["commit", "a"]. This is recommended
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1884 |
when the command contains whitespace or metacharacters, or
|
|
2530.3.2
by Martin Pool
Refactoring run_bzr code into more of a common base. |
1885 |
is built up at run time.
|
1886 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1887 |
2- A single string, eg "add a". This is the most convenient
|
|
2530.3.2
by Martin Pool
Refactoring run_bzr code into more of a common base. |
1888 |
for hardcoded commands.
|
1889 |
||
|
2530.3.4
by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr |
1890 |
This runs bzr through the interface that catches and reports
|
1891 |
errors, and with logging set to something approximating the
|
|
1892 |
default, so that error reporting can be checked.
|
|
1893 |
||
|
1119
by Martin Pool
doc |
1894 |
This should be the main method for tests that want to exercise the
|
1895 |
overall behavior of the bzr application (rather than a unit test
|
|
1896 |
or a functional test of the library.)
|
|
1897 |
||
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
1898 |
This sends the stdout/stderr results into the test's log,
|
1899 |
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. |
1900 |
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
1901 |
:keyword stdin: A string to be used as stdin for the command.
|
|
2399.1.17
by John Arbash Meinel
[merge] bzr.dev 2562 |
1902 |
: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. |
1903 |
default 0.
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
1904 |
:keyword working_dir: The directory to run the command in
|
|
2399.1.17
by John Arbash Meinel
[merge] bzr.dev 2562 |
1905 |
:keyword error_regexes: A list of expected error messages. If
|
1906 |
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 |
1907 |
"""
|
|
4665.5.15
by Vincent Ladeuil
Catch the retcode for all commands. |
1908 |
retcode, out, err = self._run_bzr_autosplit( |
|
2830.2.5
by Martin Pool
Deprecated ``run_bzr_decode``; use the new ``output_encoding`` parameter to |
1909 |
args=args, |
|
2530.3.2
by Martin Pool
Refactoring run_bzr code into more of a common base. |
1910 |
retcode=retcode, |
|
2830.2.5
by Martin Pool
Deprecated ``run_bzr_decode``; use the new ``output_encoding`` parameter to |
1911 |
encoding=encoding, |
1912 |
stdin=stdin, |
|
1913 |
working_dir=working_dir, |
|
|
2530.3.2
by Martin Pool
Refactoring run_bzr code into more of a common base. |
1914 |
)
|
|
4325.4.6
by Vincent Ladeuil
Fixed as per John's and Markus reviews. |
1915 |
self.assertIsInstance(error_regexes, (list, tuple)) |
|
2292.1.27
by Marius Kruger
* tests/__init__.TestCase.run_bzr_captured |
1916 |
for regex in error_regexes: |
1917 |
self.assertContainsRe(err, regex) |
|
1918 |
return out, err |
|
1919 |
||
|
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. |
1920 |
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 |
1921 |
"""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. |
1922 |
|
1923 |
: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. |
1924 |
must each be found in the error output. The relative ordering
|
1925 |
is not enforced.
|
|
1926 |
:param args: command-line arguments for bzr
|
|
1927 |
:param kwargs: Keyword arguments which are interpreted by run_bzr
|
|
1928 |
This function changes the default value of retcode to be 3,
|
|
1929 |
since in most cases this is run when you expect bzr to fail.
|
|
|
2581.1.1
by Martin Pool
Merge more runbzr cleanups |
1930 |
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
1931 |
:return: (out, err) The actual output of running the command (in case
|
1932 |
you want to do more inspection)
|
|
1933 |
||
1934 |
Examples of use::
|
|
1935 |
||
|
1711.7.11
by John Arbash Meinel
Clean up the documentation for run_bzr_error on Martin's suggestion. |
1936 |
# Make sure that commit is failing because there is nothing to do
|
1937 |
self.run_bzr_error(['no changes to commit'],
|
|
|
2665.1.1
by Michael Hudson
make run_bzr stricter about the keyword arguments it takes. |
1938 |
['commit', '-m', 'my commit comment'])
|
|
1711.7.11
by John Arbash Meinel
Clean up the documentation for run_bzr_error on Martin's suggestion. |
1939 |
# Make sure --strict is handling an unknown file, rather than
|
1940 |
# giving us the 'nothing to do' error
|
|
1941 |
self.build_tree(['unknown'])
|
|
1942 |
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. |
1943 |
['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 |
1944 |
"""
|
1945 |
kwargs.setdefault('retcode', 3) |
|
|
2552.2.3
by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests. |
1946 |
kwargs['error_regexes'] = error_regexes |
1947 |
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 |
1948 |
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. |
1949 |
|
|
1752.1.6
by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring |
1950 |
def run_bzr_subprocess(self, *args, **kwargs): |
1951 |
"""Run bzr in a subprocess for testing. |
|
1952 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1953 |
This starts a new Python interpreter and runs bzr in there.
|
|
1752.1.6
by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring |
1954 |
This should only be used for tests that have a justifiable need for
|
1955 |
this isolation: e.g. they are testing startup time, or signal
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1956 |
handling, or early startup code, etc. Subprocess code can't be
|
|
1752.1.6
by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring |
1957 |
profiled or debugged so easily.
|
|
1752.1.7
by Aaron Bentley
Stop using shlex in run_bzr_subprocess |
1958 |
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
1959 |
: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 |
1960 |
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. |
1961 |
: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 |
1962 |
variables. A value of None will unset the env variable.
|
1963 |
The values must be strings. The change will only occur in the
|
|
1964 |
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. |
1965 |
:keyword universal_newlines: Convert CRLF => LF
|
1966 |
: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. |
1967 |
--no-plugins to ensure test reproducibility. Also, it is possible
|
|
2067.2.2
by John Arbash Meinel
Review comments from Robert |
1968 |
for system-wide plugins to create unexpected output on stderr,
|
1969 |
which can cause unnecessary test failures.
|
|
|
1752.1.6
by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring |
1970 |
"""
|
|
1963.1.2
by John Arbash Meinel
Cleanups suggested by Martin, add test that env_changes can remove an env variable |
1971 |
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 |
1972 |
working_dir = kwargs.get('working_dir', None) |
|
2067.2.1
by John Arbash Meinel
Change run_bzr_subprocess to default to supplying --no-plugins. |
1973 |
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 |
1974 |
if len(args) == 1: |
1975 |
if isinstance(args[0], list): |
|
1976 |
args = args[0] |
|
1977 |
elif isinstance(args[0], basestring): |
|
1978 |
args = list(shlex.split(args[0])) |
|
1979 |
else: |
|
|
3400.3.6
by Martin Pool
Remove code deprecated prior to 1.1 and its tests |
1980 |
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 |
1981 |
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. |
1982 |
working_dir=working_dir, |
1983 |
allow_plugins=allow_plugins) |
|
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
1984 |
# We distinguish between retcode=None and retcode not passed.
|
1985 |
supplied_retcode = kwargs.get('retcode', 0) |
|
1986 |
return self.finish_bzr_subprocess(process, retcode=supplied_retcode, |
|
1987 |
universal_newlines=kwargs.get('universal_newlines', False), |
|
1988 |
process_args=args) |
|
1989 |
||
|
1910.17.9
by Andrew Bennetts
Add skip_if_plan_to_signal flag to start_bzr_subprocess. |
1990 |
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 |
1991 |
skip_if_plan_to_signal=False, |
|
2067.2.1
by John Arbash Meinel
Change run_bzr_subprocess to default to supplying --no-plugins. |
1992 |
working_dir=None, |
1993 |
allow_plugins=False): |
|
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
1994 |
"""Start bzr in a subprocess for testing. |
1995 |
||
1996 |
This starts a new Python interpreter and runs bzr in there.
|
|
1997 |
This should only be used for tests that have a justifiable need for
|
|
1998 |
this isolation: e.g. they are testing startup time, or signal
|
|
1999 |
handling, or early startup code, etc. Subprocess code can't be
|
|
2000 |
profiled or debugged so easily.
|
|
2001 |
||
2002 |
: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. |
2003 |
for example ``['--version']``.
|
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
2004 |
:param env_changes: A dictionary which lists changes to environment
|
2005 |
variables. A value of None will unset the env variable.
|
|
2006 |
The values must be strings. The change will only occur in the
|
|
2007 |
child, so you don't need to fix the environment after running.
|
|
|
5340.10.1
by Martin
Correct check on whether signalling subprocess is supported |
2008 |
:param skip_if_plan_to_signal: raise TestSkipped when true and system
|
2009 |
doesn't support signalling subprocesses.
|
|
|
2067.2.1
by John Arbash Meinel
Change run_bzr_subprocess to default to supplying --no-plugins. |
2010 |
: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. |
2011 |
|
2012 |
:returns: Popen object for the started process.
|
|
2013 |
"""
|
|
|
1910.17.9
by Andrew Bennetts
Add skip_if_plan_to_signal flag to start_bzr_subprocess. |
2014 |
if skip_if_plan_to_signal: |
|
5340.10.1
by Martin
Correct check on whether signalling subprocess is supported |
2015 |
if os.name != "posix": |
2016 |
raise TestSkipped("Sending signals not supported") |
|
|
1910.17.9
by Andrew Bennetts
Add skip_if_plan_to_signal flag to start_bzr_subprocess. |
2017 |
|
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
2018 |
if env_changes is None: |
2019 |
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 |
2020 |
old_env = {} |
2021 |
||
|
1963.1.2
by John Arbash Meinel
Cleanups suggested by Martin, add test that env_changes can remove an env variable |
2022 |
def cleanup_environment(): |
2023 |
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 |
2024 |
old_env[env_var] = osutils.set_or_unset_env(env_var, value) |
2025 |
||
2026 |
def restore_environment(): |
|
2027 |
for env_var, value in old_env.iteritems(): |
|
2028 |
osutils.set_or_unset_env(env_var, value) |
|
|
1963.1.1
by John Arbash Meinel
run_bzr_subprocess() can take an env_changes parameter |
2029 |
|
|
2018.1.1
by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths). |
2030 |
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 |
2031 |
|
|
2027.5.1
by John Arbash Meinel
Add working_dir=XX to run_bzr_* functions, and clean up tests |
2032 |
cwd = None |
2033 |
if working_dir is not None: |
|
2034 |
cwd = osutils.getcwd() |
|
2035 |
os.chdir(working_dir) |
|
2036 |
||
|
1963.1.7
by John Arbash Meinel
Switch to directly setting the env, and cleaning it up. So that it works on all platforms |
2037 |
try: |
2038 |
# win32 subprocess doesn't support preexec_fn
|
|
2039 |
# so we will avoid using it on all platforms, just to
|
|
2040 |
# make sure the code path is used, and we don't break on win32
|
|
2041 |
cleanup_environment() |
|
|
3616.2.1
by Mark Hammond
Fix how blackbox tests start bzr from frozen executables. |
2042 |
command = [sys.executable] |
2043 |
# frozen executables don't need the path to bzr
|
|
|
3616.2.7
by Mark Hammond
prefer getattr() over hasattr() |
2044 |
if getattr(sys, "frozen", None) is None: |
|
3616.2.1
by Mark Hammond
Fix how blackbox tests start bzr from frozen executables. |
2045 |
command.append(bzr_path) |
|
2067.2.1
by John Arbash Meinel
Change run_bzr_subprocess to default to supplying --no-plugins. |
2046 |
if not allow_plugins: |
2047 |
command.append('--no-plugins') |
|
2048 |
command.extend(process_args) |
|
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
2049 |
process = self._popen(command, stdin=subprocess.PIPE, |
2050 |
stdout=subprocess.PIPE, |
|
2051 |
stderr=subprocess.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 |
2052 |
finally: |
2053 |
restore_environment() |
|
|
2027.5.1
by John Arbash Meinel
Add working_dir=XX to run_bzr_* functions, and clean up tests |
2054 |
if cwd is not None: |
2055 |
os.chdir(cwd) |
|
2056 |
||
|
1910.17.2
by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue |
2057 |
return process |
2058 |
||
|
2067.2.1
by John Arbash Meinel
Change run_bzr_subprocess to default to supplying --no-plugins. |
2059 |
def _popen(self, *args, **kwargs): |
2060 |
"""Place a call to Popen. |
|
|
2067.2.2
by John Arbash Meinel
Review comments from Robert |
2061 |
|
2062 |
Allows tests to override this method to intercept the calls made to
|
|
2063 |
Popen for introspection.
|
|
|
2067.2.1
by John Arbash Meinel
Change run_bzr_subprocess to default to supplying --no-plugins. |
2064 |
"""
|
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
2065 |
return subprocess.Popen(*args, **kwargs) |
|
2067.2.1
by John Arbash Meinel
Change run_bzr_subprocess to default to supplying --no-plugins. |
2066 |
|
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
2067 |
def get_source_path(self): |
2068 |
"""Return the path of the directory containing bzrlib.""" |
|
2069 |
return os.path.dirname(os.path.dirname(bzrlib.__file__)) |
|
2070 |
||
|
2018.1.1
by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths). |
2071 |
def get_bzr_path(self): |
|
2018.1.9
by Andrew Bennetts
Implement ParamikoVendor.connect_ssh |
2072 |
"""Return the path of the 'bzr' executable for this test suite.""" |
|
5340.3.2
by Martin
Correct TestCase.get_bzr_path when bzrlib is in the cwd |
2073 |
bzr_path = os.path.join(self.get_source_path(), "bzr") |
|
2018.1.1
by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths). |
2074 |
if not os.path.isfile(bzr_path): |
2075 |
# We are probably installed. Assume sys.argv is the right file
|
|
2076 |
bzr_path = sys.argv[0] |
|
2077 |
return bzr_path |
|
2078 |
||
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
2079 |
def finish_bzr_subprocess(self, process, retcode=0, send_signal=None, |
2080 |
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 |
2081 |
"""Finish the execution of process. |
2082 |
||
2083 |
: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. |
2084 |
:param retcode: The status code that is expected. Defaults to 0. If
|
2085 |
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 |
2086 |
: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. |
2087 |
: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 |
2088 |
:returns: (stdout, stderr)
|
2089 |
"""
|
|
2090 |
if send_signal is not None: |
|
2091 |
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. |
2092 |
out, err = process.communicate() |
2093 |
||
2094 |
if universal_newlines: |
|
2095 |
out = out.replace('\r\n', '\n') |
|
2096 |
err = err.replace('\r\n', '\n') |
|
2097 |
||
2098 |
if retcode is not None and retcode != process.returncode: |
|
2099 |
if process_args is None: |
|
2100 |
process_args = "(unknown args)" |
|
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
2101 |
trace.mutter('Output of bzr %s:\n%s', process_args, out) |
2102 |
trace.mutter('Error for bzr %s:\n%s', process_args, err) |
|
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
2103 |
self.fail('Command bzr %s failed with retcode %s != %s' |
2104 |
% (process_args, retcode, process.returncode)) |
|
2105 |
return [out, err] |
|
|
1910.17.2
by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue |
2106 |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2107 |
def check_inventory_shape(self, inv, shape): |
|
1291
by Martin Pool
- add test for moving files between directories |
2108 |
"""Compare an inventory to a list of expected names. |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2109 |
|
2110 |
Fail if they are not precisely equal.
|
|
2111 |
"""
|
|
2112 |
extras = [] |
|
2113 |
shape = list(shape) # copy |
|
2114 |
for path, ie in inv.entries(): |
|
2115 |
name = path.replace('\\', '/') |
|
|
2545.3.1
by James Westby
Fix detection of directory entries in the inventory. |
2116 |
if ie.kind == 'directory': |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2117 |
name = name + '/' |
2118 |
if name in shape: |
|
2119 |
shape.remove(name) |
|
2120 |
else: |
|
2121 |
extras.append(name) |
|
2122 |
if shape: |
|
2123 |
self.fail("expected paths not found in inventory: %r" % shape) |
|
2124 |
if extras: |
|
2125 |
self.fail("unexpected paths found in inventory: %r" % extras) |
|
2126 |
||
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
2127 |
def apply_redirected(self, stdin=None, stdout=None, stderr=None, |
2128 |
a_callable=None, *args, **kwargs): |
|
2129 |
"""Call callable with redirected std io pipes. |
|
2130 |
||
2131 |
Returns the return code."""
|
|
2132 |
if not callable(a_callable): |
|
2133 |
raise ValueError("a_callable must be callable.") |
|
2134 |
if stdin is None: |
|
2135 |
stdin = StringIO("") |
|
2136 |
if stdout is None: |
|
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
2137 |
if getattr(self, "_log_file", None) is not None: |
|
974.1.70
by Aaron Bentley
Fixed selftest spewage (Brian M. Carlson) |
2138 |
stdout = self._log_file |
2139 |
else: |
|
2140 |
stdout = StringIO() |
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
2141 |
if stderr is None: |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
2142 |
if getattr(self, "_log_file", None is not None): |
|
974.1.70
by Aaron Bentley
Fixed selftest spewage (Brian M. Carlson) |
2143 |
stderr = self._log_file |
2144 |
else: |
|
2145 |
stderr = StringIO() |
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
2146 |
real_stdin = sys.stdin |
2147 |
real_stdout = sys.stdout |
|
2148 |
real_stderr = sys.stderr |
|
2149 |
try: |
|
2150 |
sys.stdout = stdout |
|
2151 |
sys.stderr = stderr |
|
2152 |
sys.stdin = stdin |
|
|
1160
by Martin Pool
- tiny refactoring |
2153 |
return a_callable(*args, **kwargs) |
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
2154 |
finally: |
2155 |
sys.stdout = real_stdout |
|
2156 |
sys.stderr = real_stderr |
|
2157 |
sys.stdin = real_stdin |
|
2158 |
||
|
2018.5.78
by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the |
2159 |
def reduceLockdirTimeout(self): |
2160 |
"""Reduce the default lock timeout for the duration of the test, so that |
|
2161 |
if LockContention occurs during a test, it does so quickly.
|
|
2162 |
||
2163 |
Tests that expect to provoke LockContention errors should call this.
|
|
2164 |
"""
|
|
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
2165 |
self.overrideAttr(lockdir, '_DEFAULT_TIMEOUT_SECONDS', 0) |
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
2166 |
|
|
2717.1.1
by Lukáš Lalinsky
Use UTF-8 encoded StringIO for log tests to avoid failures on non-ASCII committer names. |
2167 |
def make_utf8_encoded_stringio(self, encoding_type=None): |
2168 |
"""Return a StringIOWrapper instance, that will encode Unicode |
|
2169 |
input to UTF-8.
|
|
2170 |
"""
|
|
2171 |
if encoding_type is None: |
|
2172 |
encoding_type = 'strict' |
|
2173 |
sio = StringIO() |
|
2174 |
output_encoding = 'utf-8' |
|
2175 |
sio = codecs.getwriter(output_encoding)(sio, errors=encoding_type) |
|
2176 |
sio.encoding = output_encoding |
|
2177 |
return sio |
|
2178 |
||
|
4476.3.32
by Andrew Bennetts
Move disable_verb into base TestCase to remove duplication, fix trivial test failures due to new insert_stream verb in test_remote (and also add some trivial tests for the new verb). |
2179 |
def disable_verb(self, verb): |
2180 |
"""Disable a smart server verb for one test.""" |
|
2181 |
from bzrlib.smart import request |
|
2182 |
request_handlers = request.request_handlers |
|
2183 |
orig_method = request_handlers.get(verb) |
|
2184 |
request_handlers.remove(verb) |
|
|
4985.2.1
by Vincent Ladeuil
Deploy addAttrCleanup on the whole test suite. |
2185 |
self.addCleanup(request_handlers.register, verb, orig_method) |
|
4476.3.32
by Andrew Bennetts
Move disable_verb into base TestCase to remove duplication, fix trivial test failures due to new insert_stream verb in test_remote (and also add some trivial tests for the new verb). |
2186 |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2187 |
|
|
4070.3.1
by Robert Collins
Alter branch sprouting with an alternate fix for stacked branches that does not require multiple copy_content_into and set_parent calls, reducing IO and round trips. |
2188 |
class CapturedCall(object): |
2189 |
"""A helper for capturing smart server calls for easy debug analysis.""" |
|
2190 |
||
2191 |
def __init__(self, params, prefix_length): |
|
2192 |
"""Capture the call with params and skip prefix_length stack frames.""" |
|
2193 |
self.call = params |
|
2194 |
import traceback |
|
2195 |
# The last 5 frames are the __init__, the hook frame, and 3 smart
|
|
2196 |
# client frames. Beyond this we could get more clever, but this is good
|
|
2197 |
# enough for now.
|
|
2198 |
stack = traceback.extract_stack()[prefix_length:-5] |
|
2199 |
self.stack = ''.join(traceback.format_list(stack)) |
|
2200 |
||
2201 |
def __str__(self): |
|
2202 |
return self.call.method |
|
2203 |
||
2204 |
def __repr__(self): |
|
2205 |
return self.call.method |
|
2206 |
||
2207 |
def stack(self): |
|
2208 |
return self.stack |
|
2209 |
||
2210 |
||
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2211 |
class TestCaseWithMemoryTransport(TestCase): |
2212 |
"""Common test class for tests that do not need disk resources. |
|
2213 |
||
2214 |
Tests that need disk resources should derive from TestCaseWithTransport.
|
|
2215 |
||
2216 |
TestCaseWithMemoryTransport sets the TEST_ROOT variable for all bzr tests.
|
|
2217 |
||
2218 |
For TestCaseWithMemoryTransport the test_home_dir is set to the name of
|
|
2219 |
a directory which does not exist. This serves to help ensure test isolation
|
|
2220 |
is preserved. test_dir is set to the TEST_ROOT, as is cwd, because they
|
|
2221 |
must exist. However, TestCaseWithMemoryTransport does not offer local
|
|
2222 |
file defaults for the transport in tests, nor does it obey the command line
|
|
2223 |
override, so tests that accidentally write to the common directory should
|
|
2224 |
be rare.
|
|
|
2485.6.6
by Martin Pool
Put test root directory (containing per-test directories) in TMPDIR |
2225 |
|
2226 |
:cvar TEST_ROOT: Directory containing all temporary directories, plus
|
|
2227 |
a .bzr directory that stops us ascending higher into the filesystem.
|
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2228 |
"""
|
2229 |
||
2230 |
TEST_ROOT = None |
|
2231 |
_TEST_NAME = 'test' |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2232 |
|
|
1986.2.5
by Robert Collins
Unbreak transport tests. |
2233 |
def __init__(self, methodName='runTest'): |
|
3128.1.3
by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/. |
2234 |
# allow test parameterization after test construction and before test
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2235 |
# execution. Variables that the parameterizer sets need to be
|
|
1986.2.5
by Robert Collins
Unbreak transport tests. |
2236 |
# ones that are not set by setUp, or setUp will trash them.
|
2237 |
super(TestCaseWithMemoryTransport, self).__init__(methodName) |
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
2238 |
self.vfs_transport_factory = default_transport |
2239 |
self.transport_server = None |
|
|
1986.2.5
by Robert Collins
Unbreak transport tests. |
2240 |
self.transport_readonly_server = None |
|
2018.5.44
by Andrew Bennetts
Small changes to help a couple more tests pass. |
2241 |
self.__vfs_server = None |
|
1986.2.5
by Robert Collins
Unbreak transport tests. |
2242 |
|
|
2520.3.1
by Vincent Ladeuil
Fix 110448 by adding a relpath parameter to get_transport. |
2243 |
def get_transport(self, relpath=None): |
2244 |
"""Return a writeable transport. |
|
2245 |
||
2246 |
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. |
2247 |
"self._test_root"
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2248 |
|
|
2520.3.1
by Vincent Ladeuil
Fix 110448 by adding a relpath parameter to get_transport. |
2249 |
:param relpath: a path relative to the base url.
|
2250 |
"""
|
|
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
2251 |
t = _mod_transport.get_transport(self.get_url(relpath)) |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2252 |
self.assertFalse(t.is_readonly()) |
2253 |
return t |
|
2254 |
||
|
2520.3.1
by Vincent Ladeuil
Fix 110448 by adding a relpath parameter to get_transport. |
2255 |
def get_readonly_transport(self, relpath=None): |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2256 |
"""Return a readonly transport for the test scratch space |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2257 |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2258 |
This can be used to test that operations which should only need
|
2259 |
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. |
2260 |
|
2261 |
:param relpath: a path relative to the base url.
|
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2262 |
"""
|
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
2263 |
t = _mod_transport.get_transport(self.get_readonly_url(relpath)) |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2264 |
self.assertTrue(t.is_readonly()) |
2265 |
return t |
|
2266 |
||
|
2004.1.19
by v.ladeuil+lp at free
Test protocol version in http responses. |
2267 |
def create_transport_readonly_server(self): |
2268 |
"""Create a transport server from class defined at init. |
|
2269 |
||
|
2145.1.1
by mbp at sourcefrog
merge urllib keepalive etc |
2270 |
This is mostly a hook for daughter classes.
|
|
2004.1.19
by v.ladeuil+lp at free
Test protocol version in http responses. |
2271 |
"""
|
2272 |
return self.transport_readonly_server() |
|
2273 |
||
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2274 |
def get_readonly_server(self): |
2275 |
"""Get the server instance for the readonly transport |
|
2276 |
||
2277 |
This is useful for some tests with specific servers to do diagnostics.
|
|
2278 |
"""
|
|
2279 |
if self.__readonly_server is None: |
|
2280 |
if self.transport_readonly_server is None: |
|
2281 |
# readonly decorator requested
|
|
|
5017.3.23
by Vincent Ladeuil
selftest -s bt.test_bzrdir passing |
2282 |
self.__readonly_server = test_server.ReadonlyServer() |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2283 |
else: |
|
4659.1.2
by Robert Collins
Refactor creation and shutdown of test servers to use a common helper, |
2284 |
# explicit readonly transport.
|
|
2004.1.19
by v.ladeuil+lp at free
Test protocol version in http responses. |
2285 |
self.__readonly_server = self.create_transport_readonly_server() |
|
4659.1.2
by Robert Collins
Refactor creation and shutdown of test servers to use a common helper, |
2286 |
self.start_server(self.__readonly_server, |
2287 |
self.get_vfs_only_server()) |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2288 |
return self.__readonly_server |
2289 |
||
2290 |
def get_readonly_url(self, relpath=None): |
|
2291 |
"""Get a URL for the readonly transport. |
|
2292 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2293 |
This will either be backed by '.' or a decorator to the transport
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2294 |
used by self.get_url()
|
2295 |
relpath provides for clients to get a path relative to the base url.
|
|
2296 |
These should only be downwards relative, not upwards.
|
|
2297 |
"""
|
|
2298 |
base = self.get_readonly_server().get_url() |
|
|
2520.3.1
by Vincent Ladeuil
Fix 110448 by adding a relpath parameter to get_transport. |
2299 |
return self._adjust_url(base, relpath) |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2300 |
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
2301 |
def get_vfs_only_server(self): |
|
2018.5.44
by Andrew Bennetts
Small changes to help a couple more tests pass. |
2302 |
"""Get the vfs only read/write server instance. |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2303 |
|
2304 |
This is useful for some tests with specific servers that need
|
|
2305 |
diagnostics.
|
|
2306 |
||
2307 |
For TestCaseWithMemoryTransport this is always a MemoryServer, and there
|
|
2308 |
is no means to override it.
|
|
2309 |
"""
|
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
2310 |
if self.__vfs_server is None: |
|
5017.3.45
by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry. |
2311 |
self.__vfs_server = memory.MemoryServer() |
|
4659.1.2
by Robert Collins
Refactor creation and shutdown of test servers to use a common helper, |
2312 |
self.start_server(self.__vfs_server) |
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
2313 |
return self.__vfs_server |
2314 |
||
2315 |
def get_server(self): |
|
2316 |
"""Get the read/write server instance. |
|
2317 |
||
2318 |
This is useful for some tests with specific servers that need
|
|
2319 |
diagnostics.
|
|
2320 |
||
2321 |
This is built from the self.transport_server factory. If that is None,
|
|
2322 |
then the self.get_vfs_server is returned.
|
|
2323 |
"""
|
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2324 |
if self.__server is None: |
|
4659.1.2
by Robert Collins
Refactor creation and shutdown of test servers to use a common helper, |
2325 |
if (self.transport_server is None or self.transport_server is |
2326 |
self.vfs_transport_factory): |
|
2327 |
self.__server = self.get_vfs_only_server() |
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
2328 |
else: |
2329 |
# bring up a decorated means of access to the vfs only server.
|
|
2330 |
self.__server = self.transport_server() |
|
|
4659.1.2
by Robert Collins
Refactor creation and shutdown of test servers to use a common helper, |
2331 |
self.start_server(self.__server, self.get_vfs_only_server()) |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2332 |
return self.__server |
2333 |
||
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
2334 |
def _adjust_url(self, base, relpath): |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2335 |
"""Get a URL (or maybe a path) for the readwrite transport. |
2336 |
||
2337 |
This will either be backed by '.' or to an equivalent non-file based
|
|
2338 |
facility.
|
|
2339 |
relpath provides for clients to get a path relative to the base url.
|
|
2340 |
These should only be downwards relative, not upwards.
|
|
2341 |
"""
|
|
2342 |
if relpath is not None and relpath != '.': |
|
2343 |
if not base.endswith('/'): |
|
2344 |
base = base + '/' |
|
2345 |
# XXX: Really base should be a url; we did after all call
|
|
2346 |
# get_url()! But sometimes it's just a path (from
|
|
2347 |
# LocalAbspathServer), and it'd be wrong to append urlescaped data
|
|
2348 |
# to a non-escaped local path.
|
|
2349 |
if base.startswith('./') or base.startswith('/'): |
|
2350 |
base += relpath |
|
2351 |
else: |
|
2352 |
base += urlutils.escape(relpath) |
|
2353 |
return base |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2354 |
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
2355 |
def get_url(self, relpath=None): |
2356 |
"""Get a URL (or maybe a path) for the readwrite transport. |
|
2357 |
||
2358 |
This will either be backed by '.' or to an equivalent non-file based
|
|
2359 |
facility.
|
|
2360 |
relpath provides for clients to get a path relative to the base url.
|
|
2361 |
These should only be downwards relative, not upwards.
|
|
2362 |
"""
|
|
2363 |
base = self.get_server().get_url() |
|
2364 |
return self._adjust_url(base, relpath) |
|
2365 |
||
2366 |
def get_vfs_only_url(self, relpath=None): |
|
2367 |
"""Get a URL (or maybe a path for the plain old vfs transport. |
|
2368 |
||
|
2018.18.9
by Martin Pool
remote Repository.tarball builds a temporary directory and tars that |
2369 |
This will never be a smart protocol. It always has all the
|
2370 |
capabilities of the local filesystem, but it might actually be a
|
|
2371 |
MemoryTransport or some other similar virtual filesystem.
|
|
2372 |
||
|
2399.1.16
by John Arbash Meinel
[merge] bzr.dev 2466 |
2373 |
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 |
2374 |
get_url and get_readonly_url.
|
|
2399.1.6
by John Arbash Meinel
Cleanup bzrlib/tests/__init__.py so that epydoc doesn't complain. |
2375 |
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
2376 |
:param relpath: provides for clients to get a path relative to the base
|
2377 |
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. |
2378 |
:return: A URL
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
2379 |
"""
|
2380 |
base = self.get_vfs_only_server().get_url() |
|
2381 |
return self._adjust_url(base, relpath) |
|
2382 |
||
|
2817.5.1
by Vincent Ladeuil
Catch leaking tests. |
2383 |
def _create_safety_net(self): |
2384 |
"""Make a fake bzr directory. |
|
2385 |
||
|
2875.1.1
by Vincent Ladeuil
Fix #147986 by monitoring a safety .bzr directory. |
2386 |
This prevents any tests propagating up onto the TEST_ROOT directory's
|
2387 |
real branch.
|
|
|
2817.5.1
by Vincent Ladeuil
Catch leaking tests. |
2388 |
"""
|
2389 |
root = TestCaseWithMemoryTransport.TEST_ROOT |
|
2390 |
bzrdir.BzrDir.create_standalone_workingtree(root) |
|
2391 |
||
2392 |
def _check_safety_net(self): |
|
2393 |
"""Check that the safety .bzr directory have not been touched. |
|
2394 |
||
2395 |
_make_test_root have created a .bzr directory to prevent tests from
|
|
2396 |
propagating. This method ensures than a test did not leaked.
|
|
2397 |
"""
|
|
2398 |
root = TestCaseWithMemoryTransport.TEST_ROOT |
|
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
2399 |
self.permit_url(_mod_transport.get_transport(root).base) |
|
2817.5.1
by Vincent Ladeuil
Catch leaking tests. |
2400 |
wt = workingtree.WorkingTree.open(root) |
2401 |
last_rev = wt.last_revision() |
|
2402 |
if last_rev != 'null:': |
|
2403 |
# The current test have modified the /bzr directory, we need to
|
|
2404 |
# recreate a new one or all the followng tests will fail.
|
|
2405 |
# If you need to inspect its content uncomment the following line
|
|
2406 |
# import pdb; pdb.set_trace()
|
|
|
4807.3.3
by John Arbash Meinel
Report the test-id when we fail to delete a testing dir. |
2407 |
_rmtree_temp_dir(root + '/.bzr', test_id=self.id()) |
|
2817.5.1
by Vincent Ladeuil
Catch leaking tests. |
2408 |
self._create_safety_net() |
2409 |
raise AssertionError('%s/.bzr should not be modified' % root) |
|
2410 |
||
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2411 |
def _make_test_root(self): |
|
2817.5.1
by Vincent Ladeuil
Catch leaking tests. |
2412 |
if TestCaseWithMemoryTransport.TEST_ROOT is None: |
|
4707.1.1
by Vincent Ladeuil
Fix OSX and FreeBSD failures. |
2413 |
# Watch out for tricky test dir (on OSX /tmp -> /private/tmp)
|
2414 |
root = osutils.realpath(osutils.mkdtemp(prefix='testbzr-', |
|
2415 |
suffix='.tmp')) |
|
|
2817.5.1
by Vincent Ladeuil
Catch leaking tests. |
2416 |
TestCaseWithMemoryTransport.TEST_ROOT = root |
2417 |
||
2418 |
self._create_safety_net() |
|
2419 |
||
2420 |
# The same directory is used by all tests, and we're not
|
|
2421 |
# specifically told when all tests are finished. This will do.
|
|
2422 |
atexit.register(_rmtree_temp_dir, root) |
|
2423 |
||
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
2424 |
self.permit_dir(TestCaseWithMemoryTransport.TEST_ROOT) |
|
2817.5.1
by Vincent Ladeuil
Catch leaking tests. |
2425 |
self.addCleanup(self._check_safety_net) |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2426 |
|
2427 |
def makeAndChdirToTestDir(self): |
|
2428 |
"""Create a temporary directories for this one test. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2429 |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2430 |
This must set self.test_home_dir and self.test_dir and chdir to
|
2431 |
self.test_dir.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2432 |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2433 |
For TestCaseWithMemoryTransport we chdir to the TEST_ROOT for this test.
|
2434 |
"""
|
|
2435 |
os.chdir(TestCaseWithMemoryTransport.TEST_ROOT) |
|
2436 |
self.test_dir = TestCaseWithMemoryTransport.TEST_ROOT |
|
2437 |
self.test_home_dir = self.test_dir + "/MemoryTransportMissingHomeDir" |
|
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
2438 |
self.permit_dir(self.test_dir) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2439 |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2440 |
def make_branch(self, relpath, format=None): |
2441 |
"""Create a branch on the transport at relpath.""" |
|
2442 |
repo = self.make_repository(relpath, format=format) |
|
2443 |
return repo.bzrdir.create_branch() |
|
2444 |
||
2445 |
def make_bzrdir(self, relpath, format=None): |
|
2446 |
try: |
|
2447 |
# might be a relative or absolute path
|
|
2448 |
maybe_a_url = self.get_url(relpath) |
|
2449 |
segments = maybe_a_url.rsplit('/', 1) |
|
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
2450 |
t = _mod_transport.get_transport(maybe_a_url) |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2451 |
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() |
2452 |
t.ensure_base() |
|
2230.3.22
by Aaron Bentley
Make test suite use format registry default, not BzrDir default |
2453 |
if format is None: |
2454 |
format = 'default' |
|
|
2204.4.11
by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests |
2455 |
if isinstance(format, basestring): |
2456 |
format = bzrdir.format_registry.make_bzrdir(format) |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2457 |
return format.initialize_on_transport(t) |
2458 |
except errors.UninitializableFormat: |
|
2459 |
raise TestSkipped("Format %s is not initializable." % format) |
|
2460 |
||
2461 |
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 |
2462 |
"""Create a repository on our default transport at relpath. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2463 |
|
|
2018.18.9
by Martin Pool
remote Repository.tarball builds a temporary directory and tars that |
2464 |
Note that relpath must be a relative path, not a full url.
|
2465 |
"""
|
|
2466 |
# FIXME: If you create a remoterepository this returns the underlying
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2467 |
# real format, which is incorrect. Actually we should make sure that
|
|
2018.18.9
by Martin Pool
remote Repository.tarball builds a temporary directory and tars that |
2468 |
# RemoteBzrDir returns a RemoteRepository.
|
2469 |
# maybe mbp 20070410
|
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2470 |
made_control = self.make_bzrdir(relpath, format=format) |
2471 |
return made_control.create_repository(shared=shared) |
|
2472 |
||
|
5215.3.8
by Marius Kruger
move make_smart_server back to TestCaseWithMemoryTransport from TestCaseWithTransport as per review |
2473 |
def make_smart_server(self, path, backing_server=None): |
2474 |
if backing_server is None: |
|
2475 |
backing_server = self.get_server() |
|
2476 |
smart_server = test_server.SmartTCPServer_for_testing() |
|
2477 |
self.start_server(smart_server, backing_server) |
|
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
2478 |
remote_transport = _mod_transport.get_transport(smart_server.get_url() |
2479 |
).clone(path) |
|
|
5215.3.8
by Marius Kruger
move make_smart_server back to TestCaseWithMemoryTransport from TestCaseWithTransport as per review |
2480 |
return remote_transport |
2481 |
||
|
1986.4.9
by Robert Collins
``TestCase.make_branch_and_memory_tree`` now takes a format |
2482 |
def make_branch_and_memory_tree(self, relpath, format=None): |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2483 |
"""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 |
2484 |
b = self.make_branch(relpath, format=format) |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2485 |
return memorytree.MemoryTree.create_on_branch(b) |
2486 |
||
|
4476.3.59
by Andrew Bennetts
Undo changes that aren't needed anymore. |
2487 |
def make_branch_builder(self, relpath, format=None): |
|
4257.3.8
by Andrew Bennetts
Fix TestCase.make_branch_builder to make a branch in the specified format. Also add an interrepo test scenario for KnitPack1 -> KnitPack6RichRoot, which fails. |
2488 |
branch = self.make_branch(relpath, format=format) |
|
4476.3.59
by Andrew Bennetts
Undo changes that aren't needed anymore. |
2489 |
return branchbuilder.BranchBuilder(branch=branch) |
|
3567.4.12
by John Arbash Meinel
Expose the branch building framework to the test suite. |
2490 |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2491 |
def overrideEnvironmentForTesting(self): |
|
4815.2.2
by Michael Hudson
another approach |
2492 |
test_home_dir = self.test_home_dir |
2493 |
if isinstance(test_home_dir, unicode): |
|
2494 |
test_home_dir = test_home_dir.encode(sys.getfilesystemencoding()) |
|
|
5570.3.8
by Vincent Ladeuil
More use cases for overrideEnv. |
2495 |
self.overrideEnv('HOME', test_home_dir) |
2496 |
self.overrideEnv('BZR_HOME', test_home_dir) |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2497 |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2498 |
def setUp(self): |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2499 |
super(TestCaseWithMemoryTransport, self).setUp() |
|
5247.2.12
by Vincent Ladeuil
Ensure that all transports close their underlying connection. |
2500 |
# Ensure that ConnectedTransport doesn't leak sockets
|
2501 |
def get_transport_with_cleanup(*args, **kwargs): |
|
|
5247.2.38
by Vincent Ladeuil
Don't use a test attribute for orig_get_transport. |
2502 |
t = orig_get_transport(*args, **kwargs) |
|
5247.2.12
by Vincent Ladeuil
Ensure that all transports close their underlying connection. |
2503 |
if isinstance(t, _mod_transport.ConnectedTransport): |
2504 |
self.addCleanup(t.disconnect) |
|
2505 |
return t |
|
2506 |
||
|
5462.6.1
by Martin
Hack to make the intention of get_transport_with_cleanup correct in the face of lazy imports |
2507 |
orig_get_transport = self.overrideAttr(_mod_transport, '_get_transport', |
|
5247.2.38
by Vincent Ladeuil
Don't use a test attribute for orig_get_transport. |
2508 |
get_transport_with_cleanup) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2509 |
self._make_test_root() |
|
4985.2.1
by Vincent Ladeuil
Deploy addAttrCleanup on the whole test suite. |
2510 |
self.addCleanup(os.chdir, os.getcwdu()) |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2511 |
self.makeAndChdirToTestDir() |
2512 |
self.overrideEnvironmentForTesting() |
|
2513 |
self.__readonly_server = None |
|
2514 |
self.__server = None |
|
|
2381.1.3
by Robert Collins
Review feedback. |
2515 |
self.reduceLockdirTimeout() |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2516 |
|
|
4017.2.1
by Robert Collins
Add BzrDirFormatMeta1 test for the amount of rpc calls made initializing over the network. |
2517 |
def setup_smart_server_with_call_log(self): |
2518 |
"""Sets up a smart server as the transport server with a call log.""" |
|
|
5017.3.23
by Vincent Ladeuil
selftest -s bt.test_bzrdir passing |
2519 |
self.transport_server = test_server.SmartTCPServer_for_testing |
|
4017.2.1
by Robert Collins
Add BzrDirFormatMeta1 test for the amount of rpc calls made initializing over the network. |
2520 |
self.hpss_calls = [] |
|
4070.3.1
by Robert Collins
Alter branch sprouting with an alternate fix for stacked branches that does not require multiple copy_content_into and set_parent calls, reducing IO and round trips. |
2521 |
import traceback |
2522 |
# Skip the current stack down to the caller of
|
|
2523 |
# setup_smart_server_with_call_log
|
|
2524 |
prefix_length = len(traceback.extract_stack()) - 2 |
|
|
4017.2.1
by Robert Collins
Add BzrDirFormatMeta1 test for the amount of rpc calls made initializing over the network. |
2525 |
def capture_hpss_call(params): |
|
4070.3.1
by Robert Collins
Alter branch sprouting with an alternate fix for stacked branches that does not require multiple copy_content_into and set_parent calls, reducing IO and round trips. |
2526 |
self.hpss_calls.append( |
2527 |
CapturedCall(params, prefix_length)) |
|
|
4017.2.1
by Robert Collins
Add BzrDirFormatMeta1 test for the amount of rpc calls made initializing over the network. |
2528 |
client._SmartClient.hooks.install_named_hook( |
2529 |
'call', capture_hpss_call, None) |
|
2530 |
||
2531 |
def reset_smart_call_log(self): |
|
2532 |
self.hpss_calls = [] |
|
2533 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2534 |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2535 |
class TestCaseInTempDir(TestCaseWithMemoryTransport): |
2536 |
"""Derived class that runs a test within a temporary directory. |
|
2537 |
||
2538 |
This is useful for tests that need to create a branch, etc.
|
|
2539 |
||
2540 |
The directory is created in a slightly complex way: for each
|
|
2541 |
Python invocation, a new temporary top-level directory is created.
|
|
2542 |
All test cases create their own directory within that. If the
|
|
2543 |
tests complete successfully, the directory is removed.
|
|
2544 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2545 |
:ivar test_base_dir: The path of the top-level directory for this
|
|
2485.6.3
by Martin Pool
TestCaseInTempDir takes responsibility for cleaning up its own test dir |
2546 |
test, which contains a home directory and a work directory.
|
2547 |
||
2548 |
:ivar test_home_dir: An initially empty directory under test_base_dir
|
|
2549 |
which is used as $HOME for this test.
|
|
2550 |
||
2551 |
:ivar test_dir: A directory under test_base_dir used as the current
|
|
2552 |
directory when the test proper is run.
|
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2553 |
"""
|
2554 |
||
2555 |
OVERRIDE_PYTHON = 'python' |
|
2556 |
||
2557 |
def check_file_contents(self, filename, expect): |
|
2558 |
self.log("check contents of file %s" % filename) |
|
|
4708.2.2
by Martin
Workingtree changes sitting around since November, more explict closing of files in bzrlib |
2559 |
f = file(filename) |
2560 |
try: |
|
2561 |
contents = f.read() |
|
2562 |
finally: |
|
2563 |
f.close() |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2564 |
if contents != expect: |
2565 |
self.log("expected: %r" % expect) |
|
2566 |
self.log("actually: %r" % contents) |
|
2567 |
self.fail("contents of %s not as expected" % filename) |
|
2568 |
||
|
3549.2.4
by Martin Pool
Rename _getTestDirPrefix not to look like a test |
2569 |
def _getTestDirPrefix(self): |
|
3549.2.1
by Martin Pool
Use test names in the temporary directory name |
2570 |
# create a directory within the top level test directory
|
|
4615.3.1
by Martin
Extend work around for path length limitations in selftest to cygwin |
2571 |
if sys.platform in ('win32', 'cygwin'): |
|
3549.2.1
by Martin Pool
Use test names in the temporary directory name |
2572 |
name_prefix = re.sub('[<>*=+",:;_/\\-]', '_', self.id()) |
2573 |
# windows is likely to have path-length limits so use a short name
|
|
2574 |
name_prefix = name_prefix[-30:] |
|
2575 |
else: |
|
2576 |
name_prefix = re.sub('[/]', '_', self.id()) |
|
2577 |
return name_prefix |
|
2578 |
||
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2579 |
def makeAndChdirToTestDir(self): |
2580 |
"""See TestCaseWithMemoryTransport.makeAndChdirToTestDir(). |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2581 |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2582 |
For TestCaseInTempDir we create a temporary directory based on the test
|
2583 |
name and then create two subdirs - test and home under it.
|
|
2584 |
"""
|
|
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
2585 |
name_prefix = osutils.pathjoin(TestCaseWithMemoryTransport.TEST_ROOT, |
2586 |
self._getTestDirPrefix()) |
|
|
3549.2.1
by Martin Pool
Use test names in the temporary directory name |
2587 |
name = name_prefix |
2588 |
for i in range(100): |
|
2589 |
if os.path.exists(name): |
|
2590 |
name = name_prefix + '_' + str(i) |
|
2591 |
else: |
|
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
2592 |
# now create test and home directories within this dir
|
2593 |
self.test_base_dir = name |
|
2594 |
self.addCleanup(self.deleteTestDir) |
|
2595 |
os.mkdir(self.test_base_dir) |
|
|
3549.2.1
by Martin Pool
Use test names in the temporary directory name |
2596 |
break
|
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
2597 |
self.permit_dir(self.test_base_dir) |
2598 |
# 'sprouting' and 'init' of a branch both walk up the tree to find
|
|
2599 |
# stacking policy to honour; create a bzr dir with an unshared
|
|
2600 |
# repository (but not a branch - our code would be trying to escape
|
|
2601 |
# then!) to stop them, and permit it to be read.
|
|
2602 |
# control = bzrdir.BzrDir.create(self.test_base_dir)
|
|
2603 |
# control.create_repository()
|
|
|
2485.6.3
by Martin Pool
TestCaseInTempDir takes responsibility for cleaning up its own test dir |
2604 |
self.test_home_dir = self.test_base_dir + '/home' |
|
2485.6.1
by Martin Pool
Remove duplication in TestCaseInTempDir.makeAndChdirToTestDir |
2605 |
os.mkdir(self.test_home_dir) |
|
2485.6.3
by Martin Pool
TestCaseInTempDir takes responsibility for cleaning up its own test dir |
2606 |
self.test_dir = self.test_base_dir + '/work' |
|
2485.6.1
by Martin Pool
Remove duplication in TestCaseInTempDir.makeAndChdirToTestDir |
2607 |
os.mkdir(self.test_dir) |
2608 |
os.chdir(self.test_dir) |
|
2609 |
# put name of test inside
|
|
|
2485.6.3
by Martin Pool
TestCaseInTempDir takes responsibility for cleaning up its own test dir |
2610 |
f = file(self.test_base_dir + '/name', 'w') |
|
2485.6.1
by Martin Pool
Remove duplication in TestCaseInTempDir.makeAndChdirToTestDir |
2611 |
try: |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
2612 |
f.write(self.id()) |
|
2485.6.1
by Martin Pool
Remove duplication in TestCaseInTempDir.makeAndChdirToTestDir |
2613 |
finally: |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
2614 |
f.close() |
|
2485.6.3
by Martin Pool
TestCaseInTempDir takes responsibility for cleaning up its own test dir |
2615 |
|
2616 |
def deleteTestDir(self): |
|
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
2617 |
os.chdir(TestCaseWithMemoryTransport.TEST_ROOT) |
|
4807.3.3
by John Arbash Meinel
Report the test-id when we fail to delete a testing dir. |
2618 |
_rmtree_temp_dir(self.test_base_dir, test_id=self.id()) |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2619 |
|
|
2193.2.1
by Alexander Belchenko
selftest: build tree for test with binary line-endings by default |
2620 |
def build_tree(self, shape, line_endings='binary', transport=None): |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2621 |
"""Build a test tree according to a pattern. |
2622 |
||
2623 |
shape is a sequence of file specifications. If the final
|
|
2624 |
character is '/', a directory is created.
|
|
2625 |
||
|
1755.3.1
by Robert Collins
Tune the time to build our kernel_like tree : make LocalTransport.put faster, AtomicFile faster, LocalTransport.append faster. |
2626 |
This assumes that all the elements in the tree being built are new.
|
2627 |
||
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2628 |
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. |
2629 |
|
|
3034.4.8
by Alexander Belchenko
TestCaseInTempDir.build_tree now checks type of shape argument. |
2630 |
: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 |
2631 |
: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. |
2632 |
in binary mode, exact contents are written in native mode, the
|
2633 |
line endings match the default platform endings.
|
|
2634 |
:param transport: A transport to write to, for building trees on VFS's.
|
|
2635 |
If the transport is readonly or None, "." is opened automatically.
|
|
2636 |
:return: None
|
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2637 |
"""
|
|
3044.1.1
by Martin Pool
Fix up calls to TestCase.build_tree passing a string rather than a list |
2638 |
if type(shape) not in (list, tuple): |
2639 |
raise AssertionError("Parameter 'shape' should be " |
|
2640 |
"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. |
2641 |
# It's OK to just create them using forward slashes on windows.
|
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
2642 |
if transport is None or transport.is_readonly(): |
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
2643 |
transport = _mod_transport.get_transport(".") |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2644 |
for name in shape: |
|
3757.3.2
by Vincent Ladeuil
Add a credential store for '.netrc'. |
2645 |
self.assertIsInstance(name, basestring) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2646 |
if name[-1] == '/': |
|
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
2647 |
transport.mkdir(urlutils.escape(name[:-1])) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2648 |
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 |
2649 |
if line_endings == 'binary': |
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
2650 |
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 |
2651 |
elif line_endings == 'native': |
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
2652 |
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 |
2653 |
else: |
|
2227.2.2
by v.ladeuil+lp at free
Cleanup. |
2654 |
raise errors.BzrError( |
2655 |
'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 |
2656 |
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 |
2657 |
transport.put_bytes_non_atomic(urlutils.escape(name), content) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2658 |
|
|
5200.2.4
by Robert Collins
Review feedback. |
2659 |
build_tree_contents = staticmethod(treeshape.build_tree_contents) |
|
1185.16.53
by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests |
2660 |
|
|
2655.2.5
by Marius Kruger
* Improve BzrRemoveChangedFilesError message. |
2661 |
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. |
2662 |
"""Assert whether path or paths are in the WorkingTree""" |
2663 |
if tree is None: |
|
2664 |
tree = workingtree.WorkingTree.open(root_path) |
|
2665 |
if not isinstance(path, basestring): |
|
2666 |
for p in path: |
|
|
3585.2.1
by Robert Collins
Create acceptance test for bug 150438. |
2667 |
self.assertInWorkingTree(p, tree=tree) |
|
2292.1.1
by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file. |
2668 |
else: |
2669 |
self.assertIsNot(tree.path2id(path), None, |
|
2670 |
path+' not in working tree.') |
|
2671 |
||
|
2655.2.5
by Marius Kruger
* Improve BzrRemoveChangedFilesError message. |
2672 |
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. |
2673 |
"""Assert whether path or paths are not in the WorkingTree""" |
2674 |
if tree is None: |
|
2675 |
tree = workingtree.WorkingTree.open(root_path) |
|
2676 |
if not isinstance(path, basestring): |
|
2677 |
for p in path: |
|
2678 |
self.assertNotInWorkingTree(p,tree=tree) |
|
2679 |
else: |
|
2680 |
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 |
2681 |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
2682 |
|
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
2683 |
class TestCaseWithTransport(TestCaseInTempDir): |
2684 |
"""A test case that provides get_url and get_readonly_url facilities. |
|
2685 |
||
2686 |
These back onto two transport servers, one for readonly access and one for
|
|
2687 |
read write access.
|
|
2688 |
||
2689 |
If no explicit class is provided for readonly access, a
|
|
2690 |
ReadonlyTransportDecorator is used instead which allows the use of non disk
|
|
2691 |
based read write transports.
|
|
2692 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2693 |
If an explicit class is provided for readonly access, that server and the
|
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
2694 |
readwrite one must both define get_url() as resolving to os.getcwd().
|
2695 |
"""
|
|
2696 |
||
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
2697 |
def get_vfs_only_server(self): |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2698 |
"""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. |
2699 |
|
2700 |
This is useful for some tests with specific servers that need
|
|
2701 |
diagnostics.
|
|
2702 |
"""
|
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
2703 |
if self.__vfs_server is None: |
2704 |
self.__vfs_server = self.vfs_transport_factory() |
|
|
4659.1.2
by Robert Collins
Refactor creation and shutdown of test servers to use a common helper, |
2705 |
self.start_server(self.__vfs_server) |
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
2706 |
return self.__vfs_server |
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
2707 |
|
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
2708 |
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. |
2709 |
"""Create a branch on the transport and a tree locally. |
2710 |
||
|
1910.7.17
by Andrew Bennetts
Various cosmetic changes. |
2711 |
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. |
2712 |
the transport. In that case if the vfs_transport_factory is
|
2713 |
LocalURLServer the working tree is created in the local
|
|
|
2018.5.88
by Andrew Bennetts
Clarify make_branch_and_tree docstring a little. |
2714 |
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. |
2715 |
repository will also be accessed locally. Otherwise a lightweight
|
2716 |
checkout is created and returned.
|
|
|
1910.7.17
by Andrew Bennetts
Various cosmetic changes. |
2717 |
|
|
4650.1.2
by Robert Collins
Remove unnecessary use of an SFTP server connection to test the behaviour of TestCase.make_branch_and_tree. |
2718 |
We do this because we can't physically create a tree in the local
|
2719 |
path, with a branch reference to the transport_factory url, and
|
|
2720 |
a branch + repository in the vfs_transport, unless the vfs_transport
|
|
2721 |
namespace is distinct from the local disk - the two branch objects
|
|
2722 |
would collide. While we could construct a tree with its branch object
|
|
2723 |
pointing at the transport_factory transport in memory, reopening it
|
|
2724 |
would behaving unexpectedly, and has in the past caused testing bugs
|
|
2725 |
when we tried to do it that way.
|
|
2726 |
||
|
1910.7.17
by Andrew Bennetts
Various cosmetic changes. |
2727 |
:param format: The BzrDirFormat.
|
2728 |
:returns: the WorkingTree.
|
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
2729 |
"""
|
|
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. |
2730 |
# TODO: always use the local disk path for the working tree,
|
2731 |
# this obviously requires a format that supports branch references
|
|
2732 |
# so check for that by checking bzrdir.BzrDirFormat.get_default_format()
|
|
2733 |
# RBC 20060208
|
|
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
2734 |
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. |
2735 |
try: |
2736 |
return b.bzrdir.create_workingtree() |
|
2737 |
except errors.NotLocalUrl: |
|
|
1910.14.1
by Andrew Bennetts
Fix to make_branch_and_tree's behavior when used with an sftp transport. |
2738 |
# 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. |
2739 |
# transport can't support them, then we keep the non-disk-backed
|
2740 |
# branch and create a local checkout.
|
|
|
5017.3.6
by Vincent Ladeuil
Fix some fallouts of moving test servers around. |
2741 |
if self.vfs_transport_factory is test_server.LocalURLServer: |
|
2381.1.1
by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's. |
2742 |
# the branch is colocated on disk, we cannot create a checkout.
|
2743 |
# hopefully callers will expect this.
|
|
2744 |
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. |
2745 |
wt = local_controldir.create_workingtree() |
|
3489.2.5
by Andrew Bennetts
Tweak suggested by John's review. |
2746 |
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. |
2747 |
wt._branch = b |
2748 |
# Make sure that assigning to wt._branch fixes wt.branch,
|
|
2749 |
# in case the implementation details of workingtree objects
|
|
2750 |
# change.
|
|
2751 |
self.assertIs(b, wt.branch) |
|
2752 |
return wt |
|
|
2381.1.1
by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's. |
2753 |
else: |
2754 |
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. |
2755 |
|
|
1553.5.68
by Martin Pool
Add new TestCaseWithTransport.assertIsDirectory() and tests |
2756 |
def assertIsDirectory(self, relpath, transport): |
2757 |
"""Assert that relpath within transport is a directory. |
|
2758 |
||
2759 |
This may not be possible on all transports; in that case it propagates
|
|
2760 |
a TransportNotPossible.
|
|
2761 |
"""
|
|
2762 |
try: |
|
2763 |
mode = transport.stat(relpath).st_mode |
|
2764 |
except errors.NoSuchFile: |
|
2765 |
self.fail("path %s is not a directory; no such file" |
|
2766 |
% (relpath)) |
|
2767 |
if not stat.S_ISDIR(mode): |
|
2768 |
self.fail("path %s is not a directory; has mode %#o" |
|
2769 |
% (relpath, mode)) |
|
2770 |
||
|
1852.13.18
by Robert Collins
Write top level acceptance test for dirstate. |
2771 |
def assertTreesEqual(self, left, right): |
2772 |
"""Check that left and right have the same content and properties.""" |
|
2773 |
# we use a tree delta to check for equality of the content, and we
|
|
2774 |
# manually check for equality of other things such as the parents list.
|
|
2775 |
self.assertEqual(left.get_parent_ids(), right.get_parent_ids()) |
|
2776 |
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. |
2777 |
self.assertFalse(differences.has_changed(), |
2778 |
"Trees %r and %r are different: %r" % (left, right, differences)) |
|
|
1852.13.18
by Robert Collins
Write top level acceptance test for dirstate. |
2779 |
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2780 |
def setUp(self): |
2781 |
super(TestCaseWithTransport, self).setUp() |
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
2782 |
self.__vfs_server = None |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
2783 |
|
|
4695.3.2
by Vincent Ladeuil
Simplified and claried as per Robert's review. |
2784 |
def disable_missing_extensions_warning(self): |
2785 |
"""Some tests expect a precise stderr content. |
|
2786 |
||
2787 |
There is no point in forcing them to duplicate the extension related
|
|
2788 |
warning.
|
|
2789 |
"""
|
|
2790 |
config.GlobalConfig().set_user_option('ignore_missing_extensions', True) |
|
2791 |
||
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
2792 |
|
|
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
2793 |
class ChrootedTestCase(TestCaseWithTransport): |
2794 |
"""A support class that provides readonly urls outside the local namespace. |
|
2795 |
||
2796 |
This is done by checking if self.transport_server is a MemoryServer. if it
|
|
2797 |
is then we are chrooted already, if it is not then an HttpServer is used
|
|
2798 |
for readonly urls.
|
|
2799 |
||
2800 |
TODO RBC 20060127: make this an option to TestCaseWithTransport so it can
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2801 |
be used without needed to redo it when a different
|
|
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
2802 |
subclass is in use ?
|
2803 |
"""
|
|
2804 |
||
2805 |
def setUp(self): |
|
|
4731.2.9
by Vincent Ladeuil
Implement a new -Ethreads to better track the leaks. |
2806 |
from bzrlib.tests import http_server |
|
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
2807 |
super(ChrootedTestCase, self).setUp() |
|
5017.3.45
by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry. |
2808 |
if not self.vfs_transport_factory == memory.MemoryServer: |
|
4731.2.9
by Vincent Ladeuil
Implement a new -Ethreads to better track the leaks. |
2809 |
self.transport_readonly_server = http_server.HttpServer |
|
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
2810 |
|
2811 |
||
|
2921.6.9
by Robert Collins
* New helper function ``bzrlib.tests.condition_id_re`` which helps |
2812 |
def condition_id_re(pattern): |
2813 |
"""Create a condition filter which performs a re check on a test's id. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2814 |
|
|
2921.6.9
by Robert Collins
* New helper function ``bzrlib.tests.condition_id_re`` which helps |
2815 |
:param pattern: A regular expression string.
|
2816 |
:return: A callable that returns True if the re matches.
|
|
2817 |
"""
|
|
|
5326.2.1
by Parth Malwankar
added InvalidPattern error. |
2818 |
filter_re = re.compile(pattern, 0) |
|
2921.6.9
by Robert Collins
* New helper function ``bzrlib.tests.condition_id_re`` which helps |
2819 |
def condition(test): |
2820 |
test_id = test.id() |
|
2821 |
return filter_re.search(test_id) |
|
2822 |
return condition |
|
2823 |
||
2824 |
||
|
2921.6.8
by Robert Collins
* New helper function ``bzrlib.tests.condition_isinstance`` which helps |
2825 |
def condition_isinstance(klass_or_klass_list): |
2826 |
"""Create a condition filter which returns isinstance(param, klass). |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2827 |
|
|
2921.6.8
by Robert Collins
* New helper function ``bzrlib.tests.condition_isinstance`` which helps |
2828 |
:return: A callable which when called with one parameter obj return the
|
2829 |
result of isinstance(obj, klass_or_klass_list).
|
|
2830 |
"""
|
|
2831 |
def condition(obj): |
|
2832 |
return isinstance(obj, klass_or_klass_list) |
|
2833 |
return condition |
|
2834 |
||
2835 |
||
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2836 |
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. |
2837 |
"""Create a condition filter which verify that test's id in a list. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2838 |
|
|
3302.8.4
by Vincent Ladeuil
Cosmetic changes. |
2839 |
:param id_list: A TestIdList object.
|
|
3193.1.2
by Vincent Ladeuil
Add condition_id_in_list and filter_suite_by_id_list capabilities. |
2840 |
:return: A callable that returns True if the test's id appears in the list.
|
2841 |
"""
|
|
2842 |
def condition(test): |
|
|
3302.8.3
by Vincent Ladeuil
Use better names for TestIdList methods. |
2843 |
return id_list.includes(test.id()) |
|
3193.1.2
by Vincent Ladeuil
Add condition_id_in_list and filter_suite_by_id_list capabilities. |
2844 |
return condition |
2845 |
||
2846 |
||
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2847 |
def condition_id_startswith(starts): |
|
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
2848 |
"""Create a condition filter verifying that test's id starts with a string. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2849 |
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2850 |
:param starts: A list of string.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2851 |
:return: A callable that returns True if the test's id starts with one of
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2852 |
the given strings.
|
|
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
2853 |
"""
|
2854 |
def condition(test): |
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2855 |
for start in starts: |
2856 |
if test.id().startswith(start): |
|
2857 |
return True |
|
2858 |
return False |
|
|
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
2859 |
return condition |
2860 |
||
2861 |
||
|
2921.6.9
by Robert Collins
* New helper function ``bzrlib.tests.condition_id_re`` which helps |
2862 |
def exclude_tests_by_condition(suite, condition): |
2863 |
"""Create a test suite which excludes some tests from suite. |
|
2864 |
||
2865 |
:param suite: The suite to get tests from.
|
|
2866 |
:param condition: A callable whose result evaluates True when called with a
|
|
2867 |
test case which should be excluded from the result.
|
|
2868 |
:return: A suite which contains the tests found in suite that fail
|
|
2869 |
condition.
|
|
2870 |
"""
|
|
2871 |
result = [] |
|
2872 |
for test in iter_suite_tests(suite): |
|
2873 |
if not condition(test): |
|
2874 |
result.append(test) |
|
2875 |
return TestUtil.TestSuite(result) |
|
2876 |
||
2877 |
||
|
2921.6.7
by Robert Collins
* New helper function ``bzrlib.tests.filter_suite_by_condition`` which |
2878 |
def filter_suite_by_condition(suite, condition): |
2879 |
"""Create a test suite by filtering another one. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2880 |
|
|
2921.6.7
by Robert Collins
* New helper function ``bzrlib.tests.filter_suite_by_condition`` which |
2881 |
:param suite: The source suite.
|
2882 |
: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 |
2883 |
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 |
2884 |
:return: A suite which contains the tests found in suite that pass
|
2885 |
condition.
|
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2886 |
"""
|
|
2921.6.7
by Robert Collins
* New helper function ``bzrlib.tests.filter_suite_by_condition`` which |
2887 |
result = [] |
2888 |
for test in iter_suite_tests(suite): |
|
2889 |
if condition(test): |
|
2890 |
result.append(test) |
|
2891 |
return TestUtil.TestSuite(result) |
|
2892 |
||
2893 |
||
|
3400.3.6
by Martin Pool
Remove code deprecated prior to 1.1 and its tests |
2894 |
def filter_suite_by_re(suite, pattern): |
|
2394.2.8
by Ian Clatworthy
incorporate feedback from jam |
2895 |
"""Create a test suite by filtering another one. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2896 |
|
|
2394.2.8
by Ian Clatworthy
incorporate feedback from jam |
2897 |
:param suite: the source suite
|
2898 |
:param pattern: pattern that names must match
|
|
2899 |
:returns: the newly created suite
|
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2900 |
"""
|
|
2921.6.9
by Robert Collins
* New helper function ``bzrlib.tests.condition_id_re`` which helps |
2901 |
condition = condition_id_re(pattern) |
|
2921.6.7
by Robert Collins
* New helper function ``bzrlib.tests.filter_suite_by_condition`` which |
2902 |
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. |
2903 |
return result_suite |
|
2394.2.8
by Ian Clatworthy
incorporate feedback from jam |
2904 |
|
2905 |
||
|
3193.1.2
by Vincent Ladeuil
Add condition_id_in_list and filter_suite_by_id_list capabilities. |
2906 |
def filter_suite_by_id_list(suite, test_id_list): |
2907 |
"""Create a test suite by filtering another one. |
|
2908 |
||
2909 |
:param suite: The source suite.
|
|
2910 |
:param test_id_list: A list of the test ids to keep as strings.
|
|
2911 |
:returns: the newly created suite
|
|
2912 |
"""
|
|
2913 |
condition = condition_id_in_list(test_id_list) |
|
2914 |
result_suite = filter_suite_by_condition(suite, condition) |
|
2915 |
return result_suite |
|
2916 |
||
2917 |
||
|
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
2918 |
def filter_suite_by_id_startswith(suite, start): |
2919 |
"""Create a test suite by filtering another one. |
|
2920 |
||
2921 |
:param suite: The source suite.
|
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2922 |
: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. |
2923 |
:returns: the newly created suite
|
2924 |
"""
|
|
2925 |
condition = condition_id_startswith(start) |
|
2926 |
result_suite = filter_suite_by_condition(suite, condition) |
|
2927 |
return result_suite |
|
2928 |
||
2929 |
||
|
2921.6.2
by Robert Collins
* New helper method ``bzrlib.tests.exclude_tests_by_re`` which gives a new |
2930 |
def exclude_tests_by_re(suite, pattern): |
2931 |
"""Create a test suite which excludes some tests from suite. |
|
2932 |
||
2933 |
:param suite: The suite to get tests from.
|
|
2934 |
:param pattern: A regular expression string. Test ids that match this
|
|
2935 |
pattern will be excluded from the result.
|
|
2936 |
:return: A TestSuite that contains all the tests from suite without the
|
|
2937 |
tests that matched pattern. The order of tests is the same as it was in
|
|
2938 |
suite.
|
|
2939 |
"""
|
|
|
2921.6.9
by Robert Collins
* New helper function ``bzrlib.tests.condition_id_re`` which helps |
2940 |
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 |
2941 |
|
2942 |
||
|
2921.6.6
by Robert Collins
* The ``exclude_pattern`` and ``random_order`` parameters to the function |
2943 |
def preserve_input(something): |
2944 |
"""A helper for performing test suite transformation chains. |
|
2945 |
||
2946 |
:param something: Anything you want to preserve.
|
|
2947 |
:return: Something.
|
|
2948 |
"""
|
|
2949 |
return something |
|
2950 |
||
2951 |
||
|
3128.1.2
by Vincent Ladeuil
Tweak as per review feedback: s/randomise.*/randomize&/, 0.92 -> 1.0. |
2952 |
def randomize_suite(suite): |
|
2921.6.6
by Robert Collins
* The ``exclude_pattern`` and ``random_order`` parameters to the function |
2953 |
"""Return a new TestSuite with suite's tests in random order. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2954 |
|
|
2921.6.6
by Robert Collins
* The ``exclude_pattern`` and ``random_order`` parameters to the function |
2955 |
The tests in the input suite are flattened into a single suite in order to
|
2956 |
accomplish this. Any nested TestSuites are removed to provide global
|
|
2957 |
randomness.
|
|
2958 |
"""
|
|
|
2921.6.3
by Robert Collins
* New helper method ``bzrlib.tests.randomise_suite`` which returns a |
2959 |
tests = list(iter_suite_tests(suite)) |
2960 |
random.shuffle(tests) |
|
2961 |
return TestUtil.TestSuite(tests) |
|
2962 |
||
2963 |
||
|
3350.5.1
by Robert Collins
* New helper function for splitting test suites ``split_suite_by_condition``. |
2964 |
def split_suite_by_condition(suite, condition): |
2965 |
"""Split a test suite into two by a condition. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2966 |
|
|
3350.5.1
by Robert Collins
* New helper function for splitting test suites ``split_suite_by_condition``. |
2967 |
:param suite: The suite to split.
|
2968 |
:param condition: The condition to match on. Tests that match this
|
|
2969 |
condition are returned in the first test suite, ones that do not match
|
|
2970 |
are in the second suite.
|
|
2971 |
:return: A tuple of two test suites, where the first contains tests from
|
|
2972 |
suite matching the condition, and the second contains the remainder
|
|
2973 |
from suite. The order within each output suite is the same as it was in
|
|
2974 |
suite.
|
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2975 |
"""
|
|
3350.5.1
by Robert Collins
* New helper function for splitting test suites ``split_suite_by_condition``. |
2976 |
matched = [] |
2977 |
did_not_match = [] |
|
2978 |
for test in iter_suite_tests(suite): |
|
2979 |
if condition(test): |
|
2980 |
matched.append(test) |
|
2981 |
else: |
|
2982 |
did_not_match.append(test) |
|
2983 |
return TestUtil.TestSuite(matched), TestUtil.TestSuite(did_not_match) |
|
2984 |
||
2985 |
||
|
2921.6.1
by Robert Collins
* New helper method ``bzrlib.tests.split_suite_by_re`` which splits a test |
2986 |
def split_suite_by_re(suite, pattern): |
2987 |
"""Split a test suite into two by a regular expression. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2988 |
|
|
2921.6.1
by Robert Collins
* New helper method ``bzrlib.tests.split_suite_by_re`` which splits a test |
2989 |
:param suite: The suite to split.
|
2990 |
:param pattern: A regular expression string. Test ids that match this
|
|
2991 |
pattern will be in the first test suite returned, and the others in the
|
|
2992 |
second test suite returned.
|
|
2993 |
:return: A tuple of two test suites, where the first contains tests from
|
|
2994 |
suite matching pattern, and the second contains the remainder from
|
|
2995 |
suite. The order within each output suite is the same as it was in
|
|
2996 |
suite.
|
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2997 |
"""
|
|
3350.5.1
by Robert Collins
* New helper function for splitting test suites ``split_suite_by_condition``. |
2998 |
return split_suite_by_condition(suite, condition_id_re(pattern)) |
|
2213.2.1
by Martin Pool
Add selftest --first flag |
2999 |
|
3000 |
||
|
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
3001 |
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 |
3002 |
stop_on_failure=False, |
|
2213.2.1
by Martin Pool
Add selftest --first flag |
3003 |
transport=None, lsprof_timed=None, bench_history=None, |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
3004 |
matching_tests_first=None, |
|
2394.2.1
by Ian Clatworthy
--list and --exclude first cut |
3005 |
list_only=False, |
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
3006 |
random_seed=None, |
|
2418.4.1
by John Arbash Meinel
(Ian Clatworthy) Bugs #102679, #102686. Add --exclude and --randomize to 'bzr selftest' |
3007 |
exclude_pattern=None, |
|
4000.2.1
by Robert Collins
Add library level support for different test runners to bzrlib. |
3008 |
strict=False, |
|
4205.3.1
by Robert Collins
Refactor tests.run_suite to be more data driven, making it shorter and able to be extended more easily. |
3009 |
runner_class=None, |
|
4271.2.1
by Robert Collins
Move test prelude and suffix output to ExtendedTestResult |
3010 |
suite_decorators=None, |
|
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
3011 |
stream=None, |
3012 |
result_decorators=None, |
|
3013 |
):
|
|
|
4000.2.1
by Robert Collins
Add library level support for different test runners to bzrlib. |
3014 |
"""Run a test suite for bzr selftest. |
3015 |
||
3016 |
:param runner_class: The class of runner to use. Must support the
|
|
3017 |
constructor arguments passed by run_suite which are more than standard
|
|
3018 |
python uses.
|
|
3019 |
:return: A boolean indicating success.
|
|
3020 |
"""
|
|
|
2379.6.3
by Alexander Belchenko
Rework NUMBERED_DIRS usage to keep test_selftest.py passing the tests on win32 |
3021 |
TestCase._gather_lsprof_in_benchmarks = lsprof_timed |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
3022 |
if verbose: |
3023 |
verbosity = 2 |
|
3024 |
else: |
|
3025 |
verbosity = 1 |
|
|
4000.2.1
by Robert Collins
Add library level support for different test runners to bzrlib. |
3026 |
if runner_class is None: |
3027 |
runner_class = TextTestRunner |
|
|
4271.2.1
by Robert Collins
Move test prelude and suffix output to ExtendedTestResult |
3028 |
if stream is None: |
3029 |
stream = sys.stdout |
|
3030 |
runner = runner_class(stream=stream, |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
3031 |
descriptions=0, |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
3032 |
verbosity=verbosity, |
|
2379.6.3
by Alexander Belchenko
Rework NUMBERED_DIRS usage to keep test_selftest.py passing the tests on win32 |
3033 |
bench_history=bench_history, |
|
4271.2.1
by Robert Collins
Move test prelude and suffix output to ExtendedTestResult |
3034 |
strict=strict, |
|
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
3035 |
result_decorators=result_decorators, |
|
2379.6.3
by Alexander Belchenko
Rework NUMBERED_DIRS usage to keep test_selftest.py passing the tests on win32 |
3036 |
)
|
|
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
3037 |
runner.stop_on_failure=stop_on_failure |
|
4205.3.1
by Robert Collins
Refactor tests.run_suite to be more data driven, making it shorter and able to be extended more easily. |
3038 |
# built in decorator factories:
|
3039 |
decorators = [ |
|
3040 |
random_order(random_seed, runner), |
|
3041 |
exclude_tests(exclude_pattern), |
|
3042 |
]
|
|
3043 |
if matching_tests_first: |
|
3044 |
decorators.append(tests_first(pattern)) |
|
3045 |
else: |
|
3046 |
decorators.append(filter_tests(pattern)) |
|
3047 |
if suite_decorators: |
|
3048 |
decorators.extend(suite_decorators) |
|
|
4618.1.1
by Vincent Ladeuil
Make --parallel=fork work again. |
3049 |
# tell the result object how many tests will be running: (except if
|
|
4618.1.2
by Vincent Ladeuil
Fixed as per John's review. |
3050 |
# --parallel=fork is being used. Robert said he will provide a better
|
|
4618.1.1
by Vincent Ladeuil
Make --parallel=fork work again. |
3051 |
# progress design later -- vila 20090817)
|
|
4618.1.2
by Vincent Ladeuil
Fixed as per John's review. |
3052 |
if fork_decorator not in decorators: |
|
4618.1.1
by Vincent Ladeuil
Make --parallel=fork work again. |
3053 |
decorators.append(CountingDecorator) |
|
4205.3.1
by Robert Collins
Refactor tests.run_suite to be more data driven, making it shorter and able to be extended more easily. |
3054 |
for decorator in decorators: |
3055 |
suite = decorator(suite) |
|
|
4266.2.1
by Robert Collins
Remove noise from bzr selftest --list-only so that it is easier to use in scripts. |
3056 |
if list_only: |
|
4650.1.9
by Robert Collins
Detangle test listing: its more part of the ui layer not the execute-this-test-layer. |
3057 |
# Done after test suite decoration to allow randomisation etc
|
3058 |
# to take effect, though that is of marginal benefit.
|
|
3059 |
if verbosity >= 2: |
|
3060 |
stream.write("Listing tests only ...\n") |
|
3061 |
for t in iter_suite_tests(suite): |
|
3062 |
stream.write("%s\n" % (t.id())) |
|
|
4266.2.1
by Robert Collins
Remove noise from bzr selftest --list-only so that it is easier to use in scripts. |
3063 |
return True |
|
4650.1.9
by Robert Collins
Detangle test listing: its more part of the ui layer not the execute-this-test-layer. |
3064 |
result = runner.run(suite) |
|
4205.3.1
by Robert Collins
Refactor tests.run_suite to be more data driven, making it shorter and able to be extended more easily. |
3065 |
if strict: |
3066 |
return result.wasStrictlySuccessful() |
|
3067 |
else: |
|
3068 |
return result.wasSuccessful() |
|
3069 |
||
3070 |
||
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3071 |
# A registry where get() returns a suite decorator.
|
3072 |
parallel_registry = registry.Registry() |
|
|
4229.3.1
by Vincent Ladeuil
Fix selftest --parallel for ConcurrentTestSuite uses. |
3073 |
|
3074 |
||
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3075 |
def fork_decorator(suite): |
|
5393.5.2
by Martin
Move check 'closer to the metal' as requested by lifelss in review |
3076 |
if getattr(os, "fork", None) is None: |
3077 |
raise errors.BzrCommandError("platform does not support fork," |
|
3078 |
" try --parallel=subprocess instead.") |
|
|
4398.4.3
by Vincent Ladeuil
Detect # cores on win32 and Solaris too. |
3079 |
concurrency = osutils.local_concurrency() |
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3080 |
if concurrency == 1: |
3081 |
return suite |
|
3082 |
from testtools import ConcurrentTestSuite |
|
3083 |
return ConcurrentTestSuite(suite, fork_for_tests) |
|
3084 |
parallel_registry.register('fork', fork_decorator) |
|
|
4229.3.1
by Vincent Ladeuil
Fix selftest --parallel for ConcurrentTestSuite uses. |
3085 |
|
3086 |
||
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3087 |
def subprocess_decorator(suite): |
|
4398.4.3
by Vincent Ladeuil
Detect # cores on win32 and Solaris too. |
3088 |
concurrency = osutils.local_concurrency() |
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3089 |
if concurrency == 1: |
3090 |
return suite |
|
3091 |
from testtools import ConcurrentTestSuite |
|
3092 |
return ConcurrentTestSuite(suite, reinvoke_for_tests) |
|
3093 |
parallel_registry.register('subprocess', subprocess_decorator) |
|
3094 |
||
3095 |
||
|
4205.3.1
by Robert Collins
Refactor tests.run_suite to be more data driven, making it shorter and able to be extended more easily. |
3096 |
def exclude_tests(exclude_pattern): |
3097 |
"""Return a test suite decorator that excludes tests.""" |
|
3098 |
if exclude_pattern is None: |
|
3099 |
return identity_decorator |
|
3100 |
def decorator(suite): |
|
3101 |
return ExcludeDecorator(suite, exclude_pattern) |
|
3102 |
return decorator |
|
3103 |
||
3104 |
||
3105 |
def filter_tests(pattern): |
|
3106 |
if pattern == '.*': |
|
3107 |
return identity_decorator |
|
3108 |
def decorator(suite): |
|
3109 |
return FilterTestsDecorator(suite, pattern) |
|
3110 |
return decorator |
|
3111 |
||
3112 |
||
3113 |
def random_order(random_seed, runner): |
|
3114 |
"""Return a test suite decorator factory for randomising tests order. |
|
3115 |
|
|
3116 |
:param random_seed: now, a string which casts to a long, or a long.
|
|
3117 |
:param runner: A test runner with a stream attribute to report on.
|
|
3118 |
"""
|
|
3119 |
if random_seed is None: |
|
3120 |
return identity_decorator |
|
3121 |
def decorator(suite): |
|
3122 |
return RandomDecorator(suite, random_seed, runner.stream) |
|
3123 |
return decorator |
|
3124 |
||
3125 |
||
3126 |
def tests_first(pattern): |
|
3127 |
if pattern == '.*': |
|
3128 |
return identity_decorator |
|
3129 |
def decorator(suite): |
|
3130 |
return TestFirstDecorator(suite, pattern) |
|
3131 |
return decorator |
|
3132 |
||
3133 |
||
3134 |
def identity_decorator(suite): |
|
3135 |
"""Return suite.""" |
|
3136 |
return suite |
|
3137 |
||
3138 |
||
|
5247.1.1
by Vincent Ladeuil
Merge previous attempt into current trunk |
3139 |
class TestDecorator(TestUtil.TestSuite): |
|
4205.3.1
by Robert Collins
Refactor tests.run_suite to be more data driven, making it shorter and able to be extended more easily. |
3140 |
"""A decorator for TestCase/TestSuite objects. |
3141 |
|
|
3142 |
Usually, subclasses should override __iter__(used when flattening test
|
|
3143 |
suites), which we do to filter, reorder, parallelise and so on, run() and
|
|
3144 |
debug().
|
|
3145 |
"""
|
|
3146 |
||
3147 |
def __init__(self, suite): |
|
|
5247.1.1
by Vincent Ladeuil
Merge previous attempt into current trunk |
3148 |
TestUtil.TestSuite.__init__(self) |
|
4205.3.1
by Robert Collins
Refactor tests.run_suite to be more data driven, making it shorter and able to be extended more easily. |
3149 |
self.addTest(suite) |
3150 |
||
3151 |
def countTestCases(self): |
|
3152 |
cases = 0 |
|
3153 |
for test in self: |
|
3154 |
cases += test.countTestCases() |
|
3155 |
return cases |
|
3156 |
||
3157 |
def debug(self): |
|
3158 |
for test in self: |
|
3159 |
test.debug() |
|
3160 |
||
3161 |
def run(self, result): |
|
3162 |
# Use iteration on self, not self._tests, to allow subclasses to hook
|
|
3163 |
# into __iter__.
|
|
3164 |
for test in self: |
|
3165 |
if result.shouldStop: |
|
3166 |
break
|
|
3167 |
test.run(result) |
|
3168 |
return result |
|
3169 |
||
3170 |
||
|
4573.2.1
by Robert Collins
Don't call countTestCases from TextTestRunner.run, rather let tests decide if they want to be counted. |
3171 |
class CountingDecorator(TestDecorator): |
3172 |
"""A decorator which calls result.progress(self.countTestCases).""" |
|
3173 |
||
3174 |
def run(self, result): |
|
3175 |
progress_method = getattr(result, 'progress', None) |
|
3176 |
if callable(progress_method): |
|
|
4573.2.3
by Robert Collins
Support python 2.4. |
3177 |
progress_method(self.countTestCases(), SUBUNIT_SEEK_SET) |
|
4573.2.1
by Robert Collins
Don't call countTestCases from TextTestRunner.run, rather let tests decide if they want to be counted. |
3178 |
return super(CountingDecorator, self).run(result) |
3179 |
||
3180 |
||
|
4205.3.1
by Robert Collins
Refactor tests.run_suite to be more data driven, making it shorter and able to be extended more easily. |
3181 |
class ExcludeDecorator(TestDecorator): |
3182 |
"""A decorator which excludes test matching an exclude pattern.""" |
|
3183 |
||
3184 |
def __init__(self, suite, exclude_pattern): |
|
3185 |
TestDecorator.__init__(self, suite) |
|
3186 |
self.exclude_pattern = exclude_pattern |
|
3187 |
self.excluded = False |
|
3188 |
||
3189 |
def __iter__(self): |
|
3190 |
if self.excluded: |
|
3191 |
return iter(self._tests) |
|
3192 |
self.excluded = True |
|
3193 |
suite = exclude_tests_by_re(self, self.exclude_pattern) |
|
3194 |
del self._tests[:] |
|
3195 |
self.addTests(suite) |
|
3196 |
return iter(self._tests) |
|
3197 |
||
3198 |
||
3199 |
class FilterTestsDecorator(TestDecorator): |
|
3200 |
"""A decorator which filters tests to those matching a pattern.""" |
|
3201 |
||
3202 |
def __init__(self, suite, pattern): |
|
3203 |
TestDecorator.__init__(self, suite) |
|
3204 |
self.pattern = pattern |
|
3205 |
self.filtered = False |
|
3206 |
||
3207 |
def __iter__(self): |
|
3208 |
if self.filtered: |
|
3209 |
return iter(self._tests) |
|
3210 |
self.filtered = True |
|
3211 |
suite = filter_suite_by_re(self, self.pattern) |
|
3212 |
del self._tests[:] |
|
3213 |
self.addTests(suite) |
|
3214 |
return iter(self._tests) |
|
3215 |
||
3216 |
||
3217 |
class RandomDecorator(TestDecorator): |
|
3218 |
"""A decorator which randomises the order of its tests.""" |
|
3219 |
||
3220 |
def __init__(self, suite, random_seed, stream): |
|
3221 |
TestDecorator.__init__(self, suite) |
|
3222 |
self.random_seed = random_seed |
|
3223 |
self.randomised = False |
|
3224 |
self.stream = stream |
|
3225 |
||
3226 |
def __iter__(self): |
|
3227 |
if self.randomised: |
|
3228 |
return iter(self._tests) |
|
3229 |
self.randomised = True |
|
|
4794.1.9
by Robert Collins
Double \n was deliberate for RandomDecorator. |
3230 |
self.stream.write("Randomizing test order using seed %s\n\n" % |
|
4205.3.1
by Robert Collins
Refactor tests.run_suite to be more data driven, making it shorter and able to be extended more easily. |
3231 |
(self.actual_seed())) |
3232 |
# Initialise the random number generator.
|
|
3233 |
random.seed(self.actual_seed()) |
|
3234 |
suite = randomize_suite(self) |
|
3235 |
del self._tests[:] |
|
3236 |
self.addTests(suite) |
|
3237 |
return iter(self._tests) |
|
3238 |
||
3239 |
def actual_seed(self): |
|
3240 |
if self.random_seed == "now": |
|
3241 |
# We convert the seed to a long to make it reuseable across
|
|
3242 |
# invocations (because the user can reenter it).
|
|
3243 |
self.random_seed = long(time.time()) |
|
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
3244 |
else: |
3245 |
# Convert the seed to a long if we can
|
|
3246 |
try: |
|
|
4205.3.1
by Robert Collins
Refactor tests.run_suite to be more data driven, making it shorter and able to be extended more easily. |
3247 |
self.random_seed = long(self.random_seed) |
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
3248 |
except: |
3249 |
pass
|
|
|
4205.3.1
by Robert Collins
Refactor tests.run_suite to be more data driven, making it shorter and able to be extended more easily. |
3250 |
return self.random_seed |
3251 |
||
3252 |
||
3253 |
class TestFirstDecorator(TestDecorator): |
|
3254 |
"""A decorator which moves named tests to the front.""" |
|
3255 |
||
3256 |
def __init__(self, suite, pattern): |
|
3257 |
TestDecorator.__init__(self, suite) |
|
3258 |
self.pattern = pattern |
|
3259 |
self.filtered = False |
|
3260 |
||
3261 |
def __iter__(self): |
|
3262 |
if self.filtered: |
|
3263 |
return iter(self._tests) |
|
3264 |
self.filtered = True |
|
3265 |
suites = split_suite_by_re(self, self.pattern) |
|
3266 |
del self._tests[:] |
|
3267 |
self.addTests(suites) |
|
3268 |
return iter(self._tests) |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
3269 |
|
3270 |
||
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3271 |
def partition_tests(suite, count): |
3272 |
"""Partition suite into count lists of tests.""" |
|
|
5365.3.1
by Andrew Bennetts
Better (and simpler) algorithm for partition_tests. |
3273 |
# This just assigns tests in a round-robin fashion. On one hand this
|
3274 |
# splits up blocks of related tests that might run faster if they shared
|
|
3275 |
# resources, but on the other it avoids assigning blocks of slow tests to
|
|
3276 |
# just one partition. So the slowest partition shouldn't be much slower
|
|
3277 |
# than the fastest.
|
|
3278 |
partitions = [list() for i in range(count)] |
|
3279 |
tests = iter_suite_tests(suite) |
|
3280 |
for partition, test in itertools.izip(itertools.cycle(partitions), tests): |
|
3281 |
partition.append(test) |
|
3282 |
return partitions |
|
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3283 |
|
3284 |
||
|
5180.2.1
by Vincent Ladeuil
Workaround ``Crypto.Random`` check leading to spurious test failures |
3285 |
def workaround_zealous_crypto_random(): |
3286 |
"""Crypto.Random want to help us being secure, but we don't care here. |
|
3287 |
||
3288 |
This workaround some test failure related to the sftp server. Once paramiko
|
|
3289 |
stop using the controversial API in Crypto.Random, we may get rid of it.
|
|
3290 |
"""
|
|
3291 |
try: |
|
3292 |
from Crypto.Random import atfork |
|
3293 |
atfork() |
|
3294 |
except ImportError: |
|
3295 |
pass
|
|
3296 |
||
3297 |
||
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3298 |
def fork_for_tests(suite): |
3299 |
"""Take suite and start up one runner per CPU by forking() |
|
3300 |
||
3301 |
:return: An iterable of TestCase-like objects which can each have
|
|
|
4229.3.1
by Vincent Ladeuil
Fix selftest --parallel for ConcurrentTestSuite uses. |
3302 |
run(result) called on them to feed tests to result.
|
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3303 |
"""
|
|
4398.4.3
by Vincent Ladeuil
Detect # cores on win32 and Solaris too. |
3304 |
concurrency = osutils.local_concurrency() |
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3305 |
result = [] |
3306 |
from subunit import TestProtocolClient, ProtocolTestCase |
|
|
4794.1.20
by Robert Collins
Appropriately guard the import of AutoTimingTestResultDecorator from subunit. |
3307 |
from subunit.test_results import AutoTimingTestResultDecorator |
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3308 |
class TestInOtherProcess(ProtocolTestCase): |
3309 |
# Should be in subunit, I think. RBC.
|
|
3310 |
def __init__(self, stream, pid): |
|
3311 |
ProtocolTestCase.__init__(self, stream) |
|
3312 |
self.pid = pid |
|
3313 |
||
3314 |
def run(self, result): |
|
3315 |
try: |
|
3316 |
ProtocolTestCase.run(self, result) |
|
3317 |
finally: |
|
|
5162.1.1
by Vincent Ladeuil
Babune hangs when zombies are around. |
3318 |
os.waitpid(self.pid, 0) |
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3319 |
|
3320 |
test_blocks = partition_tests(suite, concurrency) |
|
3321 |
for process_tests in test_blocks: |
|
|
5247.1.1
by Vincent Ladeuil
Merge previous attempt into current trunk |
3322 |
process_suite = TestUtil.TestSuite() |
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3323 |
process_suite.addTests(process_tests) |
3324 |
c2pread, c2pwrite = os.pipe() |
|
3325 |
pid = os.fork() |
|
3326 |
if pid == 0: |
|
|
5180.2.1
by Vincent Ladeuil
Workaround ``Crypto.Random`` check leading to spurious test failures |
3327 |
workaround_zealous_crypto_random() |
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3328 |
try: |
3329 |
os.close(c2pread) |
|
3330 |
# Leave stderr and stdout open so we can see test noise
|
|
3331 |
# Close stdin so that the child goes away if it decides to
|
|
3332 |
# read from stdin (otherwise its a roulette to see what
|
|
|
4229.3.1
by Vincent Ladeuil
Fix selftest --parallel for ConcurrentTestSuite uses. |
3333 |
# child actually gets keystrokes for pdb etc).
|
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3334 |
sys.stdin.close() |
3335 |
sys.stdin = None |
|
|
4229.3.1
by Vincent Ladeuil
Fix selftest --parallel for ConcurrentTestSuite uses. |
3336 |
stream = os.fdopen(c2pwrite, 'wb', 1) |
|
4794.1.11
by Robert Collins
Remove decorator class that won't be needed with upgraded dependencies. |
3337 |
subunit_result = AutoTimingTestResultDecorator( |
|
4557.2.1
by Robert Collins
Support timestamping subunit streams. |
3338 |
TestProtocolClient(stream)) |
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3339 |
process_suite.run(subunit_result) |
3340 |
finally: |
|
3341 |
os._exit(0) |
|
3342 |
else: |
|
3343 |
os.close(c2pwrite) |
|
3344 |
stream = os.fdopen(c2pread, 'rb', 1) |
|
3345 |
test = TestInOtherProcess(stream, pid) |
|
3346 |
result.append(test) |
|
3347 |
return result |
|
3348 |
||
3349 |
||
3350 |
def reinvoke_for_tests(suite): |
|
3351 |
"""Take suite and start up one runner per CPU using subprocess(). |
|
3352 |
||
3353 |
:return: An iterable of TestCase-like objects which can each have
|
|
|
4229.3.1
by Vincent Ladeuil
Fix selftest --parallel for ConcurrentTestSuite uses. |
3354 |
run(result) called on them to feed tests to result.
|
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3355 |
"""
|
|
4398.4.3
by Vincent Ladeuil
Detect # cores on win32 and Solaris too. |
3356 |
concurrency = osutils.local_concurrency() |
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3357 |
result = [] |
|
4496.3.6
by Andrew Bennetts
Tidy some more imports. |
3358 |
from subunit import ProtocolTestCase |
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3359 |
class TestInSubprocess(ProtocolTestCase): |
3360 |
def __init__(self, process, name): |
|
3361 |
ProtocolTestCase.__init__(self, process.stdout) |
|
3362 |
self.process = process |
|
3363 |
self.process.stdin.close() |
|
3364 |
self.name = name |
|
3365 |
||
3366 |
def run(self, result): |
|
3367 |
try: |
|
3368 |
ProtocolTestCase.run(self, result) |
|
3369 |
finally: |
|
3370 |
self.process.wait() |
|
3371 |
os.unlink(self.name) |
|
3372 |
# print "pid %d finished" % finished_process
|
|
3373 |
test_blocks = partition_tests(suite, concurrency) |
|
3374 |
for process_tests in test_blocks: |
|
3375 |
# ugly; currently reimplement rather than reuses TestCase methods.
|
|
3376 |
bzr_path = os.path.dirname(os.path.dirname(bzrlib.__file__))+'/bzr' |
|
3377 |
if not os.path.isfile(bzr_path): |
|
3378 |
# We are probably installed. Assume sys.argv is the right file
|
|
3379 |
bzr_path = sys.argv[0] |
|
|
4805.2.1
by Gordon Tyler
Fixed reinvoke_for_tests to work on win32. |
3380 |
bzr_path = [bzr_path] |
3381 |
if sys.platform == "win32": |
|
3382 |
# if we're on windows, we can't execute the bzr script directly
|
|
|
5163.1.3
by Gordon Tyler
Set stdout to binary mode on win32 if --subunit option given to selftest. |
3383 |
bzr_path = [sys.executable] + bzr_path |
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3384 |
fd, test_list_file_name = tempfile.mkstemp() |
3385 |
test_list_file = os.fdopen(fd, 'wb', 1) |
|
3386 |
for test in process_tests: |
|
3387 |
test_list_file.write(test.id() + '\n') |
|
3388 |
test_list_file.close() |
|
3389 |
try: |
|
|
4805.2.1
by Gordon Tyler
Fixed reinvoke_for_tests to work on win32. |
3390 |
argv = bzr_path + ['selftest', '--load-list', test_list_file_name, |
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3391 |
'--subunit'] |
3392 |
if '--no-plugins' in sys.argv: |
|
3393 |
argv.append('--no-plugins') |
|
|
5273.1.3
by Vincent Ladeuil
Fix typo. |
3394 |
# stderr=subprocess.STDOUT would be ideal, but until we prevent
|
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
3395 |
# noise on stderr it can interrupt the subunit protocol.
|
|
5273.1.3
by Vincent Ladeuil
Fix typo. |
3396 |
process = subprocess.Popen(argv, stdin=subprocess.PIPE, |
3397 |
stdout=subprocess.PIPE, |
|
3398 |
stderr=subprocess.PIPE, |
|
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
3399 |
bufsize=1) |
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3400 |
test = TestInSubprocess(process, test_list_file_name) |
3401 |
result.append(test) |
|
3402 |
except: |
|
3403 |
os.unlink(test_list_file_name) |
|
3404 |
raise
|
|
3405 |
return result |
|
3406 |
||
3407 |
||
|
5495.1.1
by Andrew Bennetts
Remove unused definition of ForwardingResult, and switch all code to use the testtools name for it. Also remove a few unused imports. |
3408 |
class ProfileResult(testtools.ExtendedToOriginalDecorator): |
|
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
3409 |
"""Generate profiling data for all activity between start and success. |
3410 |
|
|
3411 |
The profile data is appended to the test's _benchcalls attribute and can
|
|
3412 |
be accessed by the forwarded-to TestResult.
|
|
3413 |
||
3414 |
While it might be cleaner do accumulate this in stopTest, addSuccess is
|
|
3415 |
where our existing output support for lsprof is, and this class aims to
|
|
3416 |
fit in with that: while it could be moved it's not necessary to accomplish
|
|
|
4641.3.4
by Robert Collins
Fix typo. |
3417 |
test profiling, nor would it be dramatically cleaner.
|
|
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
3418 |
"""
|
3419 |
||
3420 |
def startTest(self, test): |
|
3421 |
self.profiler = bzrlib.lsprof.BzrProfiler() |
|
|
5331.1.1
by Robert Collins
``bzrlib.lsprof.profile`` will no longer silently generate bad threaded |
3422 |
# Prevent deadlocks in tests that use lsprof: those tests will
|
3423 |
# unavoidably fail.
|
|
3424 |
bzrlib.lsprof.BzrProfiler.profiler_block = 0 |
|
|
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
3425 |
self.profiler.start() |
|
5495.1.1
by Andrew Bennetts
Remove unused definition of ForwardingResult, and switch all code to use the testtools name for it. Also remove a few unused imports. |
3426 |
testtools.ExtendedToOriginalDecorator.startTest(self, test) |
|
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
3427 |
|
3428 |
def addSuccess(self, test): |
|
3429 |
stats = self.profiler.stop() |
|
3430 |
try: |
|
3431 |
calls = test._benchcalls |
|
3432 |
except AttributeError: |
|
3433 |
test._benchcalls = [] |
|
3434 |
calls = test._benchcalls |
|
3435 |
calls.append(((test.id(), "", ""), stats)) |
|
|
5495.1.1
by Andrew Bennetts
Remove unused definition of ForwardingResult, and switch all code to use the testtools name for it. Also remove a few unused imports. |
3436 |
testtools.ExtendedToOriginalDecorator.addSuccess(self, test) |
|
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
3437 |
|
3438 |
def stopTest(self, test): |
|
|
5495.1.1
by Andrew Bennetts
Remove unused definition of ForwardingResult, and switch all code to use the testtools name for it. Also remove a few unused imports. |
3439 |
testtools.ExtendedToOriginalDecorator.stopTest(self, test) |
|
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
3440 |
self.profiler = None |
3441 |
||
3442 |
||
|
3390.1.1
by Andrew Bennetts
Add --debugflags/-E option to selftest. |
3443 |
# Controlled by "bzr selftest -E=..." option
|
|
4523.4.9
by John Arbash Meinel
Change the flags around a bit. |
3444 |
# Currently supported:
|
3445 |
# -Eallow_debug Will no longer clear debug.debug_flags() so it
|
|
3446 |
# preserves any flags supplied at the command line.
|
|
3447 |
# -Edisable_lock_checks Turns errors in mismatched locks into simple prints
|
|
3448 |
# rather than failing tests. And no longer raise
|
|
3449 |
# LockContention when fctnl locks are not being used
|
|
3450 |
# with proper exclusion rules.
|
|
|
5247.1.2
by Vincent Ladeuil
Fix typo in comment. |
3451 |
# -Ethreads Will display thread ident at creation/join time to
|
|
4731.2.9
by Vincent Ladeuil
Implement a new -Ethreads to better track the leaks. |
3452 |
# help track thread leaks
|
|
3390.1.1
by Andrew Bennetts
Add --debugflags/-E option to selftest. |
3453 |
selftest_debug_flags = set() |
3454 |
||
3455 |
||
|
1185.35.20
by Aaron Bentley
Only keep test failure directories if --keep-output is specified |
3456 |
def selftest(verbose=False, pattern=".*", stop_on_failure=True, |
|
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
3457 |
transport=None, |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
3458 |
test_suite_factory=None, |
|
1819.1.3
by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history |
3459 |
lsprof_timed=None, |
|
2213.2.1
by Martin Pool
Add selftest --first flag |
3460 |
bench_history=None, |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
3461 |
matching_tests_first=None, |
|
2394.2.1
by Ian Clatworthy
--list and --exclude first cut |
3462 |
list_only=False, |
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
3463 |
random_seed=None, |
|
2658.3.3
by Daniel Watkins
Added UI support for bzr selftest --strict. |
3464 |
exclude_pattern=None, |
3465 |
strict=False, |
|
|
3193.1.8
by Vincent Ladeuil
Add '--load-list' option to selftest. |
3466 |
load_list=None, |
|
3390.1.1
by Andrew Bennetts
Add --debugflags/-E option to selftest. |
3467 |
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. |
3468 |
starting_with=None, |
|
4000.2.3
by Robert Collins
Allow extra options to bzrlib.tests.selftest from plugins. |
3469 |
runner_class=None, |
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3470 |
suite_decorators=None, |
|
4636.2.1
by Robert Collins
Test selftest --list-only and --randomize options using more precisely layers. |
3471 |
stream=None, |
|
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
3472 |
lsprof_tests=False, |
|
2658.3.3
by Daniel Watkins
Added UI support for bzr selftest --strict. |
3473 |
):
|
|
1204
by Martin Pool
doc |
3474 |
"""Run the whole test suite under the enhanced runner""" |
|
1904.2.5
by Martin Pool
Fix format warning inside test suite and add test |
3475 |
# XXX: Very ugly way to do this...
|
3476 |
# Disable warning about old formats because we don't want it to disturb
|
|
3477 |
# any blackbox tests.
|
|
3478 |
from bzrlib import repository |
|
3479 |
repository._deprecation_warning_done = True |
|
3480 |
||
|
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. |
3481 |
global default_transport |
3482 |
if transport is None: |
|
3483 |
transport = default_transport |
|
3484 |
old_transport = default_transport |
|
3485 |
default_transport = transport |
|
|
3390.1.1
by Andrew Bennetts
Add --debugflags/-E option to selftest. |
3486 |
global selftest_debug_flags |
3487 |
old_debug_flags = selftest_debug_flags |
|
3488 |
if debug_flags is not None: |
|
3489 |
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. |
3490 |
try: |
|
3193.1.8
by Vincent Ladeuil
Add '--load-list' option to selftest. |
3491 |
if load_list is None: |
3492 |
keep_only = None |
|
3493 |
else: |
|
3494 |
keep_only = load_test_id_list(load_list) |
|
|
4641.2.1
by Robert Collins
Resolve test aliases at the outermost level that test skip filtering is done. |
3495 |
if starting_with: |
3496 |
starting_with = [test_prefix_alias_registry.resolve_alias(start) |
|
3497 |
for start in starting_with] |
|
|
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
3498 |
if test_suite_factory is None: |
|
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
3499 |
# Reduce loading time by loading modules based on the starting_with
|
3500 |
# patterns.
|
|
|
3302.11.2
by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite. |
3501 |
suite = test_suite(keep_only, starting_with) |
|
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
3502 |
else: |
3503 |
suite = test_suite_factory() |
|
|
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
3504 |
if starting_with: |
3505 |
# But always filter as requested.
|
|
3506 |
suite = filter_suite_by_id_startswith(suite, starting_with) |
|
|
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
3507 |
result_decorators = [] |
3508 |
if lsprof_tests: |
|
3509 |
result_decorators.append(ProfileResult) |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
3510 |
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 |
3511 |
stop_on_failure=stop_on_failure, |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
3512 |
transport=transport, |
|
1819.1.3
by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history |
3513 |
lsprof_timed=lsprof_timed, |
|
2213.2.1
by Martin Pool
Add selftest --first flag |
3514 |
bench_history=bench_history, |
|
2321.2.1
by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir |
3515 |
matching_tests_first=matching_tests_first, |
|
2394.2.1
by Ian Clatworthy
--list and --exclude first cut |
3516 |
list_only=list_only, |
|
2394.2.2
by Ian Clatworthy
Add --randomize and update help |
3517 |
random_seed=random_seed, |
|
2658.3.3
by Daniel Watkins
Added UI support for bzr selftest --strict. |
3518 |
exclude_pattern=exclude_pattern, |
|
4000.2.3
by Robert Collins
Allow extra options to bzrlib.tests.selftest from plugins. |
3519 |
strict=strict, |
3520 |
runner_class=runner_class, |
|
|
4205.3.2
by Robert Collins
Create fork and reinvoke parallel testing support. |
3521 |
suite_decorators=suite_decorators, |
|
4636.2.1
by Robert Collins
Test selftest --list-only and --randomize options using more precisely layers. |
3522 |
stream=stream, |
|
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
3523 |
result_decorators=result_decorators, |
|
4000.2.3
by Robert Collins
Allow extra options to bzrlib.tests.selftest from plugins. |
3524 |
)
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
3525 |
finally: |
3526 |
default_transport = old_transport |
|
|
3390.1.1
by Andrew Bennetts
Add --debugflags/-E option to selftest. |
3527 |
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. |
3528 |
|
|
1092.1.17
by Robert Collins
remove TEST_CLASSES dead code and provide a bzrlib.test_suite() convenience method |
3529 |
|
|
3193.1.7
by Vincent Ladeuil
Load test id list from a text file. |
3530 |
def load_test_id_list(file_name): |
3531 |
"""Load a test id list from a text file. |
|
3532 |
||
3533 |
The format is one test id by line. No special care is taken to impose
|
|
3534 |
strict rules, these test ids are used to filter the test suite so a test id
|
|
3535 |
that do not match an existing test will do no harm. This allows user to add
|
|
3536 |
comments, leave blank lines, etc.
|
|
3537 |
"""
|
|
3538 |
test_list = [] |
|
3539 |
try: |
|
3540 |
ftest = open(file_name, 'rt') |
|
3541 |
except IOError, e: |
|
3542 |
if e.errno != errno.ENOENT: |
|
3543 |
raise
|
|
3544 |
else: |
|
3545 |
raise errors.NoSuchFile(file_name) |
|
3546 |
||
3547 |
for test_name in ftest.readlines(): |
|
3548 |
test_list.append(test_name.strip()) |
|
3549 |
ftest.close() |
|
3550 |
return test_list |
|
3551 |
||
|
3302.3.3
by Vincent Ladeuil
Fix PEP8 catched by Aaron. Update NEWS. |
3552 |
|
|
3302.3.1
by Vincent Ladeuil
Help identify duplicates IDs in test suite and missing tests in id |
3553 |
def suite_matches_id_list(test_suite, id_list): |
3554 |
"""Warns about tests not appearing or appearing more than once. |
|
3555 |
||
3556 |
:param test_suite: A TestSuite object.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
3557 |
:param test_id_list: The list of test ids that should be found in
|
|
3302.3.1
by Vincent Ladeuil
Help identify duplicates IDs in test suite and missing tests in id |
3558 |
test_suite.
|
3559 |
||
3560 |
:return: (absents, duplicates) absents is a list containing the test found
|
|
3561 |
in id_list but not in test_suite, duplicates is a list containing the
|
|
3562 |
test found multiple times in test_suite.
|
|
3563 |
||
3564 |
When using a prefined test id list, it may occurs that some tests do not
|
|
3565 |
exist anymore or that some tests use the same id. This function warns the
|
|
3566 |
tester about potential problems in his workflow (test lists are volatile)
|
|
3567 |
or in the test suite itself (using the same id for several tests does not
|
|
3568 |
help to localize defects).
|
|
3569 |
"""
|
|
3570 |
# Build a dict counting id occurrences
|
|
3571 |
tests = dict() |
|
3572 |
for test in iter_suite_tests(test_suite): |
|
3573 |
id = test.id() |
|
3574 |
tests[id] = tests.get(id, 0) + 1 |
|
3575 |
||
3576 |
not_found = [] |
|
3577 |
duplicates = [] |
|
3578 |
for id in id_list: |
|
3579 |
occurs = tests.get(id, 0) |
|
3580 |
if not occurs: |
|
3581 |
not_found.append(id) |
|
3582 |
elif occurs > 1: |
|
3583 |
duplicates.append(id) |
|
3584 |
||
3585 |
return not_found, duplicates |
|
3586 |
||
|
3193.1.7
by Vincent Ladeuil
Load test id list from a text file. |
3587 |
|
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
3588 |
class TestIdList(object): |
3589 |
"""Test id list to filter a test suite. |
|
|
3193.1.3
by Vincent Ladeuil
Create a TestIdListFilter helper object to make testing easier. |
3590 |
|
3591 |
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. |
3592 |
<module>[.<class>.<method>][(<param>+)], <module> being in python dotted
|
3593 |
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 |
3594 |
- 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. |
3595 |
- keep only the tests listed from the module test suite.
|
3596 |
"""
|
|
3597 |
||
3598 |
def __init__(self, test_id_list): |
|
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
3599 |
# When a test suite needs to be filtered against us we compare test ids
|
3600 |
# for equality, so a simple dict offers a quick and simple solution.
|
|
3601 |
self.tests = dict().fromkeys(test_id_list, True) |
|
3602 |
||
3603 |
# While unittest.TestCase have ids like:
|
|
3604 |
# <module>.<class>.<method>[(<param+)],
|
|
3605 |
# doctest.DocTestCase can have ids like:
|
|
3606 |
# <module>
|
|
3607 |
# <module>.<class>
|
|
3608 |
# <module>.<function>
|
|
3609 |
# <module>.<class>.<method>
|
|
3610 |
||
3611 |
# Since we can't predict a test class from its name only, we settle on
|
|
3612 |
# a simple constraint: a test id always begins with its module name.
|
|
3613 |
||
3614 |
modules = {} |
|
|
3193.1.3
by Vincent Ladeuil
Create a TestIdListFilter helper object to make testing easier. |
3615 |
for test_id in test_id_list: |
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
3616 |
parts = test_id.split('.') |
3617 |
mod_name = parts.pop(0) |
|
3618 |
modules[mod_name] = True |
|
3619 |
for part in parts: |
|
3620 |
mod_name += '.' + part |
|
3621 |
modules[mod_name] = True |
|
3622 |
self.modules = modules |
|
|
3193.1.4
by Vincent Ladeuil
Make TestTestIdListFilter aware that a test exists for a module or one of |
3623 |
|
|
3302.8.3
by Vincent Ladeuil
Use better names for TestIdList methods. |
3624 |
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 |
3625 |
"""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. |
3626 |
return self.modules.has_key(module_name) |
3627 |
||
|
3302.8.3
by Vincent Ladeuil
Use better names for TestIdList methods. |
3628 |
def includes(self, test_id): |
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
3629 |
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. |
3630 |
|
|
3193.1.3
by Vincent Ladeuil
Create a TestIdListFilter helper object to make testing easier. |
3631 |
|
|
3649.6.2
by Vincent Ladeuil
Replace aliases in selftest --starting-with option. |
3632 |
class TestPrefixAliasRegistry(registry.Registry): |
3633 |
"""A registry for test prefix aliases. |
|
3634 |
||
3635 |
This helps implement shorcuts for the --starting-with selftest
|
|
3636 |
option. Overriding existing prefixes is not allowed but not fatal (a
|
|
3637 |
warning will be emitted).
|
|
3638 |
"""
|
|
3639 |
||
3640 |
def register(self, key, obj, help=None, info=None, |
|
3641 |
override_existing=False): |
|
3642 |
"""See Registry.register. |
|
3643 |
||
3644 |
Trying to override an existing alias causes a warning to be emitted,
|
|
3645 |
not a fatal execption.
|
|
3646 |
"""
|
|
3647 |
try: |
|
3648 |
super(TestPrefixAliasRegistry, self).register( |
|
3649 |
key, obj, help=help, info=info, override_existing=False) |
|
3650 |
except KeyError: |
|
3651 |
actual = self.get(key) |
|
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
3652 |
trace.note( |
3653 |
'Test prefix alias %s is already used for %s, ignoring %s' |
|
3654 |
% (key, actual, obj)) |
|
|
3649.6.2
by Vincent Ladeuil
Replace aliases in selftest --starting-with option. |
3655 |
|
3656 |
def resolve_alias(self, id_start): |
|
3657 |
"""Replace the alias by the prefix in the given string. |
|
3658 |
||
|
3649.6.3
by Vincent Ladeuil
Fixed typos as per John's review. |
3659 |
Using an unknown prefix is an error to help catching typos.
|
|
3649.6.2
by Vincent Ladeuil
Replace aliases in selftest --starting-with option. |
3660 |
"""
|
3661 |
parts = id_start.split('.') |
|
3662 |
try: |
|
3663 |
parts[0] = self.get(parts[0]) |
|
3664 |
except KeyError: |
|
3665 |
raise errors.BzrCommandError( |
|
3666 |
'%s is not a known test prefix alias' % parts[0]) |
|
3667 |
return '.'.join(parts) |
|
3668 |
||
3669 |
||
3670 |
test_prefix_alias_registry = TestPrefixAliasRegistry() |
|
|
3649.6.3
by Vincent Ladeuil
Fixed typos as per John's review. |
3671 |
"""Registry of test prefix aliases."""
|
|
3649.6.2
by Vincent Ladeuil
Replace aliases in selftest --starting-with option. |
3672 |
|
3673 |
||
3674 |
# This alias allows to detect typos ('bzrlin.') by making all valid test ids
|
|
3675 |
# appear prefixed ('bzrlib.' is "replaced" by 'bzrlib.').
|
|
3676 |
test_prefix_alias_registry.register('bzrlib', 'bzrlib') |
|
3677 |
||
|
5009.1.1
by Vincent Ladeuil
(trivial) Fix typos |
3678 |
# Obvious highest levels prefixes, feel free to add your own via a plugin
|
|
3649.6.2
by Vincent Ladeuil
Replace aliases in selftest --starting-with option. |
3679 |
test_prefix_alias_registry.register('bd', 'bzrlib.doc') |
3680 |
test_prefix_alias_registry.register('bu', 'bzrlib.utils') |
|
3681 |
test_prefix_alias_registry.register('bt', 'bzrlib.tests') |
|
3682 |
test_prefix_alias_registry.register('bb', 'bzrlib.tests.blackbox') |
|
3683 |
test_prefix_alias_registry.register('bp', 'bzrlib.plugins') |
|
3684 |
||
3685 |
||
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3686 |
def _test_suite_testmod_names(): |
3687 |
"""Return the standard list of test module names to test.""" |
|
3688 |
return [ |
|
3689 |
'bzrlib.doc', |
|
3690 |
'bzrlib.tests.blackbox', |
|
3691 |
'bzrlib.tests.commands', |
|
|
5193.6.2
by Vincent Ladeuil
First texinfo test. |
3692 |
'bzrlib.tests.doc_generate', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3693 |
'bzrlib.tests.per_branch', |
|
5363.2.30
by Jelmer Vernooij
actually run per_bzrdir tests. |
3694 |
'bzrlib.tests.per_bzrdir', |
|
5363.2.2
by Jelmer Vernooij
Rename per_bzrdir => per_controldir. |
3695 |
'bzrlib.tests.per_controldir', |
3696 |
'bzrlib.tests.per_controldir_colo', |
|
|
4585.1.5
by Jelmer Vernooij
Some review comments from John. |
3697 |
'bzrlib.tests.per_foreign_vcs', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3698 |
'bzrlib.tests.per_interrepository', |
3699 |
'bzrlib.tests.per_intertree', |
|
3700 |
'bzrlib.tests.per_inventory', |
|
3701 |
'bzrlib.tests.per_interbranch', |
|
3702 |
'bzrlib.tests.per_lock', |
|
|
4869.2.5
by Andrew Bennetts
Move per-merger tests into a per_merger test module. |
3703 |
'bzrlib.tests.per_merger', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3704 |
'bzrlib.tests.per_transport', |
3705 |
'bzrlib.tests.per_tree', |
|
3706 |
'bzrlib.tests.per_pack_repository', |
|
3707 |
'bzrlib.tests.per_repository', |
|
3708 |
'bzrlib.tests.per_repository_chk', |
|
3709 |
'bzrlib.tests.per_repository_reference', |
|
|
4711.1.2
by Martin Pool
Start adding tests.per_uifactory |
3710 |
'bzrlib.tests.per_uifactory', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3711 |
'bzrlib.tests.per_versionedfile', |
3712 |
'bzrlib.tests.per_workingtree', |
|
3713 |
'bzrlib.tests.test__annotator', |
|
|
4913.3.8
by John Arbash Meinel
Rename test_bencode to test__bencode, and use self.module |
3714 |
'bzrlib.tests.test__bencode', |
|
5365.5.3
by John Arbash Meinel
The results were just too promising. faster *and* better memory. |
3715 |
'bzrlib.tests.test__btree_serializer', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3716 |
'bzrlib.tests.test__chk_map', |
3717 |
'bzrlib.tests.test__dirstate_helpers', |
|
3718 |
'bzrlib.tests.test__groupcompress', |
|
3719 |
'bzrlib.tests.test__known_graph', |
|
3720 |
'bzrlib.tests.test__rio', |
|
|
4679.3.76
by John Arbash Meinel
Rename StaticTupleInterner => SimpleSet. |
3721 |
'bzrlib.tests.test__simple_set', |
|
4679.5.2
by John Arbash Meinel
Merge 2.1-export-c-api branch, and bring back the static_tuple code. |
3722 |
'bzrlib.tests.test__static_tuple', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3723 |
'bzrlib.tests.test__walkdirs_win32', |
3724 |
'bzrlib.tests.test_ancestry', |
|
3725 |
'bzrlib.tests.test_annotate', |
|
3726 |
'bzrlib.tests.test_api', |
|
3727 |
'bzrlib.tests.test_atomicfile', |
|
3728 |
'bzrlib.tests.test_bad_files', |
|
3729 |
'bzrlib.tests.test_bisect_multi', |
|
3730 |
'bzrlib.tests.test_branch', |
|
|
5570.2.6
by Vincent Ladeuil
Meg, that's the doctest we want to comment. |
3731 |
'bzrlib.tests.test_branchbuilder', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3732 |
'bzrlib.tests.test_btree_index', |
3733 |
'bzrlib.tests.test_bugtracker', |
|
3734 |
'bzrlib.tests.test_bundle', |
|
3735 |
'bzrlib.tests.test_bzrdir', |
|
3736 |
'bzrlib.tests.test__chunks_to_lines', |
|
3737 |
'bzrlib.tests.test_cache_utf8', |
|
3738 |
'bzrlib.tests.test_chk_map', |
|
3739 |
'bzrlib.tests.test_chk_serializer', |
|
3740 |
'bzrlib.tests.test_chunk_writer', |
|
3741 |
'bzrlib.tests.test_clean_tree', |
|
|
4634.85.12
by Andrew Bennetts
Merge lp:bzr. |
3742 |
'bzrlib.tests.test_cleanup', |
|
5037.3.2
by Martin Pool
Fix up test_cmdline to actually work |
3743 |
'bzrlib.tests.test_cmdline', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3744 |
'bzrlib.tests.test_commands', |
3745 |
'bzrlib.tests.test_commit', |
|
3746 |
'bzrlib.tests.test_commit_merge', |
|
3747 |
'bzrlib.tests.test_config', |
|
3748 |
'bzrlib.tests.test_conflicts', |
|
3749 |
'bzrlib.tests.test_counted_lock', |
|
3750 |
'bzrlib.tests.test_crash', |
|
3751 |
'bzrlib.tests.test_decorators', |
|
3752 |
'bzrlib.tests.test_delta', |
|
3753 |
'bzrlib.tests.test_debug', |
|
3754 |
'bzrlib.tests.test_deprecated_graph', |
|
3755 |
'bzrlib.tests.test_diff', |
|
3756 |
'bzrlib.tests.test_directory_service', |
|
3757 |
'bzrlib.tests.test_dirstate', |
|
3758 |
'bzrlib.tests.test_email_message', |
|
3759 |
'bzrlib.tests.test_eol_filters', |
|
3760 |
'bzrlib.tests.test_errors', |
|
3761 |
'bzrlib.tests.test_export', |
|
3762 |
'bzrlib.tests.test_extract', |
|
3763 |
'bzrlib.tests.test_fetch', |
|
|
5230.1.1
by Martin Pool
Add a simple bzrlib.tests.fixtures |
3764 |
'bzrlib.tests.test_fixtures', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3765 |
'bzrlib.tests.test_fifo_cache', |
3766 |
'bzrlib.tests.test_filters', |
|
3767 |
'bzrlib.tests.test_ftp_transport', |
|
3768 |
'bzrlib.tests.test_foreign', |
|
3769 |
'bzrlib.tests.test_generate_docs', |
|
3770 |
'bzrlib.tests.test_generate_ids', |
|
3771 |
'bzrlib.tests.test_globbing', |
|
3772 |
'bzrlib.tests.test_gpg', |
|
3773 |
'bzrlib.tests.test_graph', |
|
3774 |
'bzrlib.tests.test_groupcompress', |
|
3775 |
'bzrlib.tests.test_hashcache', |
|
3776 |
'bzrlib.tests.test_help', |
|
3777 |
'bzrlib.tests.test_hooks', |
|
3778 |
'bzrlib.tests.test_http', |
|
3779 |
'bzrlib.tests.test_http_response', |
|
3780 |
'bzrlib.tests.test_https_ca_bundle', |
|
3781 |
'bzrlib.tests.test_identitymap', |
|
3782 |
'bzrlib.tests.test_ignores', |
|
3783 |
'bzrlib.tests.test_index', |
|
|
5017.2.2
by Martin Pool
Add import tariff tests |
3784 |
'bzrlib.tests.test_import_tariff', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3785 |
'bzrlib.tests.test_info', |
3786 |
'bzrlib.tests.test_inv', |
|
3787 |
'bzrlib.tests.test_inventory_delta', |
|
3788 |
'bzrlib.tests.test_knit', |
|
3789 |
'bzrlib.tests.test_lazy_import', |
|
3790 |
'bzrlib.tests.test_lazy_regex', |
|
|
5320.2.2
by Robert Collins
Move BzrLibraryState to its own module and prepare to start testing it. |
3791 |
'bzrlib.tests.test_library_state', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3792 |
'bzrlib.tests.test_lock', |
3793 |
'bzrlib.tests.test_lockable_files', |
|
3794 |
'bzrlib.tests.test_lockdir', |
|
3795 |
'bzrlib.tests.test_log', |
|
3796 |
'bzrlib.tests.test_lru_cache', |
|
3797 |
'bzrlib.tests.test_lsprof', |
|
3798 |
'bzrlib.tests.test_mail_client', |
|
|
5200.3.1
by Robert Collins
Added ``bzrlib.tests.matchers`` as a place to put matchers, along with |
3799 |
'bzrlib.tests.test_matchers', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3800 |
'bzrlib.tests.test_memorytree', |
3801 |
'bzrlib.tests.test_merge', |
|
3802 |
'bzrlib.tests.test_merge3', |
|
3803 |
'bzrlib.tests.test_merge_core', |
|
3804 |
'bzrlib.tests.test_merge_directive', |
|
3805 |
'bzrlib.tests.test_missing', |
|
3806 |
'bzrlib.tests.test_msgeditor', |
|
3807 |
'bzrlib.tests.test_multiparent', |
|
3808 |
'bzrlib.tests.test_mutabletree', |
|
3809 |
'bzrlib.tests.test_nonascii', |
|
3810 |
'bzrlib.tests.test_options', |
|
3811 |
'bzrlib.tests.test_osutils', |
|
3812 |
'bzrlib.tests.test_osutils_encodings', |
|
3813 |
'bzrlib.tests.test_pack', |
|
3814 |
'bzrlib.tests.test_patch', |
|
3815 |
'bzrlib.tests.test_patches', |
|
3816 |
'bzrlib.tests.test_permissions', |
|
3817 |
'bzrlib.tests.test_plugins', |
|
3818 |
'bzrlib.tests.test_progress', |
|
|
5436.2.1
by Andrew Bennetts
Add bzrlib.pyutils, which has get_named_object, a wrapper around __import__. |
3819 |
'bzrlib.tests.test_pyutils', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3820 |
'bzrlib.tests.test_read_bundle', |
3821 |
'bzrlib.tests.test_reconcile', |
|
3822 |
'bzrlib.tests.test_reconfigure', |
|
3823 |
'bzrlib.tests.test_registry', |
|
3824 |
'bzrlib.tests.test_remote', |
|
3825 |
'bzrlib.tests.test_rename_map', |
|
3826 |
'bzrlib.tests.test_repository', |
|
3827 |
'bzrlib.tests.test_revert', |
|
3828 |
'bzrlib.tests.test_revision', |
|
3829 |
'bzrlib.tests.test_revisionspec', |
|
3830 |
'bzrlib.tests.test_revisiontree', |
|
3831 |
'bzrlib.tests.test_rio', |
|
3832 |
'bzrlib.tests.test_rules', |
|
3833 |
'bzrlib.tests.test_sampler', |
|
|
5462.3.14
by Martin Pool
Unify varations with scenario protocol |
3834 |
'bzrlib.tests.test_scenarios', |
|
4665.5.1
by Vincent Ladeuil
Start some shell-like capability to write tests. |
3835 |
'bzrlib.tests.test_script', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3836 |
'bzrlib.tests.test_selftest', |
3837 |
'bzrlib.tests.test_serializer', |
|
3838 |
'bzrlib.tests.test_setup', |
|
3839 |
'bzrlib.tests.test_sftp_transport', |
|
3840 |
'bzrlib.tests.test_shelf', |
|
3841 |
'bzrlib.tests.test_shelf_ui', |
|
3842 |
'bzrlib.tests.test_smart', |
|
3843 |
'bzrlib.tests.test_smart_add', |
|
3844 |
'bzrlib.tests.test_smart_request', |
|
3845 |
'bzrlib.tests.test_smart_transport', |
|
3846 |
'bzrlib.tests.test_smtp_connection', |
|
3847 |
'bzrlib.tests.test_source', |
|
3848 |
'bzrlib.tests.test_ssh_transport', |
|
3849 |
'bzrlib.tests.test_status', |
|
3850 |
'bzrlib.tests.test_store', |
|
3851 |
'bzrlib.tests.test_strace', |
|
3852 |
'bzrlib.tests.test_subsume', |
|
3853 |
'bzrlib.tests.test_switch', |
|
3854 |
'bzrlib.tests.test_symbol_versioning', |
|
3855 |
'bzrlib.tests.test_tag', |
|
|
5247.3.8
by Vincent Ladeuil
Start implementing a TCP server running in its own thread (using |
3856 |
'bzrlib.tests.test_test_server', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3857 |
'bzrlib.tests.test_testament', |
3858 |
'bzrlib.tests.test_textfile', |
|
3859 |
'bzrlib.tests.test_textmerge', |
|
3860 |
'bzrlib.tests.test_timestamp', |
|
3861 |
'bzrlib.tests.test_trace', |
|
3862 |
'bzrlib.tests.test_transactions', |
|
3863 |
'bzrlib.tests.test_transform', |
|
3864 |
'bzrlib.tests.test_transport', |
|
3865 |
'bzrlib.tests.test_transport_log', |
|
3866 |
'bzrlib.tests.test_tree', |
|
3867 |
'bzrlib.tests.test_treebuilder', |
|
|
5346.4.1
by Martin Pool
merge fix for bug 128562 back to trunk |
3868 |
'bzrlib.tests.test_treeshape', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3869 |
'bzrlib.tests.test_tsort', |
3870 |
'bzrlib.tests.test_tuned_gzip', |
|
3871 |
'bzrlib.tests.test_ui', |
|
3872 |
'bzrlib.tests.test_uncommit', |
|
3873 |
'bzrlib.tests.test_upgrade', |
|
3874 |
'bzrlib.tests.test_upgrade_stacked', |
|
3875 |
'bzrlib.tests.test_urlutils', |
|
3876 |
'bzrlib.tests.test_version', |
|
3877 |
'bzrlib.tests.test_version_info', |
|
|
5374.2.2
by John Arbash Meinel
Create a multi-parent diff generator class. |
3878 |
'bzrlib.tests.test_versionedfile', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3879 |
'bzrlib.tests.test_weave', |
3880 |
'bzrlib.tests.test_whitebox', |
|
3881 |
'bzrlib.tests.test_win32utils', |
|
3882 |
'bzrlib.tests.test_workingtree', |
|
3883 |
'bzrlib.tests.test_workingtree_4', |
|
3884 |
'bzrlib.tests.test_wsgi', |
|
3885 |
'bzrlib.tests.test_xml', |
|
3886 |
]
|
|
3887 |
||
3888 |
||
3889 |
def _test_suite_modules_to_doctest(): |
|
|
5131.2.1
by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings |
3890 |
"""Return the list of modules to doctest.""" |
3891 |
if __doc__ is None: |
|
3892 |
# GZ 2009-03-31: No docstrings with -OO so there's nothing to doctest
|
|
3893 |
return [] |
|
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3894 |
return [ |
3895 |
'bzrlib', |
|
|
5574.5.1
by Vincent Ladeuil
BZR_HOME=. ./bzr selftest -s bzrlib.branch is enough to reproduce the bug. |
3896 |
'bzrlib.branchbuilder', |
|
4869.3.32
by Andrew Bennetts
Use Launchpad's cachedproperty decorator instead of my stupidly broken one. |
3897 |
'bzrlib.decorators', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3898 |
'bzrlib.export', |
3899 |
'bzrlib.inventory', |
|
3900 |
'bzrlib.iterablefile', |
|
3901 |
'bzrlib.lockdir', |
|
3902 |
'bzrlib.merge3', |
|
3903 |
'bzrlib.option', |
|
|
5436.2.6
by Andrew Bennetts
Add doctest-able example to get_named_object docstring. Make doctest skip calc_parent_name docstring. |
3904 |
'bzrlib.pyutils', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3905 |
'bzrlib.symbol_versioning', |
3906 |
'bzrlib.tests', |
|
|
5230.2.1
by Martin Pool
Change simple fixtures to be generators of names and unicode encodings. |
3907 |
'bzrlib.tests.fixtures', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3908 |
'bzrlib.timestamp', |
|
4912.2.1
by Martin Pool
Add unhtml_roughly |
3909 |
'bzrlib.transport.http', |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3910 |
'bzrlib.version_info_formats.format_custom', |
3911 |
]
|
|
3912 |
||
3913 |
||
|
3302.11.2
by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite. |
3914 |
def test_suite(keep_only=None, starting_with=None): |
|
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
3915 |
"""Build and return TestSuite for the whole of bzrlib. |
|
3193.1.6
by Vincent Ladeuil
Filter the whole test suite. |
3916 |
|
3917 |
:param keep_only: A list of test ids limiting the suite returned.
|
|
3918 |
||
|
3302.11.2
by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite. |
3919 |
:param starting_with: An id limiting the suite returned to the tests
|
3920 |
starting with it.
|
|
3921 |
||
|
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
3922 |
This function can be replaced if you need to change the default test
|
3923 |
suite on a global basis, but it is not encouraged.
|
|
3924 |
"""
|
|
|
3302.9.23
by Vincent Ladeuil
Simplify test_suite(). |
3925 |
|
|
1707.2.2
by Robert Collins
Start on bench_add, an add benchtest. |
3926 |
loader = TestUtil.TestLoader() |
|
3193.1.6
by Vincent Ladeuil
Filter the whole test suite. |
3927 |
|
|
4498.1.2
by Vincent Ladeuil
Fix selftest -s xxx --load yyy usage. |
3928 |
if keep_only is not None: |
3929 |
id_filter = TestIdList(keep_only) |
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
3930 |
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. |
3931 |
# We take precedence over keep_only because *at loading time* using
|
3932 |
# 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. |
3933 |
def interesting_module(name): |
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
3934 |
for start in starting_with: |
3935 |
if ( |
|
3936 |
# Either the module name starts with the specified string
|
|
3937 |
name.startswith(start) |
|
3938 |
# or it may contain tests starting with the specified string
|
|
3939 |
or start.startswith(name) |
|
3940 |
):
|
|
3941 |
return True |
|
3942 |
return False |
|
|
3302.11.6
by Vincent Ladeuil
Fixed as per Martin and John reviews. Also fix a bug. |
3943 |
loader = TestUtil.FilteredByModuleTestLoader(interesting_module) |
|
3302.11.5
by Vincent Ladeuil
Fixed as per John's review. Also added a NEWS entry. |
3944 |
|
|
3302.11.2
by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite. |
3945 |
elif keep_only is not None: |
|
3302.8.12
by Vincent Ladeuil
Simplify tests.test_suite. |
3946 |
loader = TestUtil.FilteredByModuleTestLoader(id_filter.refers_to) |
|
3302.11.5
by Vincent Ladeuil
Fixed as per John's review. Also added a NEWS entry. |
3947 |
def interesting_module(name): |
3948 |
return id_filter.refers_to(name) |
|
3949 |
||
|
3302.11.2
by Vincent Ladeuil
selftest now accepts --starting-ith <id> to load and execute only a module|class|test* reduced suite. |
3950 |
else: |
3951 |
loader = TestUtil.TestLoader() |
|
|
3302.11.5
by Vincent Ladeuil
Fixed as per John's review. Also added a NEWS entry. |
3952 |
def interesting_module(name): |
3953 |
# No filtering, all modules are interesting
|
|
3954 |
return True |
|
3955 |
||
|
3302.8.12
by Vincent Ladeuil
Simplify tests.test_suite. |
3956 |
suite = loader.suiteClass() |
|
3193.1.6
by Vincent Ladeuil
Filter the whole test suite. |
3957 |
|
3958 |
# modules building their suite with loadTestsFromModuleNames
|
|
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3959 |
suite.addTest(loader.loadTestsFromModuleNames(_test_suite_testmod_names())) |
3960 |
||
3961 |
for mod in _test_suite_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. |
3962 |
if not interesting_module(mod): |
|
3302.8.13
by Vincent Ladeuil
DocTests can now be filtered at module level too. |
3963 |
# No tests to keep here, move along
|
3964 |
continue
|
|
|
1996.3.5
by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again. |
3965 |
try: |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
3966 |
# note that this really does mean "report only" -- doctest
|
|
3825.3.4
by Martin Pool
Doc |
3967 |
# still runs the rest of the examples
|
|
5574.6.8
by Vincent Ladeuil
Fix typo, rename BzrDocTestSuite to IsolatedDocTestSuite to dodge the name space controversy and make the intent clearer, add an indirection for setUp/tearDown to prepare more isolation for doctests. |
3968 |
doc_suite = IsolatedDocTestSuite( |
|
5574.6.4
by Vincent Ladeuil
Really isolate doctest by using bzrlib.tests.DocTestSuite. |
3969 |
mod, optionflags=doctest.REPORT_ONLY_FIRST_FAILURE) |
|
1996.3.5
by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again. |
3970 |
except ValueError, e: |
|
3193.1.6
by Vincent Ladeuil
Filter the whole test suite. |
3971 |
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. |
3972 |
raise
|
|
3825.3.1
by Martin Pool
selftest errors if modules said to have doctests don't have them |
3973 |
if len(doc_suite._tests) == 0: |
3974 |
raise errors.BzrError("no doctests found in %s" % (mod,)) |
|
|
3193.1.6
by Vincent Ladeuil
Filter the whole test suite. |
3975 |
suite.addTest(doc_suite) |
3976 |
||
|
2762.2.1
by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square |
3977 |
default_encoding = sys.getdefaultencoding() |
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
3978 |
for name, plugin in _mod_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. |
3979 |
if not interesting_module(plugin.module.__name__): |
3980 |
continue
|
|
|
3221.4.1
by Martin Pool
Treat failure to load plugin test suites as a fatal error |
3981 |
plugin_suite = plugin.test_suite() |
3982 |
# We used to catch ImportError here and turn it into just a warning,
|
|
3983 |
# but really if you don't have --no-plugins this should be a failure.
|
|
3984 |
# mbp 20080213 - see http://bugs.launchpad.net/bugs/189771
|
|
|
3302.8.12
by Vincent Ladeuil
Simplify tests.test_suite. |
3985 |
if plugin_suite is None: |
|
3302.8.21
by Vincent Ladeuil
Fixed as per Robert's review. |
3986 |
plugin_suite = plugin.load_plugin_tests(loader) |
|
3221.4.1
by Martin Pool
Treat failure to load plugin test suites as a fatal error |
3987 |
if plugin_suite is not None: |
3988 |
suite.addTest(plugin_suite) |
|
|
2762.2.1
by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square |
3989 |
if default_encoding != sys.getdefaultencoding(): |
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
3990 |
trace.warning( |
|
2762.2.1
by Robert Collins
* ``bzr plugins`` now lists the version number for each plugin in square |
3991 |
'Plugin "%s" tried to reset default encoding to: %s', name, |
3992 |
sys.getdefaultencoding()) |
|
3993 |
reload(sys) |
|
3994 |
sys.setdefaultencoding(default_encoding) |
|
|
3302.3.1
by Vincent Ladeuil
Help identify duplicates IDs in test suite and missing tests in id |
3995 |
|
3996 |
if keep_only is not None: |
|
|
3302.8.12
by Vincent Ladeuil
Simplify tests.test_suite. |
3997 |
# Now that the referred modules have loaded their tests, keep only the
|
3998 |
# requested ones.
|
|
3999 |
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 |
4000 |
# Do some sanity checks on the id_list filtering
|
4001 |
not_found, duplicates = suite_matches_id_list(suite, keep_only) |
|
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
4002 |
if starting_with: |
|
3302.11.5
by Vincent Ladeuil
Fixed as per John's review. Also added a NEWS entry. |
4003 |
# The tester has used both keep_only and starting_with, so he is
|
4004 |
# already aware that some tests are excluded from the list, there
|
|
4005 |
# 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. |
4006 |
pass
|
4007 |
else: |
|
|
3302.11.5
by Vincent Ladeuil
Fixed as per John's review. Also added a NEWS entry. |
4008 |
# Some tests mentioned in the list are not in the test suite. The
|
4009 |
# 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. |
4010 |
for id in not_found: |
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
4011 |
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 |
4012 |
for id in duplicates: |
|
5574.4.1
by Vincent Ladeuil
Cleanup tests imports, they drive me crazy (we had calls for note, trace.log_exception_quietly and bzrlib.trace.warning...) |
4013 |
trace.warning('"%s" is used as an id by several tests', id) |
|
3302.3.1
by Vincent Ladeuil
Help identify duplicates IDs in test suite and missing tests in id |
4014 |
|
|
1092.1.17
by Robert Collins
remove TEST_CLASSES dead code and provide a bzrlib.test_suite() convenience method |
4015 |
return suite |
|
764
by Martin Pool
- log messages from a particular test are printed if that test fails |
4016 |
|
|
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
4017 |
|
|
5462.3.14
by Martin Pool
Unify varations with scenario protocol |
4018 |
def multiply_scenarios(*scenarios): |
4019 |
"""Multiply two or more iterables of scenarios. |
|
4020 |
||
4021 |
It is safe to pass scenario generators or iterators.
|
|
4022 |
||
|
5462.3.20
by Martin Pool
doc |
4023 |
:returns: A list of compound scenarios: the cross-product of all
|
4024 |
scenarios, with the names concatenated and the parameters
|
|
4025 |
merged together.
|
|
|
5462.3.14
by Martin Pool
Unify varations with scenario protocol |
4026 |
"""
|
4027 |
return reduce(_multiply_two_scenarios, map(list, scenarios)) |
|
4028 |
||
4029 |
||
4030 |
def _multiply_two_scenarios(scenarios_left, scenarios_right): |
|
|
2745.6.58
by Andrew Bennetts
Slightly neater test parameterisation in repository_implementations; extract a 'multiply_scenarios' function. |
4031 |
"""Multiply two sets of scenarios. |
4032 |
||
4033 |
:returns: the cartesian product of the two sets of scenarios, that is
|
|
4034 |
a scenario for every possible combination of a left scenario and a
|
|
4035 |
right scenario.
|
|
4036 |
"""
|
|
4037 |
return [ |
|
4038 |
('%s,%s' % (left_name, right_name), |
|
4039 |
dict(left_dict.items() + right_dict.items())) |
|
4040 |
for left_name, left_dict in scenarios_left |
|
4041 |
for right_name, right_dict in scenarios_right] |
|
4042 |
||
4043 |
||
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
4044 |
def multiply_tests(tests, scenarios, result): |
4045 |
"""Multiply tests_list by scenarios into result. |
|
4046 |
||
4047 |
This is the core workhorse for test parameterisation.
|
|
4048 |
||
4049 |
Typically the load_tests() method for a per-implementation test suite will
|
|
4050 |
call multiply_tests and return the result.
|
|
4051 |
||
4052 |
:param tests: The tests to parameterise.
|
|
4053 |
:param scenarios: The scenarios to apply: pairs of (scenario_name,
|
|
4054 |
scenario_param_dict).
|
|
4055 |
:param result: A TestSuite to add created tests to.
|
|
4056 |
||
4057 |
This returns the passed in result TestSuite with the cross product of all
|
|
4058 |
the tests repeated once for each scenario. Each test is adapted by adding
|
|
4059 |
the scenario name at the end of its id(), and updating the test object's
|
|
4060 |
__dict__ with the scenario_param_dict.
|
|
4061 |
||
|
4205.4.1
by Robert Collins
Import needed module for a doctest. |
4062 |
>>> import bzrlib.tests.test_sampler
|
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
4063 |
>>> r = multiply_tests(
|
4064 |
... bzrlib.tests.test_sampler.DemoTest('test_nothing'),
|
|
4065 |
... [('one', dict(param=1)),
|
|
4066 |
... ('two', dict(param=2))],
|
|
|
5247.1.1
by Vincent Ladeuil
Merge previous attempt into current trunk |
4067 |
... TestUtil.TestSuite())
|
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
4068 |
>>> tests = list(iter_suite_tests(r))
|
4069 |
>>> len(tests)
|
|
4070 |
2
|
|
4071 |
>>> tests[0].id()
|
|
4072 |
'bzrlib.tests.test_sampler.DemoTest.test_nothing(one)'
|
|
4073 |
>>> tests[0].param
|
|
4074 |
1
|
|
4075 |
>>> tests[1].param
|
|
4076 |
2
|
|
4077 |
"""
|
|
4078 |
for test in iter_suite_tests(tests): |
|
4079 |
apply_scenarios(test, scenarios, result) |
|
4080 |
return result |
|
4081 |
||
4082 |
||
4083 |
def apply_scenarios(test, scenarios, result): |
|
4084 |
"""Apply the scenarios in scenarios to test and add to result. |
|
4085 |
||
4086 |
:param test: The test to apply scenarios to.
|
|
4087 |
:param scenarios: An iterable of scenarios to apply to test.
|
|
4088 |
:return: result
|
|
4089 |
:seealso: apply_scenario
|
|
4090 |
"""
|
|
4091 |
for scenario in scenarios: |
|
4092 |
result.addTest(apply_scenario(test, scenario)) |
|
4093 |
return result |
|
4094 |
||
4095 |
||
4096 |
def apply_scenario(test, scenario): |
|
4097 |
"""Copy test and apply scenario to it. |
|
4098 |
||
4099 |
:param test: A test to adapt.
|
|
4100 |
:param scenario: A tuple describing the scenarion.
|
|
4101 |
The first element of the tuple is the new test id.
|
|
4102 |
The second element is a dict containing attributes to set on the
|
|
4103 |
test.
|
|
4104 |
:return: The adapted test.
|
|
4105 |
"""
|
|
4106 |
new_id = "%s(%s)" % (test.id(), scenario[0]) |
|
4107 |
new_test = clone_test(test, new_id) |
|
4108 |
for name, value in scenario[1].items(): |
|
4109 |
setattr(new_test, name, value) |
|
4110 |
return new_test |
|
4111 |
||
4112 |
||
4113 |
def clone_test(test, new_id): |
|
4114 |
"""Clone a test giving it a new id. |
|
4115 |
||
4116 |
:param test: The test to clone.
|
|
4117 |
:param new_id: The id to assign to it.
|
|
4118 |
:return: The new test.
|
|
4119 |
"""
|
|
|
5273.1.1
by Vincent Ladeuil
Cleanup some imports in bzrlib.tests. |
4120 |
new_test = copy.copy(test) |
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
4121 |
new_test.id = lambda: new_id |
|
5050.33.6
by Andrew Bennetts
Replace __copy__ hack with more direct workaround in clone_test. |
4122 |
# XXX: Workaround <https://bugs.launchpad.net/testtools/+bug/637725>, which
|
4123 |
# causes cloned tests to share the 'details' dict. This makes it hard to
|
|
4124 |
# read the test output for parameterized tests, because tracebacks will be
|
|
4125 |
# associated with irrelevant tests.
|
|
4126 |
try: |
|
4127 |
details = new_test._TestCase__details |
|
4128 |
except AttributeError: |
|
4129 |
# must be a different version of testtools than expected. Do nothing.
|
|
4130 |
pass
|
|
4131 |
else: |
|
4132 |
# Reset the '__details' dict.
|
|
4133 |
new_test._TestCase__details = {} |
|
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
4134 |
return new_test |
|
3004.1.5
by Daniel Watkins
Added adapt_tests which will adapt tests at a finer-than-module level. |
4135 |
|
4136 |
||
|
4913.3.1
by John Arbash Meinel
Implement a permute_for_extension helper. |
4137 |
def permute_tests_for_extension(standard_tests, loader, py_module_name, |
4138 |
ext_module_name): |
|
|
4913.3.6
by John Arbash Meinel
Add doc string for permute_tests_for_extension. |
4139 |
"""Helper for permutating tests against an extension module. |
4140 |
||
4141 |
This is meant to be used inside a modules 'load_tests()' function. It will
|
|
4142 |
create 2 scenarios, and cause all tests in the 'standard_tests' to be run
|
|
4143 |
against both implementations. Setting 'test.module' to the appropriate
|
|
4144 |
module. See bzrlib.tests.test__chk_map.load_tests as an example.
|
|
4145 |
||
4146 |
:param standard_tests: A test suite to permute
|
|
4147 |
:param loader: A TestLoader
|
|
4148 |
:param py_module_name: The python path to a python module that can always
|
|
4149 |
be loaded, and will be considered the 'python' implementation. (eg
|
|
4150 |
'bzrlib._chk_map_py')
|
|
4151 |
:param ext_module_name: The python path to an extension module. If the
|
|
4152 |
module cannot be loaded, a single test will be added, which notes that
|
|
4153 |
the module is not available. If it can be loaded, all standard_tests
|
|
4154 |
will be run against that module.
|
|
4155 |
:return: (suite, feature) suite is a test-suite that has all the permuted
|
|
4156 |
tests. feature is the Feature object that can be used to determine if
|
|
4157 |
the module is available.
|
|
4158 |
"""
|
|
4159 |
||
|
5436.2.1
by Andrew Bennetts
Add bzrlib.pyutils, which has get_named_object, a wrapper around __import__. |
4160 |
py_module = pyutils.get_named_object(py_module_name) |
|
4913.3.1
by John Arbash Meinel
Implement a permute_for_extension helper. |
4161 |
scenarios = [ |
4162 |
('python', {'module': py_module}), |
|
4163 |
]
|
|
4164 |
suite = loader.suiteClass() |
|
4165 |
feature = ModuleAvailableFeature(ext_module_name) |
|
4166 |
if feature.available(): |
|
4167 |
scenarios.append(('C', {'module': feature.module})) |
|
4168 |
else: |
|
4169 |
# the compiled module isn't available, so we add a failing test
|
|
4170 |
class FailWithoutFeature(TestCase): |
|
4171 |
def test_fail(self): |
|
4172 |
self.requireFeature(feature) |
|
4173 |
suite.addTest(loader.loadTestsFromTestCase(FailWithoutFeature)) |
|
4174 |
result = multiply_tests(standard_tests, scenarios, suite) |
|
4175 |
return result, feature |
|
4176 |
||
4177 |
||
|
4807.3.3
by John Arbash Meinel
Report the test-id when we fail to delete a testing dir. |
4178 |
def _rmtree_temp_dir(dirname, test_id=None): |
|
2485.6.4
by Martin Pool
Move unicode handling code into _rmtree_temp_dir |
4179 |
# If LANG=C we probably have created some bogus paths
|
4180 |
# which rmtree(unicode) will fail to delete
|
|
4181 |
# so make sure we are using rmtree(str) to delete everything
|
|
4182 |
# except on win32, where rmtree(str) will fail
|
|
4183 |
# since it doesn't have the property of byte-stream paths
|
|
4184 |
# (they are either ascii or mbcs)
|
|
4185 |
if sys.platform == 'win32': |
|
4186 |
# make sure we are using the unicode win32 api
|
|
4187 |
dirname = unicode(dirname) |
|
4188 |
else: |
|
4189 |
dirname = dirname.encode(sys.getfilesystemencoding()) |
|
|
2379.6.4
by Alexander Belchenko
Teach `bzr selftest --clean-output` to remove read-only files (win32-specific) |
4190 |
try: |
4191 |
osutils.rmtree(dirname) |
|
4192 |
except OSError, e: |
|
|
4615.3.2
by Vincent Ladeuil
Allows selftest to finish even without fully cleaning the test dir. |
4193 |
# We don't want to fail here because some useful display will be lost
|
4194 |
# otherwise. Polluting the tmp dir is bad, but not giving all the
|
|
4195 |
# possible info to the test runner is even worse.
|
|
|
4807.3.3
by John Arbash Meinel
Report the test-id when we fail to delete a testing dir. |
4196 |
if test_id != None: |
4197 |
ui.ui_factory.clear_term() |
|
|
4857.1.1
by John Arbash Meinel
Add an extra newline. It seems that calling clear_term() just isn't enough. |
4198 |
sys.stderr.write('\nWhile running: %s\n' % (test_id,)) |
|
5229.1.4
by Vincent Ladeuil
Tested, explain the intent. |
4199 |
# Ugly, but the last thing we want here is fail, so bear with it.
|
|
5229.1.5
by Vincent Ladeuil
Even more paranoid fix. |
4200 |
printable_e = str(e).decode(osutils.get_user_encoding(), 'replace' |
|
5229.1.3
by Vincent Ladeuil
The test should go on ! |
4201 |
).encode('ascii', 'replace') |
|
4615.3.2
by Vincent Ladeuil
Allows selftest to finish even without fully cleaning the test dir. |
4202 |
sys.stderr.write('Unable to remove testing dir %s\n%s' |
|
5229.1.2
by Vincent Ladeuil
First try at fixing the unicode encoding error. |
4203 |
% (os.path.basename(dirname), printable_e)) |
|
2379.6.4
by Alexander Belchenko
Teach `bzr selftest --clean-output` to remove read-only files (win32-specific) |
4204 |
|
4205 |
||
|
2367.1.4
by Robert Collins
Add operating system Feature model to bzrlib.tests to allow writing tests |
4206 |
class Feature(object): |
4207 |
"""An operating system Feature.""" |
|
4208 |
||
4209 |
def __init__(self): |
|
4210 |
self._available = None |
|
4211 |
||
4212 |
def available(self): |
|
4213 |
"""Is the feature available? |
|
4214 |
||
4215 |
:return: True if the feature is available.
|
|
4216 |
"""
|
|
4217 |
if self._available is None: |
|
4218 |
self._available = self._probe() |
|
4219 |
return self._available |
|
4220 |
||
4221 |
def _probe(self): |
|
4222 |
"""Implement this method in concrete features. |
|
4223 |
||
4224 |
:return: True if the feature is available.
|
|
4225 |
"""
|
|
4226 |
raise NotImplementedError |
|
4227 |
||
4228 |
def __str__(self): |
|
4229 |
if getattr(self, 'feature_name', None): |
|
4230 |
return self.feature_name() |
|
4231 |
return self.__class__.__name__ |
|
|
2553.2.3
by Robert Collins
Split out the common test scenario support from the repository implementation specific code. |
4232 |
|
4233 |
||
|
2776.1.5
by Robert Collins
Add reasonably comprehensive tests for path last modified and per file graph behaviour. |
4234 |
class _SymlinkFeature(Feature): |
4235 |
||
4236 |
def _probe(self): |
|
4237 |
return osutils.has_symlinks() |
|
4238 |
||
4239 |
def feature_name(self): |
|
4240 |
return 'symlinks' |
|
4241 |
||
4242 |
SymlinkFeature = _SymlinkFeature() |
|
4243 |
||
4244 |
||
|
3136.1.1
by Aaron Bentley
Add support for hardlinks to TreeTransform |
4245 |
class _HardlinkFeature(Feature): |
4246 |
||
4247 |
def _probe(self): |
|
4248 |
return osutils.has_hardlinks() |
|
4249 |
||
4250 |
def feature_name(self): |
|
4251 |
return 'hardlinks' |
|
4252 |
||
4253 |
HardlinkFeature = _HardlinkFeature() |
|
4254 |
||
4255 |
||
|
2949.5.2
by Alexander Belchenko
John's review |
4256 |
class _OsFifoFeature(Feature): |
4257 |
||
4258 |
def _probe(self): |
|
4259 |
return getattr(os, 'mkfifo', None) |
|
4260 |
||
4261 |
def feature_name(self): |
|
4262 |
return 'filesystem fifos' |
|
4263 |
||
4264 |
OsFifoFeature = _OsFifoFeature() |
|
4265 |
||
4266 |
||
|
3477.1.2
by John Arbash Meinel
Rename UnicodeFilename => UnicodeFilenameFeature |
4267 |
class _UnicodeFilenameFeature(Feature): |
|
3477.1.1
by John Arbash Meinel
Move UnicodeFeature into a core 'tests' feature, rather than living in test_diff. |
4268 |
"""Does the filesystem support Unicode filenames?""" |
4269 |
||
4270 |
def _probe(self): |
|
4271 |
try: |
|
|
3526.2.1
by Martin von Gagern
Improved UnicodeFilenameFeature. |
4272 |
# Check for character combinations unlikely to be covered by any
|
4273 |
# single non-unicode encoding. We use the characters
|
|
4274 |
# - greek small letter alpha (U+03B1) and
|
|
4275 |
# - braille pattern dots-123456 (U+283F).
|
|
4276 |
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. |
4277 |
except UnicodeEncodeError: |
4278 |
return False |
|
4279 |
except (IOError, OSError): |
|
4280 |
# The filesystem allows the Unicode filename but the file doesn't
|
|
4281 |
# exist.
|
|
4282 |
return True |
|
4283 |
else: |
|
4284 |
# The filesystem allows the Unicode filename and the file exists,
|
|
4285 |
# for some reason.
|
|
4286 |
return True |
|
4287 |
||
|
3477.1.2
by John Arbash Meinel
Rename UnicodeFilename => UnicodeFilenameFeature |
4288 |
UnicodeFilenameFeature = _UnicodeFilenameFeature() |
|
3477.1.1
by John Arbash Meinel
Move UnicodeFeature into a core 'tests' feature, rather than living in test_diff. |
4289 |
|
4290 |
||
|
4913.2.18
by John Arbash Meinel
Add a _CompatibilityThunkFeature. |
4291 |
class _CompatabilityThunkFeature(Feature): |
4292 |
"""This feature is just a thunk to another feature. |
|
4293 |
||
4294 |
It issues a deprecation warning if it is accessed, to let you know that you
|
|
4295 |
should really use a different feature.
|
|
4296 |
"""
|
|
4297 |
||
|
5003.2.1
by Vincent Ladeuil
Avoid infinite recursion when probing for apport. |
4298 |
def __init__(self, dep_version, module, name, |
4299 |
replacement_name, replacement_module=None): |
|
|
4913.2.18
by John Arbash Meinel
Add a _CompatibilityThunkFeature. |
4300 |
super(_CompatabilityThunkFeature, self).__init__() |
4301 |
self._module = module |
|
|
5003.2.1
by Vincent Ladeuil
Avoid infinite recursion when probing for apport. |
4302 |
if replacement_module is None: |
4303 |
replacement_module = module |
|
4304 |
self._replacement_module = replacement_module |
|
|
4913.2.18
by John Arbash Meinel
Add a _CompatibilityThunkFeature. |
4305 |
self._name = name |
|
5003.2.1
by Vincent Ladeuil
Avoid infinite recursion when probing for apport. |
4306 |
self._replacement_name = replacement_name |
|
4913.2.18
by John Arbash Meinel
Add a _CompatibilityThunkFeature. |
4307 |
self._dep_version = dep_version |
4308 |
self._feature = None |
|
4309 |
||
4310 |
def _ensure(self): |
|
4311 |
if self._feature is None: |
|
|
5003.2.1
by Vincent Ladeuil
Avoid infinite recursion when probing for apport. |
4312 |
depr_msg = self._dep_version % ('%s.%s' |
4313 |
% (self._module, self._name)) |
|
4314 |
use_msg = ' Use %s.%s instead.' % (self._replacement_module, |
|
4315 |
self._replacement_name) |
|
4316 |
symbol_versioning.warn(depr_msg + use_msg, DeprecationWarning) |
|
|
5003.2.3
by Vincent Ladeuil
Just delete ApportFeature. |
4317 |
# Import the new feature and use it as a replacement for the
|
4318 |
# deprecated one.
|
|
|
5436.2.1
by Andrew Bennetts
Add bzrlib.pyutils, which has get_named_object, a wrapper around __import__. |
4319 |
self._feature = pyutils.get_named_object( |
4320 |
self._replacement_module, self._replacement_name) |
|
|
4913.2.18
by John Arbash Meinel
Add a _CompatibilityThunkFeature. |
4321 |
|
4322 |
def _probe(self): |
|
4323 |
self._ensure() |
|
4324 |
return self._feature._probe() |
|
4325 |
||
4326 |
||
|
4873.2.3
by John Arbash Meinel
Change from _ModuleFeature to ModuleAvailableFeature, per vila's review. |
4327 |
class ModuleAvailableFeature(Feature): |
|
4873.2.1
by John Arbash Meinel
Add a helper _ModuleFeature. |
4328 |
"""This is a feature than describes a module we want to be available. |
4329 |
||
4330 |
Declare the name of the module in __init__(), and then after probing, the
|
|
4331 |
module will be available as 'self.module'.
|
|
4332 |
||
4333 |
:ivar module: The module if it is available, else None.
|
|
4334 |
"""
|
|
4335 |
||
4336 |
def __init__(self, module_name): |
|
|
4873.2.3
by John Arbash Meinel
Change from _ModuleFeature to ModuleAvailableFeature, per vila's review. |
4337 |
super(ModuleAvailableFeature, self).__init__() |
|
4873.2.1
by John Arbash Meinel
Add a helper _ModuleFeature. |
4338 |
self.module_name = module_name |
4339 |
||
4340 |
def _probe(self): |
|
4341 |
try: |
|
4342 |
self._module = __import__(self.module_name, {}, {}, ['']) |
|
4343 |
return True |
|
4344 |
except ImportError: |
|
4345 |
return False |
|
4346 |
||
4347 |
@property
|
|
4348 |
def module(self): |
|
4349 |
if self.available(): # Make sure the probe has been done |
|
4350 |
return self._module |
|
4351 |
return None |
|
|
5003.2.1
by Vincent Ladeuil
Avoid infinite recursion when probing for apport. |
4352 |
|
|
4873.2.1
by John Arbash Meinel
Add a helper _ModuleFeature. |
4353 |
def feature_name(self): |
4354 |
return self.module_name |
|
4355 |
||
4356 |
||
|
2785.1.5
by Alexander Belchenko
support for non-ascii BZR_HOME in show_version() |
4357 |
def probe_unicode_in_user_encoding(): |
4358 |
"""Try to encode several unicode strings to use in unicode-aware tests. |
|
4359 |
Return first successfull match.
|
|
4360 |
||
4361 |
:return: (unicode value, encoded plain string value) or (None, None)
|
|
4362 |
"""
|
|
4363 |
possible_vals = [u'm\xb5', u'\xe1', u'\u0410'] |
|
4364 |
for uni_val in possible_vals: |
|
4365 |
try: |
|
|
3224.5.4
by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding. |
4366 |
str_val = uni_val.encode(osutils.get_user_encoding()) |
|
2785.1.5
by Alexander Belchenko
support for non-ascii BZR_HOME in show_version() |
4367 |
except UnicodeEncodeError: |
4368 |
# Try a different character
|
|
4369 |
pass
|
|
4370 |
else: |
|
4371 |
return uni_val, str_val |
|
4372 |
return None, None |
|
|
2804.4.1
by Alexander Belchenko
some win32-specific fixes for selftest |
4373 |
|
4374 |
||
|
2839.6.2
by Alexander Belchenko
changes after Martin's review |
4375 |
def probe_bad_non_ascii(encoding): |
|
2804.4.1
by Alexander Belchenko
some win32-specific fixes for selftest |
4376 |
"""Try to find [bad] character with code [128..255] |
|
2839.6.2
by Alexander Belchenko
changes after Martin's review |
4377 |
that cannot be decoded to unicode in some encoding.
|
|
2804.4.1
by Alexander Belchenko
some win32-specific fixes for selftest |
4378 |
Return None if all non-ascii characters is valid
|
|
2839.6.2
by Alexander Belchenko
changes after Martin's review |
4379 |
for given encoding.
|
|
2804.4.1
by Alexander Belchenko
some win32-specific fixes for selftest |
4380 |
"""
|
4381 |
for i in xrange(128, 256): |
|
4382 |
char = chr(i) |
|
4383 |
try: |
|
|
2839.6.2
by Alexander Belchenko
changes after Martin's review |
4384 |
char.decode(encoding) |
|
2804.4.1
by Alexander Belchenko
some win32-specific fixes for selftest |
4385 |
except UnicodeDecodeError: |
4386 |
return char |
|
4387 |
return None |
|
|
2917.3.1
by Vincent Ladeuil
Separate transport from test server. |
4388 |
|
4389 |
||
|
2929.3.10
by Vincent Ladeuil
Add a fake https server and test facilities. |
4390 |
class _HTTPSServerFeature(Feature): |
4391 |
"""Some tests want an https Server, check if one is available. |
|
4392 |
||
|
2929.3.12
by Vincent Ladeuil
Implement an https server passing the same tests than http. Except |
4393 |
Right now, the only way this is available is under python2.6 which provides
|
4394 |
an ssl module.
|
|
|
2929.3.10
by Vincent Ladeuil
Add a fake https server and test facilities. |
4395 |
"""
|
4396 |
||
4397 |
def _probe(self): |
|
|
2929.3.12
by Vincent Ladeuil
Implement an https server passing the same tests than http. Except |
4398 |
try: |
4399 |
import ssl |
|
4400 |
return True |
|
4401 |
except ImportError: |
|
4402 |
return False |
|
|
2929.3.10
by Vincent Ladeuil
Add a fake https server and test facilities. |
4403 |
|
4404 |
def feature_name(self): |
|
4405 |
return 'HTTPSServer' |
|
4406 |
||
4407 |
||
4408 |
HTTPSServerFeature = _HTTPSServerFeature() |
|
|
2929.3.14
by Vincent Ladeuil
Merge bzr.dev |
4409 |
|
4410 |
||
|
3287.20.2
by John Arbash Meinel
Raise a clear error about the offending filename when there is a filename with bad characters. |
4411 |
class _UnicodeFilename(Feature): |
4412 |
"""Does the filesystem support Unicode filenames?""" |
|
4413 |
||
4414 |
def _probe(self): |
|
4415 |
try: |
|
4416 |
os.stat(u'\u03b1') |
|
4417 |
except UnicodeEncodeError: |
|
4418 |
return False |
|
4419 |
except (IOError, OSError): |
|
4420 |
# The filesystem allows the Unicode filename but the file doesn't
|
|
4421 |
# exist.
|
|
4422 |
return True |
|
4423 |
else: |
|
4424 |
# The filesystem allows the Unicode filename and the file exists,
|
|
4425 |
# for some reason.
|
|
4426 |
return True |
|
4427 |
||
4428 |
UnicodeFilename = _UnicodeFilename() |
|
4429 |
||
4430 |
||
|
5279.2.10
by Eric Moritz
Added a ByteStringNamedFilesystem per Martin Pool's request |
4431 |
class _ByteStringNamedFilesystem(Feature): |
4432 |
"""Is the filesystem based on bytes?""" |
|
4433 |
||
4434 |
def _probe(self): |
|
4435 |
if os.name == "posix": |
|
4436 |
return True |
|
4437 |
return False |
|
4438 |
||
4439 |
ByteStringNamedFilesystem = _ByteStringNamedFilesystem() |
|
4440 |
||
4441 |
||
|
3287.20.2
by John Arbash Meinel
Raise a clear error about the offending filename when there is a filename with bad characters. |
4442 |
class _UTF8Filesystem(Feature): |
4443 |
"""Is the filesystem UTF-8?""" |
|
4444 |
||
4445 |
def _probe(self): |
|
4446 |
if osutils._fs_enc.upper() in ('UTF-8', 'UTF8'): |
|
4447 |
return True |
|
4448 |
return False |
|
4449 |
||
4450 |
UTF8Filesystem = _UTF8Filesystem() |
|
4451 |
||
4452 |
||
|
4715.2.1
by Robert Collins
Stop caring about a clean shutdown of the process in tests for the interactive debugger break-in facility. |
4453 |
class _BreakinFeature(Feature): |
4454 |
"""Does this platform support the breakin feature?""" |
|
4455 |
||
4456 |
def _probe(self): |
|
4457 |
from bzrlib import breakin |
|
4458 |
if breakin.determine_signal() is None: |
|
4459 |
return False |
|
4460 |
if sys.platform == 'win32': |
|
4461 |
# Windows doesn't have os.kill, and we catch the SIGBREAK signal.
|
|
4462 |
# We trigger SIGBREAK via a Console api so we need ctypes to
|
|
4463 |
# access the function
|
|
|
4789.5.1
by John Arbash Meinel
Simple test suite fix for a variable that didn't exist. |
4464 |
try: |
4465 |
import ctypes |
|
4466 |
except OSError: |
|
|
4715.2.1
by Robert Collins
Stop caring about a clean shutdown of the process in tests for the interactive debugger break-in facility. |
4467 |
return False |
4468 |
return True |
|
4469 |
||
4470 |
def feature_name(self): |
|
4471 |
return "SIGQUIT or SIGBREAK w/ctypes on win32" |
|
4472 |
||
4473 |
||
4474 |
BreakinFeature = _BreakinFeature() |
|
4475 |
||
4476 |
||
|
3794.5.26
by Mark Hammond
Make the CaseInsCasePresFilenameFeature mutually exclusive from CaseInsCasePresFilenameFeature as the semantics differ in meaningful ways. |
4477 |
class _CaseInsCasePresFilenameFeature(Feature): |
4478 |
"""Is the file-system case insensitive, but case-preserving?""" |
|
4479 |
||
4480 |
def _probe(self): |
|
4481 |
fileno, name = tempfile.mkstemp(prefix='MixedCase') |
|
4482 |
try: |
|
4483 |
# first check truly case-preserving for created files, then check
|
|
4484 |
# case insensitive when opening existing files.
|
|
4485 |
name = osutils.normpath(name) |
|
4486 |
base, rel = osutils.split(name) |
|
4487 |
found_rel = osutils.canonical_relpath(base, name) |
|
|
3932.3.1
by Martin Pool
merge cicp patch, correct rest syntax and news typo |
4488 |
return (found_rel == rel |
|
3794.5.26
by Mark Hammond
Make the CaseInsCasePresFilenameFeature mutually exclusive from CaseInsCasePresFilenameFeature as the semantics differ in meaningful ways. |
4489 |
and os.path.isfile(name.upper()) |
4490 |
and os.path.isfile(name.lower())) |
|
4491 |
finally: |
|
4492 |
os.close(fileno) |
|
4493 |
os.remove(name) |
|
4494 |
||
4495 |
def feature_name(self): |
|
4496 |
return "case-insensitive case-preserving filesystem" |
|
4497 |
||
4498 |
CaseInsCasePresFilenameFeature = _CaseInsCasePresFilenameFeature() |
|
4499 |
||
4500 |
||
|
3063.1.1
by Alexander Belchenko
Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758). |
4501 |
class _CaseInsensitiveFilesystemFeature(Feature): |
|
3794.5.26
by Mark Hammond
Make the CaseInsCasePresFilenameFeature mutually exclusive from CaseInsCasePresFilenameFeature as the semantics differ in meaningful ways. |
4502 |
"""Check if underlying filesystem is case-insensitive but *not* case |
4503 |
preserving.
|
|
|
3063.1.1
by Alexander Belchenko
Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758). |
4504 |
"""
|
|
3794.5.26
by Mark Hammond
Make the CaseInsCasePresFilenameFeature mutually exclusive from CaseInsCasePresFilenameFeature as the semantics differ in meaningful ways. |
4505 |
# Note that on Windows, Cygwin, MacOS etc, the file-systems are far
|
4506 |
# more likely to be case preserving, so this case is rare.
|
|
|
3063.1.1
by Alexander Belchenko
Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758). |
4507 |
|
4508 |
def _probe(self): |
|
|
3794.5.26
by Mark Hammond
Make the CaseInsCasePresFilenameFeature mutually exclusive from CaseInsCasePresFilenameFeature as the semantics differ in meaningful ways. |
4509 |
if CaseInsCasePresFilenameFeature.available(): |
4510 |
return False |
|
4511 |
||
|
3063.1.1
by Alexander Belchenko
Catch OSError 17 (file exists) in final phase of tree transform and show filename to user (#111758). |
4512 |
if TestCaseWithMemoryTransport.TEST_ROOT is None: |
4513 |
root = osutils.mkdtemp(prefix='testbzr-', suffix='.tmp') |
|
4514 |
TestCaseWithMemoryTransport.TEST_ROOT = root |
|
4515 |
else: |
|
4516 |
root = TestCaseWithMemoryTransport.TEST_ROOT |
|
4517 |
tdir = osutils.mkdtemp(prefix='case-sensitive-probe-', suffix='', |
|
4518 |
dir=root) |
|
4519 |
name_a = osutils.pathjoin(tdir, 'a') |
|
4520 |
name_A = osutils.pathjoin(tdir, 'A') |
|
4521 |
os.mkdir(name_a) |
|
4522 |
result = osutils.isdir(name_A) |
|
4523 |
_rmtree_temp_dir(tdir) |
|
4524 |
return result |
|
4525 |
||
4526 |
def feature_name(self): |
|
4527 |
return 'case-insensitive filesystem' |
|
4528 |
||
4529 |
CaseInsensitiveFilesystemFeature = _CaseInsensitiveFilesystemFeature() |
|
|
4165.1.1
by Robert Collins
Add builtin subunit support. |
4530 |
|
4531 |
||
|
4634.131.3
by Martin Pool
Add case_sensitive_filesystem_feature |
4532 |
class _CaseSensitiveFilesystemFeature(Feature): |
4533 |
||
4534 |
def _probe(self): |
|
|
4634.131.7
by Martin Pool
cleanup unnecessary import |
4535 |
if CaseInsCasePresFilenameFeature.available(): |
|
4634.131.3
by Martin Pool
Add case_sensitive_filesystem_feature |
4536 |
return False |
|
4634.131.7
by Martin Pool
cleanup unnecessary import |
4537 |
elif CaseInsensitiveFilesystemFeature.available(): |
|
4634.131.3
by Martin Pool
Add case_sensitive_filesystem_feature |
4538 |
return False |
4539 |
else: |
|
4540 |
return True |
|
4541 |
||
4542 |
def feature_name(self): |
|
4543 |
return 'case-sensitive filesystem' |
|
4544 |
||
4545 |
# new coding style is for feature instances to be lowercase
|
|
4546 |
case_sensitive_filesystem_feature = _CaseSensitiveFilesystemFeature() |
|
4547 |
||
4548 |
||
|
4165.1.1
by Robert Collins
Add builtin subunit support. |
4549 |
# Only define SubUnitBzrRunner if subunit is available.
|
4550 |
try: |
|
4551 |
from subunit import TestProtocolClient |
|
|
4794.1.20
by Robert Collins
Appropriately guard the import of AutoTimingTestResultDecorator from subunit. |
4552 |
from subunit.test_results import AutoTimingTestResultDecorator |
|
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
4553 |
class SubUnitBzrProtocolClient(TestProtocolClient): |
4554 |
||
4555 |
def addSuccess(self, test, details=None): |
|
4556 |
# The subunit client always includes the details in the subunit
|
|
4557 |
# stream, but we don't want to include it in ours.
|
|
|
5387.2.9
by John Arbash Meinel
Have to handle when details is None |
4558 |
if details is not None and 'log' in details: |
|
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
4559 |
del details['log'] |
4560 |
return super(SubUnitBzrProtocolClient, self).addSuccess( |
|
4561 |
test, details) |
|
4562 |
||
|
4165.1.1
by Robert Collins
Add builtin subunit support. |
4563 |
class SubUnitBzrRunner(TextTestRunner): |
4564 |
def run(self, test): |
|
|
4794.1.11
by Robert Collins
Remove decorator class that won't be needed with upgraded dependencies. |
4565 |
result = AutoTimingTestResultDecorator( |
|
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
4566 |
SubUnitBzrProtocolClient(self.stream)) |
|
4165.1.1
by Robert Collins
Add builtin subunit support. |
4567 |
test.run(result) |
4568 |
return result |
|
4569 |
except ImportError: |
|
4570 |
pass
|
|
|
4634.148.1
by Martin Pool
Backport fix for permissions of backup.bzr |
4571 |
|
4572 |
class _PosixPermissionsFeature(Feature): |
|
4573 |
||
4574 |
def _probe(self): |
|
4575 |
def has_perms(): |
|
4576 |
# create temporary file and check if specified perms are maintained.
|
|
4577 |
import tempfile |
|
4578 |
||
4579 |
write_perms = stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR |
|
4580 |
f = tempfile.mkstemp(prefix='bzr_perms_chk_') |
|
4581 |
fd, name = f |
|
4582 |
os.close(fd) |
|
4583 |
os.chmod(name, write_perms) |
|
4584 |
||
4585 |
read_perms = os.stat(name).st_mode & 0777 |
|
4586 |
os.unlink(name) |
|
4587 |
return (write_perms == read_perms) |
|
4588 |
||
4589 |
return (os.name == 'posix') and has_perms() |
|
4590 |
||
4591 |
def feature_name(self): |
|
4592 |
return 'POSIX permissions support' |
|
4593 |
||
|
4634.148.4
by Martin Pool
Rename to posix_permissions_feature in accordance with new style |
4594 |
posix_permissions_feature = _PosixPermissionsFeature() |