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