bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
1553.5.19
by Martin Pool
Run lockdir doctests |
1 |
# Copyright (C) 2005, 2006 by Canonical Ltd
|
|
608
by Martin Pool
- Split selftests out into a new module and start changing them |
2 |
|
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.
|
|
7 |
||
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.
|
|
12 |
||
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
|
609
by Martin Pool
- cleanup test code |
17 |
|
|
1535
by Martin Pool
todo idea from John |
18 |
# TODO: Perhaps there should be an API to find out if bzr running under the
|
19 |
# test suite -- some plugins might want to avoid making intrusive changes if
|
|
20 |
# this is the case. However, we want behaviour under to test to diverge as
|
|
21 |
# little as possible, so this should be used rarely if it's added at all.
|
|
22 |
# (Suggestion from j-a-meinel, 2005-11-24)
|
|
23 |
||
|
1553.5.68
by Martin Pool
Add new TestCaseWithTransport.assertIsDirectory() and tests |
24 |
# NOTE: Some classes in here use camelCaseNaming() rather than
|
25 |
# underscore_naming(). That's for consistency with unittest; it's not the
|
|
26 |
# general style of bzrlib. Please continue that consistency when adding e.g.
|
|
27 |
# new assertFoo() methods.
|
|
28 |
||
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
29 |
import codecs |
|
1185.1.29
by Robert Collins
merge merge tweaks from aaron, which includes latest .dev |
30 |
from cStringIO import StringIO |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
31 |
import difflib |
|
1740.6.1
by Martin Pool
Remove Scratch objects used by doctests |
32 |
import doctest |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
33 |
import errno |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
34 |
import logging |
35 |
import os |
|
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
36 |
import re |
|
1752.1.1
by Aaron Bentley
Add run_bzr_external |
37 |
import shlex |
|
1530.1.17
by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible. |
38 |
import stat |
|
1752.1.1
by Aaron Bentley
Add run_bzr_external |
39 |
from subprocess import Popen, PIPE |
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
40 |
import sys |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
41 |
import tempfile |
42 |
import unittest |
|
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
43 |
import time |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
44 |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
45 |
|
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
46 |
import bzrlib.branch |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
47 |
import bzrlib.bzrdir as bzrdir |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
48 |
import bzrlib.commands |
|
1185.82.130
by Aaron Bentley
Rename changesets to revision bundles |
49 |
import bzrlib.bundle.serializer |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
50 |
import bzrlib.errors as errors |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
51 |
import bzrlib.inventory |
|
1185.67.6
by Aaron Bentley
Added tests and fixes for LockableFiles.put_utf8(); imported IterableFile |
52 |
import bzrlib.iterablefile |
|
1553.5.19
by Martin Pool
Run lockdir doctests |
53 |
import bzrlib.lockdir |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
54 |
try: |
55 |
import bzrlib.lsprof |
|
56 |
except ImportError: |
|
57 |
# lsprof not available
|
|
58 |
pass
|
|
|
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
59 |
from bzrlib.merge import merge_inner |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
60 |
import bzrlib.merge3 |
61 |
import bzrlib.osutils |
|
62 |
import bzrlib.osutils as osutils |
|
63 |
import bzrlib.plugin |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
64 |
import bzrlib.progress as progress |
|
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
65 |
from bzrlib.revision import common_ancestor |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
66 |
import bzrlib.store |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
67 |
import bzrlib.trace |
|
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
68 |
from bzrlib.transport import get_transport |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
69 |
import bzrlib.transport |
|
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
70 |
from bzrlib.transport.local import LocalRelpathServer |
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
71 |
from bzrlib.transport.readonly import ReadonlyServer |
|
1185.43.1
by Martin Pool
Remove direct logging calls from selftest |
72 |
from bzrlib.trace import mutter |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
73 |
from bzrlib.tests import TestUtil |
74 |
from bzrlib.tests.TestUtil import ( |
|
75 |
TestSuite, |
|
76 |
TestLoader, |
|
77 |
)
|
|
|
1514
by Robert Collins
Unbreak self.build_tree_shape in tests. |
78 |
from bzrlib.tests.treeshape import build_tree_contents |
|
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
79 |
import bzrlib.urlutils as urlutils |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
80 |
from bzrlib.workingtree import WorkingTree, WorkingTreeFormat2 |
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
81 |
|
|
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. |
82 |
default_transport = LocalRelpathServer |
83 |
||
|
855
by Martin Pool
- Patch from John to allow plugins to add their own tests. |
84 |
MODULES_TO_TEST = [] |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
85 |
MODULES_TO_DOCTEST = [ |
86 |
bzrlib.branch, |
|
|
1185.82.130
by Aaron Bentley
Rename changesets to revision bundles |
87 |
bzrlib.bundle.serializer, |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
88 |
bzrlib.commands, |
89 |
bzrlib.errors, |
|
90 |
bzrlib.inventory, |
|
|
1185.67.6
by Aaron Bentley
Added tests and fixes for LockableFiles.put_utf8(); imported IterableFile |
91 |
bzrlib.iterablefile, |
|
1553.5.19
by Martin Pool
Run lockdir doctests |
92 |
bzrlib.lockdir, |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
93 |
bzrlib.merge3, |
|
1545.1.2
by Denys Duchier
order MODULES_TO_DOCTEST alphabetically |
94 |
bzrlib.option, |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
95 |
bzrlib.osutils, |
|
1545.1.2
by Denys Duchier
order MODULES_TO_DOCTEST alphabetically |
96 |
bzrlib.store |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
97 |
]
|
|
1185.82.7
by John Arbash Meinel
Adding patches.py into bzrlib, including the tests into the test suite. |
98 |
|
99 |
||
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
100 |
def packages_to_test(): |
|
1530.2.1
by Robert Collins
Start tests for api usage. |
101 |
"""Return a list of packages to test. |
102 |
||
103 |
The packages are not globally imported so that import failures are
|
|
104 |
triggered when running selftest, not when importing the command.
|
|
105 |
"""
|
|
106 |
import bzrlib.doc |
|
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
107 |
import bzrlib.tests.blackbox |
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
108 |
import bzrlib.tests.branch_implementations |
|
1534.4.39
by Robert Collins
Basic BzrDir support. |
109 |
import bzrlib.tests.bzrdir_implementations |
|
1534.1.29
by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository. |
110 |
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. |
111 |
import bzrlib.tests.interversionedfile_implementations |
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
112 |
import bzrlib.tests.repository_implementations |
|
1563.2.21
by Robert Collins
Smoke test for RevisionStore factories creating revision stores. |
113 |
import bzrlib.tests.revisionstore_implementations |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
114 |
import bzrlib.tests.workingtree_implementations |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
115 |
return [ |
|
1530.2.1
by Robert Collins
Start tests for api usage. |
116 |
bzrlib.doc, |
|
1551.2.6
by Aaron Bentley
Restored blackbox tests [recommit] |
117 |
bzrlib.tests.blackbox, |
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
118 |
bzrlib.tests.branch_implementations, |
|
1534.4.39
by Robert Collins
Basic BzrDir support. |
119 |
bzrlib.tests.bzrdir_implementations, |
|
1534.1.29
by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository. |
120 |
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. |
121 |
bzrlib.tests.interversionedfile_implementations, |
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
122 |
bzrlib.tests.repository_implementations, |
|
1563.2.21
by Robert Collins
Smoke test for RevisionStore factories creating revision stores. |
123 |
bzrlib.tests.revisionstore_implementations, |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
124 |
bzrlib.tests.workingtree_implementations, |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
125 |
]
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
126 |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
127 |
|
128 |
class _MyResult(unittest._TextTestResult): |
|
|
1185.43.2
by Martin Pool
Nicer display of verbose test results and progress |
129 |
"""Custom TestResult. |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
130 |
|
|
1185.33.54
by Martin Pool
[merge] test renames and other fixes (John) |
131 |
Shows output in a different format, including displaying runtime for tests.
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
132 |
"""
|
|
1185.62.21
by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test. |
133 |
stop_early = False |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
134 |
|
135 |
def __init__(self, stream, descriptions, verbosity, pb=None): |
|
136 |
unittest._TextTestResult.__init__(self, stream, descriptions, verbosity) |
|
137 |
self.pb = pb |
|
|
1707.2.3
by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool). |
138 |
|
|
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) |
139 |
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). |
140 |
"""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) |
141 |
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). |
142 |
|
143 |
def _elapsedTestTimeString(self): |
|
144 |
"""Return a time string for the overall time the current test has taken.""" |
|
145 |
return self._formatTime(time.time() - self._start_time) |
|
146 |
||
147 |
def _testTimeString(self): |
|
148 |
if self._benchmarkTime is not None: |
|
149 |
return "%s/%s" % ( |
|
150 |
self._formatTime(self._benchmarkTime), |
|
151 |
self._elapsedTestTimeString()) |
|
152 |
else: |
|
|
1707.2.4
by Robert Collins
Teach the bzrlib TestCase to report the time take by calls to self.time as benchmark time, allowing granular reporting of time during benchmarks. See bzrlib.benchmarks.bench_add. (Robert Collins, Martin Pool) |
153 |
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). |
154 |
|
155 |
def _formatTime(self, seconds): |
|
156 |
"""Format seconds as milliseconds with leading spaces.""" |
|
157 |
return "%5dms" % (1000 * seconds) |
|
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
158 |
|
|
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
159 |
def _ellipsise_unimportant_words(self, a_string, final_width, |
160 |
keep_start=False): |
|
|
1707.2.3
by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool). |
161 |
"""Add ellipses (sp?) for overly long strings. |
|
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
162 |
|
163 |
:param keep_start: If true preserve the start of a_string rather
|
|
164 |
than the end of it.
|
|
165 |
"""
|
|
166 |
if keep_start: |
|
167 |
if len(a_string) > final_width: |
|
168 |
result = a_string[:final_width-3] + '...' |
|
169 |
else: |
|
170 |
result = a_string |
|
171 |
else: |
|
172 |
if len(a_string) > final_width: |
|
173 |
result = '...' + a_string[3-final_width:] |
|
174 |
else: |
|
175 |
result = a_string |
|
176 |
return result.ljust(final_width) |
|
177 |
||
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
178 |
def startTest(self, test): |
179 |
unittest.TestResult.startTest(self, test) |
|
|
1185.31.17
by John Arbash Meinel
Shorten test names in verbose mode in a logical way. Removed bzrlib.selftest prefix |
180 |
# In a short description, the important words are in
|
181 |
# the beginning, but in an id, the important words are
|
|
182 |
# at the end
|
|
|
1185.33.54
by Martin Pool
[merge] test renames and other fixes (John) |
183 |
SHOW_DESCRIPTIONS = False |
|
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
184 |
|
185 |
if not self.showAll and self.dots and self.pb is not None: |
|
186 |
final_width = 13 |
|
187 |
else: |
|
188 |
final_width = osutils.terminal_width() |
|
|
1707.2.4
by Robert Collins
Teach the bzrlib TestCase to report the time take by calls to self.time as benchmark time, allowing granular reporting of time during benchmarks. See bzrlib.benchmarks.bench_add. (Robert Collins, Martin Pool) |
189 |
final_width = final_width - 15 - 8 |
|
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
190 |
what = None |
191 |
if SHOW_DESCRIPTIONS: |
|
192 |
what = test.shortDescription() |
|
193 |
if what: |
|
194 |
what = self._ellipsise_unimportant_words(what, final_width, keep_start=True) |
|
195 |
if what is None: |
|
196 |
what = test.id() |
|
197 |
if what.startswith('bzrlib.tests.'): |
|
198 |
what = what[13:] |
|
199 |
what = self._ellipsise_unimportant_words(what, final_width) |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
200 |
if self.showAll: |
|
1185.33.60
by Martin Pool
Use full terminal width for verbose test output. |
201 |
self.stream.write(what) |
|
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
202 |
elif self.dots and self.pb is not None: |
203 |
self.pb.update(what, self.testsRun - 1, None) |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
204 |
self.stream.flush() |
|
1707.2.3
by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool). |
205 |
self._recordTestStartTime() |
206 |
||
207 |
def _recordTestStartTime(self): |
|
208 |
"""Record that a test has started.""" |
|
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
209 |
self._start_time = time.time() |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
210 |
|
211 |
def addError(self, test, err): |
|
|
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
212 |
if isinstance(err[1], TestSkipped): |
213 |
return self.addSkipped(test, err) |
|
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
214 |
unittest.TestResult.addError(self, test, err) |
|
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) |
215 |
self.extractBenchmarkTime(test) |
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
216 |
if self.showAll: |
|
1707.2.3
by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool). |
217 |
self.stream.writeln("ERROR %s" % self._testTimeString()) |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
218 |
elif self.dots and self.pb is None: |
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
219 |
self.stream.write('E') |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
220 |
elif self.dots: |
|
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
221 |
self.pb.update(self._ellipsise_unimportant_words('ERROR', 13), self.testsRun, None) |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
222 |
self.stream.flush() |
|
1185.62.21
by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test. |
223 |
if self.stop_early: |
224 |
self.stop() |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
225 |
|
226 |
def addFailure(self, test, err): |
|
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
227 |
unittest.TestResult.addFailure(self, test, err) |
|
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) |
228 |
self.extractBenchmarkTime(test) |
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
229 |
if self.showAll: |
|
1707.2.3
by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool). |
230 |
self.stream.writeln(" FAIL %s" % self._testTimeString()) |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
231 |
elif self.dots and self.pb is None: |
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
232 |
self.stream.write('F') |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
233 |
elif self.dots: |
|
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
234 |
self.pb.update(self._ellipsise_unimportant_words('FAIL', 13), self.testsRun, None) |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
235 |
self.stream.flush() |
|
1185.62.21
by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test. |
236 |
if self.stop_early: |
237 |
self.stop() |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
238 |
|
239 |
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) |
240 |
self.extractBenchmarkTime(test) |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
241 |
if self.showAll: |
|
1707.2.3
by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool). |
242 |
self.stream.writeln(' OK %s' % self._testTimeString()) |
|
1728.1.3
by Robert Collins
Guard benchcalls with a getattr, and update test_selftest for the new output. |
243 |
for bench_called, stats in getattr(test, '_benchcalls', []): |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
244 |
self.stream.writeln('LSProf output for %s(%s, %s)' % bench_called) |
245 |
stats.pprint(file=self.stream) |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
246 |
elif self.dots and self.pb is None: |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
247 |
self.stream.write('~') |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
248 |
elif self.dots: |
|
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
249 |
self.pb.update(self._ellipsise_unimportant_words('OK', 13), self.testsRun, None) |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
250 |
self.stream.flush() |
251 |
unittest.TestResult.addSuccess(self, test) |
|
252 |
||
|
1185.33.96
by Martin Pool
Fix up display of reasons why tests were skipped. |
253 |
def addSkipped(self, test, skip_excinfo): |
|
1707.2.4
by Robert Collins
Teach the bzrlib TestCase to report the time take by calls to self.time as benchmark time, allowing granular reporting of time during benchmarks. See bzrlib.benchmarks.bench_add. (Robert Collins, Martin Pool) |
254 |
self.extractBenchmarkTime(test) |
|
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
255 |
if self.showAll: |
|
1707.2.3
by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool). |
256 |
print >>self.stream, ' SKIP %s' % self._testTimeString() |
|
1185.33.96
by Martin Pool
Fix up display of reasons why tests were skipped. |
257 |
print >>self.stream, ' %s' % skip_excinfo[1] |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
258 |
elif self.dots and self.pb is None: |
|
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
259 |
self.stream.write('S') |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
260 |
elif self.dots: |
|
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
261 |
self.pb.update(self._ellipsise_unimportant_words('SKIP', 13), self.testsRun, None) |
|
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
262 |
self.stream.flush() |
263 |
# seems best to treat this as success from point-of-view of unittest
|
|
264 |
# -- it actually does nothing so it barely matters :)
|
|
265 |
unittest.TestResult.addSuccess(self, test) |
|
266 |
||
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
267 |
def printErrorList(self, flavour, errors): |
268 |
for test, err in errors: |
|
269 |
self.stream.writeln(self.separator1) |
|
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
270 |
self.stream.writeln("%s: %s" % (flavour, self.getDescription(test))) |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
271 |
if getattr(test, '_get_log', None) is not None: |
|
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
272 |
print >>self.stream |
273 |
print >>self.stream, \ |
|
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
274 |
('vvvv[log from %s]' % test.id()).ljust(78,'-') |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
275 |
print >>self.stream, test._get_log() |
|
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
276 |
print >>self.stream, \ |
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
277 |
('^^^^[log from %s]' % test.id()).ljust(78,'-') |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
278 |
self.stream.writeln(self.separator2) |
279 |
self.stream.writeln("%s" % err) |
|
280 |
||
281 |
||
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
282 |
class TextTestRunner(object): |
|
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
283 |
stop_on_failure = False |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
284 |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
285 |
def __init__(self, |
286 |
stream=sys.stderr, |
|
287 |
descriptions=0, |
|
288 |
verbosity=1, |
|
289 |
keep_output=False, |
|
290 |
pb=None): |
|
291 |
self.stream = unittest._WritelnDecorator(stream) |
|
292 |
self.descriptions = descriptions |
|
293 |
self.verbosity = verbosity |
|
294 |
self.keep_output = keep_output |
|
295 |
self.pb = pb |
|
296 |
||
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
297 |
def _makeResult(self): |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
298 |
result = _MyResult(self.stream, |
299 |
self.descriptions, |
|
300 |
self.verbosity, |
|
301 |
pb=self.pb) |
|
|
1185.62.21
by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test. |
302 |
result.stop_early = self.stop_on_failure |
|
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
303 |
return result |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
304 |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
305 |
def run(self, test): |
306 |
"Run the given test case or test suite."
|
|
307 |
result = self._makeResult() |
|
308 |
startTime = time.time() |
|
309 |
if self.pb is not None: |
|
310 |
self.pb.update('Running tests', 0, test.countTestCases()) |
|
311 |
test.run(result) |
|
312 |
stopTime = time.time() |
|
313 |
timeTaken = stopTime - startTime |
|
314 |
result.printErrors() |
|
315 |
self.stream.writeln(result.separator2) |
|
316 |
run = result.testsRun |
|
317 |
self.stream.writeln("Ran %d test%s in %.3fs" % |
|
318 |
(run, run != 1 and "s" or "", timeTaken)) |
|
319 |
self.stream.writeln() |
|
320 |
if not result.wasSuccessful(): |
|
321 |
self.stream.write("FAILED (") |
|
322 |
failed, errored = map(len, (result.failures, result.errors)) |
|
323 |
if failed: |
|
324 |
self.stream.write("failures=%d" % failed) |
|
325 |
if errored: |
|
326 |
if failed: self.stream.write(", ") |
|
327 |
self.stream.write("errors=%d" % errored) |
|
328 |
self.stream.writeln(")") |
|
329 |
else: |
|
330 |
self.stream.writeln("OK") |
|
331 |
if self.pb is not None: |
|
332 |
self.pb.update('Cleaning up', 0, 1) |
|
333 |
# This is still a little bogus,
|
|
334 |
# but only a little. Folk not using our testrunner will
|
|
335 |
# have to delete their temp directories themselves.
|
|
|
1534.11.4
by Robert Collins
Merge from mainline. |
336 |
test_root = TestCaseInTempDir.TEST_ROOT |
|
1534.11.6
by Robert Collins
Adjust test-of-tests to accomodate the global state of TEST_ROOT. |
337 |
if result.wasSuccessful() or not self.keep_output: |
|
1534.11.4
by Robert Collins
Merge from mainline. |
338 |
if test_root is not None: |
|
1685.1.80
by Wouter van Heyst
more code cleanup |
339 |
# If LANG=C we probably have created some bogus paths
|
340 |
# which rmtree(unicode) will fail to delete
|
|
341 |
# so make sure we are using rmtree(str) to delete everything
|
|
|
1711.4.9
by John Arbash Meinel
In general, python on win32 needs to use the unicode os api, because bytestream stuff just doesn't work. |
342 |
# except on win32, where rmtree(str) will fail
|
343 |
# since it doesn't have the property of byte-stream paths
|
|
344 |
# (they are either ascii or mbcs)
|
|
345 |
if sys.platform == 'win32': |
|
346 |
# make sure we are using the unicode win32 api
|
|
347 |
test_root = unicode(test_root) |
|
348 |
else: |
|
349 |
test_root = test_root.encode( |
|
350 |
sys.getfilesystemencoding()) |
|
351 |
osutils.rmtree(test_root) |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
352 |
else: |
|
1534.11.6
by Robert Collins
Adjust test-of-tests to accomodate the global state of TEST_ROOT. |
353 |
if self.pb is not None: |
354 |
self.pb.note("Failed tests working directories are in '%s'\n", |
|
355 |
test_root) |
|
356 |
else: |
|
357 |
self.stream.writeln( |
|
358 |
"Failed tests working directories are in '%s'\n" % |
|
359 |
test_root) |
|
360 |
TestCaseInTempDir.TEST_ROOT = None |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
361 |
if self.pb is not None: |
362 |
self.pb.clear() |
|
363 |
return result |
|
364 |
||
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
365 |
|
|
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
366 |
def iter_suite_tests(suite): |
367 |
"""Return all tests in a suite, recursing through nested suites""" |
|
368 |
for item in suite._tests: |
|
369 |
if isinstance(item, unittest.TestCase): |
|
370 |
yield item |
|
371 |
elif isinstance(item, unittest.TestSuite): |
|
372 |
for r in iter_suite_tests(item): |
|
373 |
yield r |
|
374 |
else: |
|
375 |
raise Exception('unknown object %r inside test suite %r' |
|
376 |
% (item, suite)) |
|
377 |
||
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
378 |
|
379 |
class TestSkipped(Exception): |
|
380 |
"""Indicates that a test was intentionally skipped, rather than failing.""" |
|
381 |
# XXX: Not used yet
|
|
382 |
||
383 |
||
|
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
384 |
class CommandFailed(Exception): |
385 |
pass
|
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
386 |
|
|
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 |
387 |
|
388 |
class StringIOWrapper(object): |
|
389 |
"""A wrapper around cStringIO which just adds an encoding attribute. |
|
390 |
|
|
391 |
Internally we can check sys.stdout to see what the output encoding
|
|
392 |
should be. However, cStringIO has no encoding attribute that we can
|
|
393 |
set. So we wrap it instead.
|
|
394 |
"""
|
|
395 |
encoding='ascii' |
|
396 |
_cstring = None |
|
397 |
||
398 |
def __init__(self, s=None): |
|
399 |
if s is not None: |
|
400 |
self.__dict__['_cstring'] = StringIO(s) |
|
401 |
else: |
|
402 |
self.__dict__['_cstring'] = StringIO() |
|
403 |
||
404 |
def __getattr__(self, name, getattr=getattr): |
|
405 |
return getattr(self.__dict__['_cstring'], name) |
|
406 |
||
407 |
def __setattr__(self, name, val): |
|
408 |
if name == 'encoding': |
|
409 |
self.__dict__['encoding'] = val |
|
410 |
else: |
|
411 |
return setattr(self._cstring, name, val) |
|
412 |
||
413 |
||
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
414 |
class TestCase(unittest.TestCase): |
415 |
"""Base class for bzr unit tests. |
|
416 |
|
|
417 |
Tests that need access to disk resources should subclass
|
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
418 |
TestCaseInTempDir not TestCase.
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
419 |
|
420 |
Error and debug log messages are redirected from their usual
|
|
421 |
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. |
422 |
retrieved by _get_log(). We use a real OS file, not an in-memory object,
|
423 |
so that it can also capture file IO. When the test completes this file
|
|
424 |
is read into memory and removed from disk.
|
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
425 |
|
426 |
There are also convenience functions to invoke bzr's command-line
|
|
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
427 |
routine, and to build and check bzr trees.
|
428 |
|
|
429 |
In addition to the usual method of overriding tearDown(), this class also
|
|
430 |
allows subclasses to register functions into the _cleanups list, which is
|
|
431 |
run in order as the object is torn down. It's less likely this will be
|
|
432 |
accidentally overlooked.
|
|
433 |
"""
|
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
434 |
|
|
1185.16.14
by Martin Pool
- make TestCase._get_log work even if setup was aborted |
435 |
_log_file_name = None |
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
436 |
_log_contents = '' |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
437 |
# record lsprof data when performing benchmark calls.
|
438 |
_gather_lsprof_in_benchmarks = False |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
439 |
|
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
440 |
def __init__(self, methodName='testMethod'): |
441 |
super(TestCase, self).__init__(methodName) |
|
442 |
self._cleanups = [] |
|
443 |
||
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
444 |
def setUp(self): |
445 |
unittest.TestCase.setUp(self) |
|
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
446 |
self._cleanEnvironment() |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
447 |
bzrlib.trace.disable_default_logging() |
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
448 |
self._startLogFile() |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
449 |
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) |
450 |
self._benchtime = None |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
451 |
|
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
452 |
def _ndiff_strings(self, a, b): |
|
1185.16.67
by Martin Pool
- assertEqualDiff handles strings without trailing newline |
453 |
"""Return ndiff between two strings containing lines. |
454 |
|
|
455 |
A trailing newline is added if missing to make the strings
|
|
456 |
print properly."""
|
|
457 |
if b and b[-1] != '\n': |
|
458 |
b += '\n' |
|
459 |
if a and a[-1] != '\n': |
|
460 |
a += '\n' |
|
|
1185.16.21
by Martin Pool
- tweak diff shown by assertEqualDiff |
461 |
difflines = difflib.ndiff(a.splitlines(True), |
462 |
b.splitlines(True), |
|
463 |
linejunk=lambda x: False, |
|
464 |
charjunk=lambda x: False) |
|
465 |
return ''.join(difflines) |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
466 |
|
|
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. |
467 |
def assertEqualDiff(self, a, b, message=None): |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
468 |
"""Assert two texts are equal, if not raise an exception. |
469 |
|
|
470 |
This is intended for use with multi-line strings where it can
|
|
471 |
be hard to find the differences by eye.
|
|
472 |
"""
|
|
473 |
# TODO: perhaps override assertEquals to call this for strings?
|
|
474 |
if a == b: |
|
475 |
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. |
476 |
if message is None: |
477 |
message = "texts not equal:\n" |
|
478 |
raise AssertionError(message + |
|
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
479 |
self._ndiff_strings(a, b)) |
|
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
480 |
|
|
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. |
481 |
def assertEqualMode(self, mode, mode_test): |
482 |
self.assertEqual(mode, mode_test, |
|
483 |
'mode mismatch %o != %o' % (mode, mode_test)) |
|
484 |
||
|
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
485 |
def assertStartsWith(self, s, prefix): |
486 |
if not s.startswith(prefix): |
|
487 |
raise AssertionError('string %r does not start with %r' % (s, prefix)) |
|
488 |
||
489 |
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. |
490 |
"""Asserts that s ends with suffix.""" |
491 |
if not s.endswith(suffix): |
|
|
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
492 |
raise AssertionError('string %r does not end with %r' % (s, suffix)) |
|
1185.16.42
by Martin Pool
- Add assertContainsRe |
493 |
|
494 |
def assertContainsRe(self, haystack, needle_re): |
|
495 |
"""Assert that a contains something matching a regular expression.""" |
|
496 |
if not re.search(needle_re, haystack): |
|
497 |
raise AssertionError('pattern "%s" not found in "%s"' |
|
498 |
% (needle_re, haystack)) |
|
|
1442.1.70
by Robert Collins
Add assertFileEqual to TestCaseInTempDir. |
499 |
|
|
1185.84.3
by Aaron Bentley
Hide diffs for old revisions in bundles |
500 |
def assertNotContainsRe(self, haystack, needle_re): |
501 |
"""Assert that a does not match a regular expression""" |
|
502 |
if re.search(needle_re, haystack): |
|
503 |
raise AssertionError('pattern "%s" found in "%s"' |
|
504 |
% (needle_re, haystack)) |
|
505 |
||
|
1553.5.3
by Martin Pool
[patch] Rename TestCase.AssertSubset to assertSubset for consistency (Jan Hudec) |
506 |
def assertSubset(self, sublist, superlist): |
|
1185.46.8
by Aaron Bentley
bzr add reports ignored patterns. |
507 |
"""Assert that every entry in sublist is present in superlist.""" |
508 |
missing = [] |
|
509 |
for entry in sublist: |
|
510 |
if entry not in superlist: |
|
511 |
missing.append(entry) |
|
512 |
if len(missing) > 0: |
|
513 |
raise AssertionError("value(s) %r not present in container %r" % |
|
514 |
(missing, superlist)) |
|
515 |
||
|
1185.68.1
by Aaron Bentley
test transactions |
516 |
def assertIs(self, left, right): |
517 |
if not (left is right): |
|
518 |
raise AssertionError("%r is not %r." % (left, right)) |
|
519 |
||
|
1530.1.21
by Robert Collins
Review feedback fixes. |
520 |
def assertTransportMode(self, transport, path, mode): |
|
1530.1.17
by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible. |
521 |
"""Fail if a path does not have mode mode. |
522 |
|
|
|
1651.1.3
by Martin Pool
Use transport._can_roundtrip_unix_modebits to decide whether to check transport results |
523 |
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. |
524 |
"""
|
|
1651.1.3
by Martin Pool
Use transport._can_roundtrip_unix_modebits to decide whether to check transport results |
525 |
if not transport._can_roundtrip_unix_modebits(): |
|
1530.1.17
by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible. |
526 |
return
|
527 |
path_stat = transport.stat(path) |
|
528 |
actual_mode = stat.S_IMODE(path_stat.st_mode) |
|
529 |
self.assertEqual(mode, actual_mode, |
|
530 |
'mode of %r incorrect (%o != %o)' % (path, mode, actual_mode)) |
|
531 |
||
|
1540.3.22
by Martin Pool
[patch] Add TestCase.assertIsInstance |
532 |
def assertIsInstance(self, obj, kls): |
533 |
"""Fail if obj is not an instance of kls""" |
|
534 |
if not isinstance(obj, kls): |
|
|
1666.1.6
by Robert Collins
Make knit the default format. |
535 |
self.fail("%r is an instance of %s rather than %s" % ( |
536 |
obj, obj.__class__, kls)) |
|
|
1540.3.22
by Martin Pool
[patch] Add TestCase.assertIsInstance |
537 |
|
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
538 |
def _startLogFile(self): |
539 |
"""Send bzr and test log messages to a temporary file. |
|
540 |
||
541 |
The file is removed as the test is torn down.
|
|
542 |
"""
|
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
543 |
fileno, name = tempfile.mkstemp(suffix='.log', prefix='testbzr') |
|
1185.52.1
by James Henstridge
Don't encode unicode messages to UTF-8 in mutter() (the stream writer does it). |
544 |
encoder, decoder, stream_reader, stream_writer = codecs.lookup('UTF-8') |
545 |
self._log_file = stream_writer(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. |
546 |
self._log_nonce = bzrlib.trace.enable_test_log(self._log_file) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
547 |
self._log_file_name = name |
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
548 |
self.addCleanup(self._finishLogFile) |
549 |
||
550 |
def _finishLogFile(self): |
|
551 |
"""Finished with the log file. |
|
552 |
||
553 |
Read contents into memory, close, and delete.
|
|
554 |
"""
|
|
|
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. |
555 |
bzrlib.trace.disable_test_log(self._log_nonce) |
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
556 |
self._log_file.seek(0) |
557 |
self._log_contents = self._log_file.read() |
|
|
1185.16.122
by Martin Pool
[patch] Close test log file before deleting, needed on Windows |
558 |
self._log_file.close() |
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
559 |
os.remove(self._log_file_name) |
560 |
self._log_file = self._log_file_name = None |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
561 |
|
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
562 |
def addCleanup(self, callable): |
563 |
"""Arrange to run a callable when this case is torn down. |
|
564 |
||
565 |
Callables are run in the reverse of the order they are registered,
|
|
566 |
ie last-in first-out.
|
|
567 |
"""
|
|
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
568 |
if callable in self._cleanups: |
569 |
raise ValueError("cleanup function %r already registered on %s" |
|
570 |
% (callable, self)) |
|
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
571 |
self._cleanups.append(callable) |
572 |
||
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
573 |
def _cleanEnvironment(self): |
|
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
574 |
new_env = { |
575 |
'HOME': os.getcwd(), |
|
576 |
'APPDATA': os.getcwd(), |
|
577 |
'BZREMAIL': None, |
|
578 |
'EMAIL': None, |
|
579 |
}
|
|
|
1185.38.4
by John Arbash Meinel
Making old_env a private member |
580 |
self.__old_env = {} |
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
581 |
self.addCleanup(self._restoreEnvironment) |
|
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
582 |
for name, value in new_env.iteritems(): |
583 |
self._captureVar(name, value) |
|
584 |
||
585 |
||
586 |
def _captureVar(self, name, newvalue): |
|
587 |
"""Set an environment variable, preparing it to be reset when finished.""" |
|
|
1185.38.4
by John Arbash Meinel
Making old_env a private member |
588 |
self.__old_env[name] = os.environ.get(name, None) |
|
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
589 |
if newvalue is None: |
590 |
if name in os.environ: |
|
591 |
del os.environ[name] |
|
592 |
else: |
|
593 |
os.environ[name] = newvalue |
|
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
594 |
|
|
1185.38.2
by John Arbash Meinel
[patch] Aaron Bentley's HOME fix. |
595 |
@staticmethod
|
596 |
def _restoreVar(name, value): |
|
597 |
if value is None: |
|
|
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
598 |
if name in os.environ: |
599 |
del os.environ[name] |
|
|
1185.38.2
by John Arbash Meinel
[patch] Aaron Bentley's HOME fix. |
600 |
else: |
601 |
os.environ[name] = value |
|
602 |
||
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
603 |
def _restoreEnvironment(self): |
|
1185.38.4
by John Arbash Meinel
Making old_env a private member |
604 |
for name, value in self.__old_env.iteritems(): |
|
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
605 |
self._restoreVar(name, value) |
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
606 |
|
607 |
def tearDown(self): |
|
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
608 |
self._runCleanups() |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
609 |
unittest.TestCase.tearDown(self) |
610 |
||
|
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) |
611 |
def time(self, callable, *args, **kwargs): |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
612 |
"""Run callable and accrue the time it takes to the benchmark time. |
613 |
|
|
614 |
If lsprofiling is enabled (i.e. by --lsprof-time to bzr selftest) then
|
|
615 |
this will cause lsprofile statistics to be gathered and stored in
|
|
616 |
self._benchcalls.
|
|
617 |
"""
|
|
|
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) |
618 |
if self._benchtime is None: |
619 |
self._benchtime = 0 |
|
620 |
start = time.time() |
|
621 |
try: |
|
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
622 |
if not self._gather_lsprof_in_benchmarks: |
623 |
return callable(*args, **kwargs) |
|
624 |
else: |
|
625 |
# record this benchmark
|
|
626 |
ret, stats = bzrlib.lsprof.profile(callable, *args, **kwargs) |
|
627 |
stats.sort() |
|
628 |
self._benchcalls.append(((callable, args, kwargs), stats)) |
|
629 |
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) |
630 |
finally: |
631 |
self._benchtime += time.time() - start |
|
632 |
||
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
633 |
def _runCleanups(self): |
634 |
"""Run registered cleanup functions. |
|
635 |
||
636 |
This should only be called from TestCase.tearDown.
|
|
637 |
"""
|
|
|
1541
by Martin Pool
doc |
638 |
# TODO: Perhaps this should keep running cleanups even if
|
639 |
# one of them fails?
|
|
|
1185.33.74
by Martin Pool
pychecker cleanups |
640 |
for cleanup_fn in reversed(self._cleanups): |
641 |
cleanup_fn() |
|
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
642 |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
643 |
def log(self, *args): |
|
1185.43.1
by Martin Pool
Remove direct logging calls from selftest |
644 |
mutter(*args) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
645 |
|
646 |
def _get_log(self): |
|
647 |
"""Return as a string the log for this test""" |
|
|
1185.16.14
by Martin Pool
- make TestCase._get_log work even if setup was aborted |
648 |
if self._log_file_name: |
649 |
return open(self._log_file_name).read() |
|
650 |
else: |
|
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
651 |
return self._log_contents |
|
1185.43.1
by Martin Pool
Remove direct logging calls from selftest |
652 |
# TODO: Delete the log after it's been read in
|
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
653 |
|
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
654 |
def capture(self, cmd, retcode=0): |
|
1185.3.26
by Martin Pool
- remove remaining external executions of bzr |
655 |
"""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. |
656 |
return self.run_bzr_captured(cmd.split(), retcode=retcode)[0] |
|
1185.3.26
by Martin Pool
- remove remaining external executions of bzr |
657 |
|
|
1685.1.52
by John Arbash Meinel
[merge] bzr.dev 1704 |
658 |
def run_bzr_captured(self, argv, retcode=0, encoding=None, stdin=None): |
|
1185.22.7
by Michael Ellerman
Fix error in run_bzr_captured() doco |
659 |
"""Invoke bzr and return (stdout, stderr). |
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
660 |
|
661 |
Useful for code that wants to check the contents of the
|
|
662 |
output, the way error messages are presented, etc.
|
|
663 |
||
664 |
This should be the main method for tests that want to exercise the
|
|
665 |
overall behavior of the bzr application (rather than a unit test
|
|
666 |
or a functional test of the library.)
|
|
667 |
||
668 |
Much of the old code runs bzr by forking a new copy of Python, but
|
|
669 |
that is slower, harder to debug, and generally not necessary.
|
|
670 |
||
|
1185.3.20
by Martin Pool
- run_bzr_captured also includes logged errors in |
671 |
This runs bzr through the interface that catches and reports
|
672 |
errors, and with logging set to something approximating the
|
|
673 |
default, so that error reporting can be checked.
|
|
674 |
||
|
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 |
675 |
:param argv: arguments to invoke bzr
|
676 |
:param retcode: expected return code, or None for don't-care.
|
|
677 |
: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. |
678 |
:param stdin: A string to be used as stdin for the command.
|
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
679 |
"""
|
|
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 |
680 |
if encoding is None: |
681 |
encoding = bzrlib.user_encoding |
|
|
1687.1.2
by Robert Collins
Add stdin parameter to run_bzr and run_bzr_captured. |
682 |
if stdin is not None: |
683 |
stdin = StringIO(stdin) |
|
|
1185.85.8
by John Arbash Meinel
Adding wrapper for sys.stdout so we can set the output encoding. Adding tests that 'bzr log' handles multiple encodings properly |
684 |
stdout = StringIOWrapper() |
685 |
stderr = StringIOWrapper() |
|
686 |
stdout.encoding = encoding |
|
687 |
stderr.encoding = encoding |
|
688 |
||
|
1185.85.72
by John Arbash Meinel
Fix some of the tests. |
689 |
self.log('run bzr: %r', argv) |
|
1185.43.5
by Martin Pool
Update log message quoting |
690 |
# FIXME: don't call into logging here
|
|
1185.3.20
by Martin Pool
- run_bzr_captured also includes logged errors in |
691 |
handler = logging.StreamHandler(stderr) |
692 |
handler.setLevel(logging.INFO) |
|
693 |
logger = logging.getLogger('') |
|
694 |
logger.addHandler(handler) |
|
|
1692.3.3
by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory. |
695 |
old_ui_factory = bzrlib.ui.ui_factory |
696 |
bzrlib.ui.ui_factory = bzrlib.tests.blackbox.TestUIFactory( |
|
697 |
stdout=stdout, |
|
698 |
stderr=stderr) |
|
|
1687.1.11
by Robert Collins
Teach TestCase.run_bzr_captured about the ui factories. |
699 |
bzrlib.ui.ui_factory.stdin = stdin |
|
1185.3.20
by Martin Pool
- run_bzr_captured also includes logged errors in |
700 |
try: |
|
1687.1.2
by Robert Collins
Add stdin parameter to run_bzr and run_bzr_captured. |
701 |
result = self.apply_redirected(stdin, stdout, stderr, |
|
1185.3.20
by Martin Pool
- run_bzr_captured also includes logged errors in |
702 |
bzrlib.commands.run_bzr_catch_errors, |
703 |
argv) |
|
704 |
finally: |
|
705 |
logger.removeHandler(handler) |
|
|
1692.3.3
by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory. |
706 |
bzrlib.ui.ui_factory = old_ui_factory |
|
1685.1.69
by Wouter van Heyst
merge bzr.dev 1740 |
707 |
|
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
708 |
out = stdout.getvalue() |
709 |
err = stderr.getvalue() |
|
710 |
if out: |
|
|
1185.85.72
by John Arbash Meinel
Fix some of the tests. |
711 |
self.log('output:\n%r', out) |
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
712 |
if err: |
|
1185.85.72
by John Arbash Meinel
Fix some of the tests. |
713 |
self.log('errors:\n%r', err) |
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
714 |
if retcode is not None: |
|
1685.1.2
by John Arbash Meinel
Re-enabling the non_ascii tests after fixing trace.py, bzr ignore also does the right thing now |
715 |
self.assertEquals(retcode, result) |
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
716 |
return out, err |
717 |
||
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
718 |
def run_bzr(self, *args, **kwargs): |
|
1119
by Martin Pool
doc |
719 |
"""Invoke bzr, as if it were run from the command line. |
720 |
||
721 |
This should be the main method for tests that want to exercise the
|
|
722 |
overall behavior of the bzr application (rather than a unit test
|
|
723 |
or a functional test of the library.)
|
|
724 |
||
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
725 |
This sends the stdout/stderr results into the test's log,
|
726 |
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. |
727 |
|
728 |
:param stdin: A string to be used as stdin for the command.
|
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
729 |
"""
|
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
730 |
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 |
731 |
encoding = kwargs.pop('encoding', None) |
|
1687.1.2
by Robert Collins
Add stdin parameter to run_bzr and run_bzr_captured. |
732 |
stdin = kwargs.pop('stdin', None) |
|
1685.1.52
by John Arbash Meinel
[merge] bzr.dev 1704 |
733 |
return self.run_bzr_captured(args, retcode=retcode, encoding=encoding, stdin=stdin) |
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
734 |
|
|
1185.85.24
by John Arbash Meinel
Moved run_bzr_decode into TestCase |
735 |
def run_bzr_decode(self, *args, **kwargs): |
736 |
if kwargs.has_key('encoding'): |
|
737 |
encoding = kwargs['encoding'] |
|
738 |
else: |
|
739 |
encoding = bzrlib.user_encoding |
|
740 |
return self.run_bzr(*args, **kwargs)[0].decode(encoding) |
|
741 |
||
|
1752.1.6
by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring |
742 |
def run_bzr_subprocess(self, *args, **kwargs): |
743 |
"""Run bzr in a subprocess for testing. |
|
744 |
||
745 |
This starts a new Python interpreter and runs bzr in there.
|
|
746 |
This should only be used for tests that have a justifiable need for
|
|
747 |
this isolation: e.g. they are testing startup time, or signal
|
|
748 |
handling, or early startup code, etc. Subprocess code can't be
|
|
749 |
profiled or debugged so easily.
|
|
|
1752.1.7
by Aaron Bentley
Stop using shlex in run_bzr_subprocess |
750 |
|
751 |
:param retcode: The status code that is expected. Defaults to 0. If
|
|
752 |
None is supplied, the status code is not checked.
|
|
|
1752.1.6
by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring |
753 |
"""
|
|
1752.1.1
by Aaron Bentley
Add run_bzr_external |
754 |
bzr_path = os.path.dirname(os.path.dirname(bzrlib.__file__))+'/bzr' |
755 |
args = list(args) |
|
|
1752.1.6
by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring |
756 |
process = Popen([sys.executable, bzr_path]+args, stdout=PIPE, |
757 |
stderr=PIPE) |
|
|
1752.1.1
by Aaron Bentley
Add run_bzr_external |
758 |
out = process.stdout.read() |
759 |
err = process.stderr.read() |
|
760 |
retcode = process.wait() |
|
|
1752.1.6
by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring |
761 |
supplied_retcode = kwargs.get('retcode', 0) |
|
1752.1.1
by Aaron Bentley
Add run_bzr_external |
762 |
if supplied_retcode is not None: |
763 |
assert supplied_retcode == retcode |
|
764 |
return [out, err] |
|
765 |
||
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
766 |
def check_inventory_shape(self, inv, shape): |
|
1291
by Martin Pool
- add test for moving files between directories |
767 |
"""Compare an inventory to a list of expected names. |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
768 |
|
769 |
Fail if they are not precisely equal.
|
|
770 |
"""
|
|
771 |
extras = [] |
|
772 |
shape = list(shape) # copy |
|
773 |
for path, ie in inv.entries(): |
|
774 |
name = path.replace('\\', '/') |
|
775 |
if ie.kind == 'dir': |
|
776 |
name = name + '/' |
|
777 |
if name in shape: |
|
778 |
shape.remove(name) |
|
779 |
else: |
|
780 |
extras.append(name) |
|
781 |
if shape: |
|
782 |
self.fail("expected paths not found in inventory: %r" % shape) |
|
783 |
if extras: |
|
784 |
self.fail("unexpected paths found in inventory: %r" % extras) |
|
785 |
||
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
786 |
def apply_redirected(self, stdin=None, stdout=None, stderr=None, |
787 |
a_callable=None, *args, **kwargs): |
|
788 |
"""Call callable with redirected std io pipes. |
|
789 |
||
790 |
Returns the return code."""
|
|
791 |
if not callable(a_callable): |
|
792 |
raise ValueError("a_callable must be callable.") |
|
793 |
if stdin is None: |
|
794 |
stdin = StringIO("") |
|
795 |
if stdout is None: |
|
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
796 |
if getattr(self, "_log_file", None) is not None: |
|
974.1.70
by Aaron Bentley
Fixed selftest spewage (Brian M. Carlson) |
797 |
stdout = self._log_file |
798 |
else: |
|
799 |
stdout = StringIO() |
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
800 |
if stderr is None: |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
801 |
if getattr(self, "_log_file", None is not None): |
|
974.1.70
by Aaron Bentley
Fixed selftest spewage (Brian M. Carlson) |
802 |
stderr = self._log_file |
803 |
else: |
|
804 |
stderr = StringIO() |
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
805 |
real_stdin = sys.stdin |
806 |
real_stdout = sys.stdout |
|
807 |
real_stderr = sys.stderr |
|
808 |
try: |
|
809 |
sys.stdout = stdout |
|
810 |
sys.stderr = stderr |
|
811 |
sys.stdin = stdin |
|
|
1160
by Martin Pool
- tiny refactoring |
812 |
return a_callable(*args, **kwargs) |
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
813 |
finally: |
814 |
sys.stdout = real_stdout |
|
815 |
sys.stderr = real_stderr |
|
816 |
sys.stdin = real_stdin |
|
817 |
||
|
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
818 |
def merge(self, branch_from, wt_to): |
819 |
"""A helper for tests to do a ui-less merge. |
|
820 |
||
821 |
This should move to the main library when someone has time to integrate
|
|
822 |
it in.
|
|
823 |
"""
|
|
824 |
# minimal ui-less merge.
|
|
825 |
wt_to.branch.fetch(branch_from) |
|
826 |
base_rev = common_ancestor(branch_from.last_revision(), |
|
827 |
wt_to.branch.last_revision(), |
|
828 |
wt_to.branch.repository) |
|
829 |
merge_inner(wt_to.branch, branch_from.basis_tree(), |
|
830 |
wt_to.branch.repository.revision_tree(base_rev), |
|
831 |
this_tree=wt_to) |
|
832 |
wt_to.add_pending_merge(branch_from.last_revision()) |
|
833 |
||
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
834 |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
835 |
BzrTestBase = TestCase |
836 |
||
837 |
||
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
838 |
class TestCaseInTempDir(TestCase): |
839 |
"""Derived class that runs a test within a temporary directory. |
|
840 |
||
841 |
This is useful for tests that need to create a branch, etc.
|
|
842 |
||
843 |
The directory is created in a slightly complex way: for each
|
|
844 |
Python invocation, a new temporary top-level directory is created.
|
|
845 |
All test cases create their own directory within that. If the
|
|
846 |
tests complete successfully, the directory is removed.
|
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
847 |
|
848 |
InTempDir is an old alias for FunctionalTestCase.
|
|
849 |
"""
|
|
850 |
||
851 |
TEST_ROOT = None |
|
852 |
_TEST_NAME = 'test' |
|
853 |
OVERRIDE_PYTHON = 'python' |
|
854 |
||
855 |
def check_file_contents(self, filename, expect): |
|
856 |
self.log("check contents of file %s" % filename) |
|
857 |
contents = file(filename, 'r').read() |
|
858 |
if contents != expect: |
|
859 |
self.log("expected: %r" % expect) |
|
860 |
self.log("actually: %r" % contents) |
|
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
861 |
self.fail("contents of %s not as expected" % filename) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
862 |
|
863 |
def _make_test_root(self): |
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
864 |
if TestCaseInTempDir.TEST_ROOT is not None: |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
865 |
return
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
866 |
i = 0 |
867 |
while True: |
|
|
1185.16.147
by Martin Pool
[patch] Test base directory must be unicode (from Alexander) |
868 |
root = u'test%04d.tmp' % i |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
869 |
try: |
870 |
os.mkdir(root) |
|
871 |
except OSError, e: |
|
872 |
if e.errno == errno.EEXIST: |
|
873 |
i += 1 |
|
874 |
continue
|
|
875 |
else: |
|
876 |
raise
|
|
877 |
# successfully created
|
|
|
1185.31.37
by John Arbash Meinel
Switched os.path.abspath and os.path.realpath to osutils.* (still passes on cygwin) |
878 |
TestCaseInTempDir.TEST_ROOT = osutils.abspath(root) |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
879 |
break
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
880 |
# make a fake bzr directory there to prevent any tests propagating
|
881 |
# up onto the source directory's real branch
|
|
|
1534.1.29
by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository. |
882 |
bzrdir.BzrDir.create_standalone_workingtree(TestCaseInTempDir.TEST_ROOT) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
883 |
|
884 |
def setUp(self): |
|
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
885 |
super(TestCaseInTempDir, self).setUp() |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
886 |
self._make_test_root() |
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
887 |
_currentdir = os.getcwdu() |
|
1551.6.2
by Aaron Bentley
Added explanatory comment |
888 |
# shorten the name, to avoid test failures due to path length
|
|
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
889 |
short_id = self.id().replace('bzrlib.tests.', '') \ |
|
1551.6.3
by Aaron Bentley
Updated from dev |
890 |
.replace('__main__.', '')[-100:] |
|
1540.3.20
by Martin Pool
Construct unique test directory names even when test ids recurr |
891 |
# it's possible the same test class is run several times for
|
892 |
# parameterized tests, so make sure the names don't collide.
|
|
893 |
i = 0 |
|
894 |
while True: |
|
895 |
if i > 0: |
|
896 |
candidate_dir = '%s/%s.%d' % (self.TEST_ROOT, short_id, i) |
|
897 |
else: |
|
898 |
candidate_dir = '%s/%s' % (self.TEST_ROOT, short_id) |
|
899 |
if os.path.exists(candidate_dir): |
|
900 |
i = i + 1 |
|
901 |
continue
|
|
902 |
else: |
|
903 |
self.test_dir = candidate_dir |
|
904 |
os.mkdir(self.test_dir) |
|
905 |
os.chdir(self.test_dir) |
|
906 |
break
|
|
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
907 |
os.environ['HOME'] = self.test_dir |
|
1185.31.39
by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(), |
908 |
os.environ['APPDATA'] = self.test_dir |
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
909 |
def _leaveDirectory(): |
910 |
os.chdir(_currentdir) |
|
911 |
self.addCleanup(_leaveDirectory) |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
912 |
|
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
913 |
def build_tree(self, shape, line_endings='native', transport=None): |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
914 |
"""Build a test tree according to a pattern. |
915 |
||
916 |
shape is a sequence of file specifications. If the final
|
|
917 |
character is '/', a directory is created.
|
|
918 |
||
919 |
This doesn't add anything to a branch.
|
|
|
1185.38.7
by John Arbash Meinel
Updated build_tree to use fixed line-endings for tests which read the file contents and compare |
920 |
:param line_endings: Either 'binary' or 'native'
|
921 |
in binary mode, exact contents are written
|
|
922 |
in native mode, the line endings match the
|
|
923 |
default platform endings.
|
|
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
924 |
|
925 |
:param transport: A transport to write to, for building trees on
|
|
926 |
VFS's. If the transport is readonly or None,
|
|
927 |
"." is opened automatically.
|
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
928 |
"""
|
929 |
# XXX: It's OK to just create them using forward slashes on windows?
|
|
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
930 |
if transport is None or transport.is_readonly(): |
|
1553.5.9
by Martin Pool
Add TestCaseWithTransport.get_transport and get_readonly_transport |
931 |
transport = get_transport(".") |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
932 |
for name in shape: |
|
1185.16.145
by Martin Pool
Remove all assert statements from test cases. |
933 |
self.assert_(isinstance(name, basestring)) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
934 |
if name[-1] == '/': |
|
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
935 |
transport.mkdir(urlutils.escape(name[:-1])) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
936 |
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 |
937 |
if line_endings == 'binary': |
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
938 |
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 |
939 |
elif line_endings == 'native': |
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
940 |
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 |
941 |
else: |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
942 |
raise errors.BzrError('Invalid line ending request %r' % (line_endings,)) |
|
1185.85.76
by John Arbash Meinel
Adding an InvalidURL so transports can report they expect utf-8 quoted paths. Updated tests |
943 |
content = "contents of %s%s" % (name.encode('utf-8'), end) |
|
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
944 |
transport.put(urlutils.escape(name), StringIO(content)) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
945 |
|
|
1185.16.53
by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests |
946 |
def build_tree_contents(self, shape): |
|
1514
by Robert Collins
Unbreak self.build_tree_shape in tests. |
947 |
build_tree_contents(shape) |
|
1185.16.53
by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests |
948 |
|
|
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
949 |
def failUnlessExists(self, path): |
950 |
"""Fail unless path, which may be abs or relative, exists.""" |
|
|
1448
by Robert Collins
revert symlinks correctly |
951 |
self.failUnless(osutils.lexists(path)) |
|
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
952 |
|
953 |
def failIfExists(self, path): |
|
954 |
"""Fail if path, which may be abs or relative, exists.""" |
|
955 |
self.failIf(osutils.lexists(path)) |
|
|
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
956 |
|
|
1442.1.70
by Robert Collins
Add assertFileEqual to TestCaseInTempDir. |
957 |
def assertFileEqual(self, content, path): |
958 |
"""Fail if path does not contain 'content'.""" |
|
959 |
self.failUnless(osutils.lexists(path)) |
|
|
1685.1.31
by John Arbash Meinel
Adding tests for the rest of the _win32 functions. |
960 |
# TODO: jam 20060427 Shouldn't this be 'rb'?
|
|
1442.1.70
by Robert Collins
Add assertFileEqual to TestCaseInTempDir. |
961 |
self.assertEqualDiff(content, open(path, 'r').read()) |
|
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
962 |
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
963 |
|
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
964 |
class TestCaseWithTransport(TestCaseInTempDir): |
965 |
"""A test case that provides get_url and get_readonly_url facilities. |
|
966 |
||
967 |
These back onto two transport servers, one for readonly access and one for
|
|
968 |
read write access.
|
|
969 |
||
970 |
If no explicit class is provided for readonly access, a
|
|
971 |
ReadonlyTransportDecorator is used instead which allows the use of non disk
|
|
972 |
based read write transports.
|
|
973 |
||
974 |
If an explicit class is provided for readonly access, that server and the
|
|
975 |
readwrite one must both define get_url() as resolving to os.getcwd().
|
|
976 |
"""
|
|
977 |
||
978 |
def __init__(self, methodName='testMethod'): |
|
979 |
super(TestCaseWithTransport, self).__init__(methodName) |
|
980 |
self.__readonly_server = None |
|
981 |
self.__server = None |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
982 |
self.transport_server = default_transport |
|
1534.4.13
by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url. |
983 |
self.transport_readonly_server = None |
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
984 |
|
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
985 |
def get_readonly_url(self, relpath=None): |
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
986 |
"""Get a URL for the readonly transport. |
987 |
||
988 |
This will either be backed by '.' or a decorator to the transport
|
|
989 |
used by self.get_url()
|
|
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
990 |
relpath provides for clients to get a path relative to the base url.
|
991 |
These should only be downwards relative, not upwards.
|
|
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
992 |
"""
|
|
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. |
993 |
base = self.get_readonly_server().get_url() |
994 |
if relpath is not None: |
|
995 |
if not base.endswith('/'): |
|
996 |
base = base + '/' |
|
997 |
base = base + relpath |
|
998 |
return base |
|
999 |
||
1000 |
def get_readonly_server(self): |
|
1001 |
"""Get the server instance for the readonly transport |
|
1002 |
||
1003 |
This is useful for some tests with specific servers to do diagnostics.
|
|
1004 |
"""
|
|
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
1005 |
if self.__readonly_server is None: |
1006 |
if self.transport_readonly_server is None: |
|
1007 |
# readonly decorator requested
|
|
1008 |
# bring up the server
|
|
1009 |
self.get_url() |
|
1010 |
self.__readonly_server = ReadonlyServer() |
|
1011 |
self.__readonly_server.setUp(self.__server) |
|
1012 |
else: |
|
1013 |
self.__readonly_server = self.transport_readonly_server() |
|
1014 |
self.__readonly_server.setUp() |
|
1015 |
self.addCleanup(self.__readonly_server.tearDown) |
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
1016 |
return self.__readonly_server |
1017 |
||
1018 |
def get_server(self): |
|
1019 |
"""Get the read/write server instance. |
|
1020 |
||
1021 |
This is useful for some tests with specific servers that need
|
|
1022 |
diagnostics.
|
|
1023 |
"""
|
|
1024 |
if self.__server is None: |
|
1025 |
self.__server = self.transport_server() |
|
1026 |
self.__server.setUp() |
|
1027 |
self.addCleanup(self.__server.tearDown) |
|
1028 |
return self.__server |
|
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
1029 |
|
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
1030 |
def get_url(self, relpath=None): |
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
1031 |
"""Get a URL for the readwrite transport. |
1032 |
||
1033 |
This will either be backed by '.' or to an equivalent non-file based
|
|
1034 |
facility.
|
|
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
1035 |
relpath provides for clients to get a path relative to the base url.
|
1036 |
These should only be downwards relative, not upwards.
|
|
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
1037 |
"""
|
|
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. |
1038 |
base = self.get_server().get_url() |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1039 |
if relpath is not None and relpath != '.': |
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
1040 |
if not base.endswith('/'): |
1041 |
base = base + '/' |
|
|
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
1042 |
base = base + urlutils.escape(relpath) |
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
1043 |
return base |
1044 |
||
|
1553.5.9
by Martin Pool
Add TestCaseWithTransport.get_transport and get_readonly_transport |
1045 |
def get_transport(self): |
1046 |
"""Return a writeable transport for the test scratch space""" |
|
1047 |
t = get_transport(self.get_url()) |
|
1048 |
self.assertFalse(t.is_readonly()) |
|
1049 |
return t |
|
1050 |
||
1051 |
def get_readonly_transport(self): |
|
1052 |
"""Return a readonly transport for the test scratch space |
|
1053 |
|
|
1054 |
This can be used to test that operations which should only need
|
|
1055 |
readonly access in fact do not try to write.
|
|
1056 |
"""
|
|
1057 |
t = get_transport(self.get_readonly_url()) |
|
1058 |
self.assertTrue(t.is_readonly()) |
|
1059 |
return t |
|
1060 |
||
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
1061 |
def make_branch(self, relpath, format=None): |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1062 |
"""Create a branch on the transport at relpath.""" |
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
1063 |
repo = self.make_repository(relpath, format=format) |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1064 |
return repo.bzrdir.create_branch() |
1065 |
||
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
1066 |
def make_bzrdir(self, relpath, format=None): |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1067 |
try: |
1068 |
url = self.get_url(relpath) |
|
|
1685.1.14
by John Arbash Meinel
TestCaseWithTransport.get_url() should actually return a URL encoded path |
1069 |
mutter('relpath %r => url %r', relpath, url) |
1070 |
segments = url.split('/') |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1071 |
if segments and segments[-1] not in ('', '.'): |
|
1685.1.15
by John Arbash Meinel
We don't need to add the rest of the URL again |
1072 |
parent = '/'.join(segments[:-1]) |
|
1553.5.9
by Martin Pool
Add TestCaseWithTransport.get_transport and get_readonly_transport |
1073 |
t = get_transport(parent) |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1074 |
try: |
1075 |
t.mkdir(segments[-1]) |
|
|
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. |
1076 |
except errors.FileExists: |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1077 |
pass
|
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
1078 |
if format is None: |
1079 |
format=bzrlib.bzrdir.BzrDirFormat.get_default_format() |
|
1080 |
# FIXME: make this use a single transport someday. RBC 20060418
|
|
1081 |
return format.initialize_on_transport(get_transport(relpath)) |
|
|
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. |
1082 |
except errors.UninitializableFormat: |
|
1684.1.4
by Martin Pool
(patch) better warnings when tests are skipped (Alexander) |
1083 |
raise TestSkipped("Format %s is not initializable." % format) |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1084 |
|
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
1085 |
def make_repository(self, relpath, shared=False, format=None): |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
1086 |
"""Create a repository on our default transport at relpath.""" |
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
1087 |
made_control = self.make_bzrdir(relpath, format=format) |
|
1534.6.6
by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient. |
1088 |
return made_control.create_repository(shared=shared) |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
1089 |
|
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
1090 |
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. |
1091 |
"""Create a branch on the transport and a tree locally. |
1092 |
||
1093 |
Returns the tree.
|
|
1094 |
"""
|
|
|
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. |
1095 |
# TODO: always use the local disk path for the working tree,
|
1096 |
# this obviously requires a format that supports branch references
|
|
1097 |
# so check for that by checking bzrdir.BzrDirFormat.get_default_format()
|
|
1098 |
# RBC 20060208
|
|
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
1099 |
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. |
1100 |
try: |
1101 |
return b.bzrdir.create_workingtree() |
|
1102 |
except errors.NotLocalUrl: |
|
1103 |
# new formats - catch No tree error and create
|
|
1104 |
# a branch reference and a checkout.
|
|
1105 |
# old formats at that point - raise TestSkipped.
|
|
1106 |
# TODO: rbc 20060208
|
|
1107 |
return WorkingTreeFormat2().initialize(bzrdir.BzrDir.open(relpath)) |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1108 |
|
|
1553.5.68
by Martin Pool
Add new TestCaseWithTransport.assertIsDirectory() and tests |
1109 |
def assertIsDirectory(self, relpath, transport): |
1110 |
"""Assert that relpath within transport is a directory. |
|
1111 |
||
1112 |
This may not be possible on all transports; in that case it propagates
|
|
1113 |
a TransportNotPossible.
|
|
1114 |
"""
|
|
1115 |
try: |
|
1116 |
mode = transport.stat(relpath).st_mode |
|
1117 |
except errors.NoSuchFile: |
|
1118 |
self.fail("path %s is not a directory; no such file" |
|
1119 |
% (relpath)) |
|
1120 |
if not stat.S_ISDIR(mode): |
|
1121 |
self.fail("path %s is not a directory; has mode %#o" |
|
1122 |
% (relpath, mode)) |
|
1123 |
||
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
1124 |
|
|
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
1125 |
class ChrootedTestCase(TestCaseWithTransport): |
1126 |
"""A support class that provides readonly urls outside the local namespace. |
|
1127 |
||
1128 |
This is done by checking if self.transport_server is a MemoryServer. if it
|
|
1129 |
is then we are chrooted already, if it is not then an HttpServer is used
|
|
1130 |
for readonly urls.
|
|
1131 |
||
1132 |
TODO RBC 20060127: make this an option to TestCaseWithTransport so it can
|
|
1133 |
be used without needed to redo it when a different
|
|
1134 |
subclass is in use ?
|
|
1135 |
"""
|
|
1136 |
||
1137 |
def setUp(self): |
|
1138 |
super(ChrootedTestCase, self).setUp() |
|
1139 |
if not self.transport_server == bzrlib.transport.memory.MemoryServer: |
|
1140 |
self.transport_readonly_server = bzrlib.transport.http.HttpServer |
|
1141 |
||
1142 |
||
|
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
1143 |
def filter_suite_by_re(suite, pattern): |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
1144 |
result = TestUtil.TestSuite() |
|
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
1145 |
filter_re = re.compile(pattern) |
1146 |
for test in iter_suite_tests(suite): |
|
|
1185.1.57
by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls. |
1147 |
if filter_re.search(test.id()): |
|
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
1148 |
result.addTest(test) |
1149 |
return result |
|
1150 |
||
1151 |
||
|
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
1152 |
def run_suite(suite, name='test', verbose=False, pattern=".*", |
|
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
1153 |
stop_on_failure=False, keep_output=False, |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
1154 |
transport=None, lsprof_timed=None): |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
1155 |
TestCaseInTempDir._TEST_NAME = name |
|
1728.1.1
by Robert Collins
(rbc)Merge in benchmark --lsprof-timed lsprofiling feature. (Robert Collins, Martin Pool). |
1156 |
TestCase._gather_lsprof_in_benchmarks = lsprof_timed |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
1157 |
if verbose: |
1158 |
verbosity = 2 |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
1159 |
pb = None |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
1160 |
else: |
1161 |
verbosity = 1 |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
1162 |
pb = progress.ProgressBar() |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
1163 |
runner = TextTestRunner(stream=sys.stdout, |
1164 |
descriptions=0, |
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
1165 |
verbosity=verbosity, |
1166 |
keep_output=keep_output, |
|
1167 |
pb=pb) |
|
|
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
1168 |
runner.stop_on_failure=stop_on_failure |
|
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
1169 |
if pattern != '.*': |
1170 |
suite = filter_suite_by_re(suite, pattern) |
|
1171 |
result = runner.run(suite) |
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
1172 |
return result.wasSuccessful() |
1173 |
||
1174 |
||
|
1185.35.20
by Aaron Bentley
Only keep test failure directories if --keep-output is specified |
1175 |
def selftest(verbose=False, pattern=".*", stop_on_failure=True, |
|
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
1176 |
keep_output=False, |
|
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
1177 |
transport=None, |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
1178 |
test_suite_factory=None, |
1179 |
lsprof_timed=None): |
|
|
1204
by Martin Pool
doc |
1180 |
"""Run the whole test suite under the enhanced runner""" |
|
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. |
1181 |
global default_transport |
1182 |
if transport is None: |
|
1183 |
transport = default_transport |
|
1184 |
old_transport = default_transport |
|
1185 |
default_transport = transport |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1186 |
try: |
|
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
1187 |
if test_suite_factory is None: |
1188 |
suite = test_suite() |
|
1189 |
else: |
|
1190 |
suite = test_suite_factory() |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1191 |
return run_suite(suite, 'testbzr', verbose=verbose, pattern=pattern, |
|
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
1192 |
stop_on_failure=stop_on_failure, keep_output=keep_output, |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
1193 |
transport=transport, |
1194 |
lsprof_timed=lsprof_timed) |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1195 |
finally: |
1196 |
default_transport = old_transport |
|
1197 |
||
|
1092.1.17
by Robert Collins
remove TEST_CLASSES dead code and provide a bzrlib.test_suite() convenience method |
1198 |
|
1199 |
def test_suite(): |
|
|
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
1200 |
"""Build and return TestSuite for the whole of bzrlib. |
1201 |
|
|
1202 |
This function can be replaced if you need to change the default test
|
|
1203 |
suite on a global basis, but it is not encouraged.
|
|
1204 |
"""
|
|
|
1740.6.1
by Martin Pool
Remove Scratch objects used by doctests |
1205 |
testmod_names = [ |
|
1518
by Robert Collins
Merge from mbp. |
1206 |
'bzrlib.tests.test_ancestry', |
|
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
1207 |
'bzrlib.tests.test_api', |
|
1518
by Robert Collins
Merge from mbp. |
1208 |
'bzrlib.tests.test_bad_files', |
1209 |
'bzrlib.tests.test_branch', |
|
|
1185.82.130
by Aaron Bentley
Rename changesets to revision bundles |
1210 |
'bzrlib.tests.test_bundle', |
|
1534.4.39
by Robert Collins
Basic BzrDir support. |
1211 |
'bzrlib.tests.test_bzrdir', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1212 |
'bzrlib.tests.test_command', |
|
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
1213 |
'bzrlib.tests.test_commit', |
1214 |
'bzrlib.tests.test_commit_merge', |
|
1215 |
'bzrlib.tests.test_config', |
|
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1216 |
'bzrlib.tests.test_conflicts', |
|
1551.3.11
by Aaron Bentley
Merge from Robert |
1217 |
'bzrlib.tests.test_decorators', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1218 |
'bzrlib.tests.test_diff', |
|
1551.3.11
by Aaron Bentley
Merge from Robert |
1219 |
'bzrlib.tests.test_doc_generate', |
|
1773.2.1
by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids. |
1220 |
'bzrlib.tests.test_emptytree', |
|
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
1221 |
'bzrlib.tests.test_errors', |
|
1185.80.5
by John Arbash Meinel
Changing the escaping just a little bit. Now we can handle unicode characters. |
1222 |
'bzrlib.tests.test_escaped_store', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1223 |
'bzrlib.tests.test_fetch', |
|
1518
by Robert Collins
Merge from mbp. |
1224 |
'bzrlib.tests.test_gpg', |
1225 |
'bzrlib.tests.test_graph', |
|
1226 |
'bzrlib.tests.test_hashcache', |
|
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1227 |
'bzrlib.tests.test_http', |
|
1518
by Robert Collins
Merge from mbp. |
1228 |
'bzrlib.tests.test_identitymap', |
1229 |
'bzrlib.tests.test_inv', |
|
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1230 |
'bzrlib.tests.test_knit', |
|
1553.5.12
by Martin Pool
New LockDir locking mechanism |
1231 |
'bzrlib.tests.test_lockdir', |
|
1185.67.4
by Aaron Bentley
Throw if we try to write to a LockableFiles with no write lock |
1232 |
'bzrlib.tests.test_lockable_files', |
|
1518
by Robert Collins
Merge from mbp. |
1233 |
'bzrlib.tests.test_log', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1234 |
'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 |
1235 |
'bzrlib.tests.test_merge3', |
|
1518
by Robert Collins
Merge from mbp. |
1236 |
'bzrlib.tests.test_merge_core', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1237 |
'bzrlib.tests.test_missing', |
|
1518
by Robert Collins
Merge from mbp. |
1238 |
'bzrlib.tests.test_msgeditor', |
|
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
1239 |
'bzrlib.tests.test_nonascii', |
|
1518
by Robert Collins
Merge from mbp. |
1240 |
'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. |
1241 |
'bzrlib.tests.test_osutils', |
|
1558.15.6
by Aaron Bentley
Added more tests |
1242 |
'bzrlib.tests.test_patch', |
|
1185.82.9
by John Arbash Meinel
Moving patches testing into main test suite. |
1243 |
'bzrlib.tests.test_patches', |
|
1185.58.1
by John Arbash Meinel
Added new permissions test (currently don't pass) |
1244 |
'bzrlib.tests.test_permissions', |
|
1515
by Robert Collins
* Plugins with the same name in different directories in the bzr plugin |
1245 |
'bzrlib.tests.test_plugins', |
|
1551.2.27
by Aaron Bentley
Got propogation under test |
1246 |
'bzrlib.tests.test_progress', |
|
1570.1.11
by Robert Collins
Make reconcile work with shared repositories. |
1247 |
'bzrlib.tests.test_reconcile', |
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1248 |
'bzrlib.tests.test_repository', |
|
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
1249 |
'bzrlib.tests.test_revision', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1250 |
'bzrlib.tests.test_revisionnamespaces', |
|
1518
by Robert Collins
Merge from mbp. |
1251 |
'bzrlib.tests.test_revprops', |
|
1773.2.1
by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids. |
1252 |
'bzrlib.tests.test_revisiontree', |
|
1185.47.1
by Martin Pool
[broken] start converting basic_io to more rfc822-like format |
1253 |
'bzrlib.tests.test_rio', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1254 |
'bzrlib.tests.test_sampler', |
|
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
1255 |
'bzrlib.tests.test_selftest', |
|
1185.33.89
by Martin Pool
[patch] add a selftest test that the setup build script works (Alexander Belchenko) |
1256 |
'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. |
1257 |
'bzrlib.tests.test_sftp_transport', |
|
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
1258 |
'bzrlib.tests.test_smart_add', |
|
1522
by Robert Collins
Test for the number of uses of self.working_tree() in branch.py |
1259 |
'bzrlib.tests.test_source', |
|
1551.6.19
by Aaron Bentley
Fix pending merge status on empty trees |
1260 |
'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 |
1261 |
'bzrlib.tests.test_store', |
|
1534.2.1
by Robert Collins
Implement deprecated_method |
1262 |
'bzrlib.tests.test_symbol_versioning', |
|
1518
by Robert Collins
Merge from mbp. |
1263 |
'bzrlib.tests.test_testament', |
|
1558.15.1
by Aaron Bentley
Add text_file function |
1264 |
'bzrlib.tests.test_textfile', |
|
1551.6.7
by Aaron Bentley
Implemented two-way merge, refactored weave merge |
1265 |
'bzrlib.tests.test_textmerge', |
|
1518
by Robert Collins
Merge from mbp. |
1266 |
'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 |
1267 |
'bzrlib.tests.test_transactions', |
|
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
1268 |
'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 |
1269 |
'bzrlib.tests.test_transport', |
1270 |
'bzrlib.tests.test_tsort', |
|
|
1666.1.2
by Robert Collins
Fix race condition between end of stream and end of file with tuned_gzip. |
1271 |
'bzrlib.tests.test_tuned_gzip', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1272 |
'bzrlib.tests.test_ui', |
1273 |
'bzrlib.tests.test_upgrade', |
|
|
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
1274 |
'bzrlib.tests.test_urlutils', |
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
1275 |
'bzrlib.tests.test_versionedfile', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1276 |
'bzrlib.tests.test_weave', |
1277 |
'bzrlib.tests.test_whitebox', |
|
|
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
1278 |
'bzrlib.tests.test_workingtree', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1279 |
'bzrlib.tests.test_xml', |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1280 |
]
|
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
1281 |
test_transport_implementations = [ |
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
1282 |
'bzrlib.tests.test_transport_implementations', |
1283 |
'bzrlib.tests.test_read_bundle', |
|
1284 |
]
|
|
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
1285 |
suite = TestUtil.TestSuite() |
|
1707.2.2
by Robert Collins
Start on bench_add, an add benchtest. |
1286 |
loader = TestUtil.TestLoader() |
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
1287 |
from bzrlib.transport import TransportTestProviderAdapter |
1288 |
adapter = TransportTestProviderAdapter() |
|
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
1289 |
adapt_modules(test_transport_implementations, adapter, loader, suite) |
|
1707.2.2
by Robert Collins
Start on bench_add, an add benchtest. |
1290 |
suite.addTest(loader.loadTestsFromModuleNames(testmod_names)) |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
1291 |
for package in packages_to_test(): |
1292 |
suite.addTest(package.test_suite()) |
|
|
855
by Martin Pool
- Patch from John to allow plugins to add their own tests. |
1293 |
for m in MODULES_TO_TEST: |
|
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
1294 |
suite.addTest(loader.loadTestsFromModule(m)) |
|
1740.6.1
by Martin Pool
Remove Scratch objects used by doctests |
1295 |
for m in MODULES_TO_DOCTEST: |
1296 |
suite.addTest(doctest.DocTestSuite(m)) |
|
|
1516
by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a |
1297 |
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. |
1298 |
if getattr(plugin, 'test_suite', None) is not None: |
|
1516
by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a |
1299 |
suite.addTest(plugin.test_suite()) |
|
1092.1.17
by Robert Collins
remove TEST_CLASSES dead code and provide a bzrlib.test_suite() convenience method |
1300 |
return suite |
|
764
by Martin Pool
- log messages from a particular test are printed if that test fails |
1301 |
|
|
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
1302 |
|
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
1303 |
def adapt_modules(mods_list, adapter, loader, suite): |
1304 |
"""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. |
1305 |
for test in iter_suite_tests(loader.loadTestsFromModuleNames(mods_list)): |
1306 |
suite.addTests(adapter.adapt(test)) |