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