1553.5.19
by Martin Pool
Run lockdir doctests |
1 |
# Copyright (C) 2005, 2006 by Canonical Ltd
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
608
by Martin Pool
- Split selftests out into a new module and start changing them |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
608
by Martin Pool
- Split selftests out into a new module and start changing them |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
608
by Martin Pool
- Split selftests out into a new module and start changing them |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
609
by Martin Pool
- cleanup test code |
17 |
|
1535
by Martin Pool
todo idea from John |
18 |
# TODO: Perhaps there should be an API to find out if bzr running under the
|
19 |
# test suite -- some plugins might want to avoid making intrusive changes if
|
|
20 |
# this is the case. However, we want behaviour under to test to diverge as
|
|
21 |
# little as possible, so this should be used rarely if it's added at all.
|
|
22 |
# (Suggestion from j-a-meinel, 2005-11-24)
|
|
23 |
||
1553.5.68
by Martin Pool
Add new TestCaseWithTransport.assertIsDirectory() and tests |
24 |
# NOTE: Some classes in here use camelCaseNaming() rather than
|
25 |
# underscore_naming(). That's for consistency with unittest; it's not the
|
|
26 |
# general style of bzrlib. Please continue that consistency when adding e.g.
|
|
27 |
# new assertFoo() methods.
|
|
28 |
||
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 |
|
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
46 |
from bzrlib import memorytree |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
47 |
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. |
48 |
import bzrlib.bzrdir as bzrdir |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
49 |
import bzrlib.commands |
1185.82.130
by Aaron Bentley
Rename changesets to revision bundles |
50 |
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. |
51 |
import bzrlib.errors as errors |
2024.2.3
by John Arbash Meinel
Move out export tests from test_too_much, refactor |
52 |
import bzrlib.export |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
53 |
import bzrlib.inventory |
1185.67.6
by Aaron Bentley
Added tests and fixes for LockableFiles.put_utf8(); imported IterableFile |
54 |
import bzrlib.iterablefile |
1553.5.19
by Martin Pool
Run lockdir doctests |
55 |
import bzrlib.lockdir |
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
56 |
try: |
57 |
import bzrlib.lsprof |
|
58 |
except ImportError: |
|
59 |
# lsprof not available
|
|
60 |
pass
|
|
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
61 |
from bzrlib.merge import merge_inner |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
62 |
import bzrlib.merge3 |
63 |
import bzrlib.osutils |
|
64 |
import bzrlib.osutils as osutils |
|
65 |
import bzrlib.plugin |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
66 |
import bzrlib.progress as progress |
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
67 |
from bzrlib.revision import common_ancestor |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
68 |
import bzrlib.store |
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
69 |
from bzrlib import symbol_versioning |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
70 |
import bzrlib.trace |
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
71 |
from bzrlib.transport import get_transport |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
72 |
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. |
73 |
from bzrlib.transport.local import LocalRelpathServer |
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
74 |
from bzrlib.transport.readonly import ReadonlyServer |
1185.43.1
by Martin Pool
Remove direct logging calls from selftest |
75 |
from bzrlib.trace import mutter |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
76 |
from bzrlib.tests import TestUtil |
77 |
from bzrlib.tests.TestUtil import ( |
|
78 |
TestSuite, |
|
79 |
TestLoader, |
|
80 |
)
|
|
1514
by Robert Collins
Unbreak self.build_tree_shape in tests. |
81 |
from bzrlib.tests.treeshape import build_tree_contents |
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
82 |
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. |
83 |
from bzrlib.workingtree import WorkingTree, WorkingTreeFormat2 |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
84 |
|
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. |
85 |
default_transport = LocalRelpathServer |
86 |
||
855
by Martin Pool
- Patch from John to allow plugins to add their own tests. |
87 |
MODULES_TO_TEST = [] |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
88 |
MODULES_TO_DOCTEST = [ |
89 |
bzrlib.branch, |
|
1185.82.130
by Aaron Bentley
Rename changesets to revision bundles |
90 |
bzrlib.bundle.serializer, |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
91 |
bzrlib.commands, |
92 |
bzrlib.errors, |
|
2024.2.3
by John Arbash Meinel
Move out export tests from test_too_much, refactor |
93 |
bzrlib.export, |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
94 |
bzrlib.inventory, |
1185.67.6
by Aaron Bentley
Added tests and fixes for LockableFiles.put_utf8(); imported IterableFile |
95 |
bzrlib.iterablefile, |
1553.5.19
by Martin Pool
Run lockdir doctests |
96 |
bzrlib.lockdir, |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
97 |
bzrlib.merge3, |
1545.1.2
by Denys Duchier
order MODULES_TO_DOCTEST alphabetically |
98 |
bzrlib.option, |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
99 |
bzrlib.osutils, |
1910.16.2
by Andrew Bennetts
Reduce transport code duplication by creating a '_combine_paths' method to Transport. |
100 |
bzrlib.store, |
101 |
bzrlib.transport, |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
102 |
]
|
1185.82.7
by John Arbash Meinel
Adding patches.py into bzrlib, including the tests into the test suite. |
103 |
|
104 |
||
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
105 |
def packages_to_test(): |
1530.2.1
by Robert Collins
Start tests for api usage. |
106 |
"""Return a list of packages to test.
|
107 |
||
108 |
The packages are not globally imported so that import failures are
|
|
109 |
triggered when running selftest, not when importing the command.
|
|
110 |
"""
|
|
111 |
import bzrlib.doc |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
112 |
import bzrlib.tests.blackbox |
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
113 |
import bzrlib.tests.branch_implementations |
1534.4.39
by Robert Collins
Basic BzrDir support. |
114 |
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. |
115 |
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. |
116 |
import bzrlib.tests.interversionedfile_implementations |
1852.8.3
by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case. |
117 |
import bzrlib.tests.intertree_implementations |
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
118 |
import bzrlib.tests.repository_implementations |
1563.2.21
by Robert Collins
Smoke test for RevisionStore factories creating revision stores. |
119 |
import bzrlib.tests.revisionstore_implementations |
1852.6.1
by Robert Collins
Start tree implementation tests. |
120 |
import bzrlib.tests.tree_implementations |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
121 |
import bzrlib.tests.workingtree_implementations |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
122 |
return [ |
1530.2.1
by Robert Collins
Start tests for api usage. |
123 |
bzrlib.doc, |
1551.2.6
by Aaron Bentley
Restored blackbox tests [recommit] |
124 |
bzrlib.tests.blackbox, |
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
125 |
bzrlib.tests.branch_implementations, |
1534.4.39
by Robert Collins
Basic BzrDir support. |
126 |
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. |
127 |
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. |
128 |
bzrlib.tests.interversionedfile_implementations, |
1852.8.3
by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case. |
129 |
bzrlib.tests.intertree_implementations, |
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
130 |
bzrlib.tests.repository_implementations, |
1563.2.21
by Robert Collins
Smoke test for RevisionStore factories creating revision stores. |
131 |
bzrlib.tests.revisionstore_implementations, |
1852.6.1
by Robert Collins
Start tree implementation tests. |
132 |
bzrlib.tests.tree_implementations, |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
133 |
bzrlib.tests.workingtree_implementations, |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
134 |
]
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
135 |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
136 |
|
137 |
class _MyResult(unittest._TextTestResult): |
|
1185.43.2
by Martin Pool
Nicer display of verbose test results and progress |
138 |
"""Custom TestResult.
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
139 |
|
1185.33.54
by Martin Pool
[merge] test renames and other fixes (John) |
140 |
Shows output in a different format, including displaying runtime for tests.
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
141 |
"""
|
1185.62.21
by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test. |
142 |
stop_early = False |
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
143 |
|
1819.1.1
by Carl Friedrich Bolz
(lifeless, cfbolz, hpk): Give the test result object an optional benchmark |
144 |
def __init__(self, stream, descriptions, verbosity, pb=None, |
145 |
bench_history=None): |
|
1819.1.8
by Martin Pool
Improved reporting of bzrlib revision_id |
146 |
"""Construct new TestResult.
|
147 |
||
148 |
:param bench_history: Optionally, a writable file object to accumulate
|
|
149 |
benchmark results.
|
|
150 |
"""
|
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
151 |
unittest._TextTestResult.__init__(self, stream, descriptions, verbosity) |
152 |
self.pb = pb |
|
1819.1.1
by Carl Friedrich Bolz
(lifeless, cfbolz, hpk): Give the test result object an optional benchmark |
153 |
if bench_history is not None: |
1819.1.8
by Martin Pool
Improved reporting of bzrlib revision_id |
154 |
from bzrlib.version import _get_bzr_source_tree |
155 |
src_tree = _get_bzr_source_tree() |
|
156 |
if src_tree: |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
157 |
try: |
158 |
revision_id = src_tree.get_parent_ids()[0] |
|
159 |
except IndexError: |
|
160 |
# XXX: if this is a brand new tree, do the same as if there
|
|
161 |
# is no branch.
|
|
162 |
revision_id = '' |
|
1819.1.8
by Martin Pool
Improved reporting of bzrlib revision_id |
163 |
else: |
164 |
# XXX: If there's no branch, what should we do?
|
|
165 |
revision_id = '' |
|
1819.1.4
by Jan Balster
save the revison id for every benchmark run in .perf-history |
166 |
bench_history.write("--date %s %s\n" % (time.time(), revision_id)) |
1819.1.3
by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history |
167 |
self._bench_history = bench_history |
1707.2.3
by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool). |
168 |
|
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) |
169 |
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). |
170 |
"""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) |
171 |
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). |
172 |
|
173 |
def _elapsedTestTimeString(self): |
|
174 |
"""Return a time string for the overall time the current test has taken."""
|
|
175 |
return self._formatTime(time.time() - self._start_time) |
|
176 |
||
177 |
def _testTimeString(self): |
|
178 |
if self._benchmarkTime is not None: |
|
179 |
return "%s/%s" % ( |
|
180 |
self._formatTime(self._benchmarkTime), |
|
181 |
self._elapsedTestTimeString()) |
|
182 |
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) |
183 |
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). |
184 |
|
185 |
def _formatTime(self, seconds): |
|
186 |
"""Format seconds as milliseconds with leading spaces."""
|
|
187 |
return "%5dms" % (1000 * seconds) |
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
188 |
|
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
189 |
def _ellipsise_unimportant_words(self, a_string, final_width, |
190 |
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). |
191 |
"""Add ellipses (sp?) for overly long strings.
|
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
192 |
|
193 |
:param keep_start: If true preserve the start of a_string rather
|
|
194 |
than the end of it.
|
|
195 |
"""
|
|
196 |
if keep_start: |
|
197 |
if len(a_string) > final_width: |
|
198 |
result = a_string[:final_width-3] + '...' |
|
199 |
else: |
|
200 |
result = a_string |
|
201 |
else: |
|
202 |
if len(a_string) > final_width: |
|
203 |
result = '...' + a_string[3-final_width:] |
|
204 |
else: |
|
205 |
result = a_string |
|
206 |
return result.ljust(final_width) |
|
207 |
||
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
208 |
def startTest(self, test): |
209 |
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 |
210 |
# In a short description, the important words are in
|
211 |
# the beginning, but in an id, the important words are
|
|
212 |
# at the end
|
|
1185.33.54
by Martin Pool
[merge] test renames and other fixes (John) |
213 |
SHOW_DESCRIPTIONS = False |
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
214 |
|
215 |
if not self.showAll and self.dots and self.pb is not None: |
|
216 |
final_width = 13 |
|
217 |
else: |
|
218 |
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) |
219 |
final_width = final_width - 15 - 8 |
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
220 |
what = None |
221 |
if SHOW_DESCRIPTIONS: |
|
222 |
what = test.shortDescription() |
|
223 |
if what: |
|
224 |
what = self._ellipsise_unimportant_words(what, final_width, keep_start=True) |
|
225 |
if what is None: |
|
226 |
what = test.id() |
|
227 |
if what.startswith('bzrlib.tests.'): |
|
228 |
what = what[13:] |
|
229 |
what = self._ellipsise_unimportant_words(what, final_width) |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
230 |
if self.showAll: |
1185.33.60
by Martin Pool
Use full terminal width for verbose test output. |
231 |
self.stream.write(what) |
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
232 |
elif self.dots and self.pb is not None: |
233 |
self.pb.update(what, self.testsRun - 1, None) |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
234 |
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). |
235 |
self._recordTestStartTime() |
236 |
||
237 |
def _recordTestStartTime(self): |
|
238 |
"""Record that a test has started."""
|
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
239 |
self._start_time = time.time() |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
240 |
|
241 |
def addError(self, test, err): |
|
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
242 |
if isinstance(err[1], TestSkipped): |
243 |
return self.addSkipped(test, err) |
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
244 |
unittest.TestResult.addError(self, test, err) |
2027.2.1
by Marien Zwart
Make the test runner finish running if a doctest fails. |
245 |
# We can only do this if we have one of our TestCases, not if
|
246 |
# we have a doctest.
|
|
247 |
setKeepLogFile = getattr(test, 'setKeepLogFile', None) |
|
248 |
if setKeepLogFile is not None: |
|
249 |
setKeepLogfile() |
|
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) |
250 |
self.extractBenchmarkTime(test) |
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
251 |
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). |
252 |
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. |
253 |
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. |
254 |
self.stream.write('E') |
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
255 |
elif self.dots: |
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
256 |
self.pb.update(self._ellipsise_unimportant_words('ERROR', 13), self.testsRun, None) |
1864.3.1
by John Arbash Meinel
Print out when a test fails in non verbose mode, run transport tests later |
257 |
self.pb.note(self._ellipsise_unimportant_words( |
258 |
test.id() + ': ERROR', |
|
259 |
osutils.terminal_width())) |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
260 |
self.stream.flush() |
1185.62.21
by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test. |
261 |
if self.stop_early: |
262 |
self.stop() |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
263 |
|
264 |
def addFailure(self, test, err): |
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
265 |
unittest.TestResult.addFailure(self, test, err) |
2027.2.1
by Marien Zwart
Make the test runner finish running if a doctest fails. |
266 |
# We can only do this if we have one of our TestCases, not if
|
267 |
# we have a doctest.
|
|
268 |
setKeepLogFile = getattr(test, 'setKeepLogFile', None) |
|
269 |
if setKeepLogFile is not None: |
|
270 |
setKeepLogfile() |
|
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) |
271 |
self.extractBenchmarkTime(test) |
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
272 |
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). |
273 |
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. |
274 |
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. |
275 |
self.stream.write('F') |
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
276 |
elif self.dots: |
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
277 |
self.pb.update(self._ellipsise_unimportant_words('FAIL', 13), self.testsRun, None) |
1864.3.1
by John Arbash Meinel
Print out when a test fails in non verbose mode, run transport tests later |
278 |
self.pb.note(self._ellipsise_unimportant_words( |
279 |
test.id() + ': FAIL', |
|
280 |
osutils.terminal_width())) |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
281 |
self.stream.flush() |
1185.62.21
by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test. |
282 |
if self.stop_early: |
283 |
self.stop() |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
284 |
|
285 |
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) |
286 |
self.extractBenchmarkTime(test) |
1819.1.3
by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history |
287 |
if self._bench_history is not None: |
288 |
if self._benchmarkTime is not None: |
|
289 |
self._bench_history.write("%s %s\n" % ( |
|
290 |
self._formatTime(self._benchmarkTime), |
|
291 |
test.id())) |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
292 |
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). |
293 |
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. |
294 |
for bench_called, stats in getattr(test, '_benchcalls', []): |
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
295 |
self.stream.writeln('LSProf output for %s(%s, %s)' % bench_called) |
296 |
stats.pprint(file=self.stream) |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
297 |
elif self.dots and self.pb is None: |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
298 |
self.stream.write('~') |
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
299 |
elif self.dots: |
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
300 |
self.pb.update(self._ellipsise_unimportant_words('OK', 13), self.testsRun, None) |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
301 |
self.stream.flush() |
302 |
unittest.TestResult.addSuccess(self, test) |
|
303 |
||
1185.33.96
by Martin Pool
Fix up display of reasons why tests were skipped. |
304 |
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) |
305 |
self.extractBenchmarkTime(test) |
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
306 |
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). |
307 |
print >>self.stream, ' SKIP %s' % self._testTimeString() |
1185.33.96
by Martin Pool
Fix up display of reasons why tests were skipped. |
308 |
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. |
309 |
elif self.dots and self.pb is None: |
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
310 |
self.stream.write('S') |
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
311 |
elif self.dots: |
1534.11.3
by Robert Collins
Show test names and status in the progress bar. |
312 |
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. |
313 |
self.stream.flush() |
314 |
# seems best to treat this as success from point-of-view of unittest
|
|
315 |
# -- it actually does nothing so it barely matters :)
|
|
1711.7.9
by John Arbash Meinel
call tearDown() when tests are skipped |
316 |
try: |
317 |
test.tearDown() |
|
318 |
except KeyboardInterrupt: |
|
319 |
raise
|
|
320 |
except: |
|
321 |
self.addError(test, test.__exc_info()) |
|
322 |
else: |
|
323 |
unittest.TestResult.addSuccess(self, test) |
|
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
324 |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
325 |
def printErrorList(self, flavour, errors): |
326 |
for test, err in errors: |
|
327 |
self.stream.writeln(self.separator1) |
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
328 |
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. |
329 |
if getattr(test, '_get_log', None) is not None: |
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
330 |
print >>self.stream |
331 |
print >>self.stream, \ |
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
332 |
('vvvv[log from %s]' % test.id()).ljust(78,'-') |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
333 |
print >>self.stream, test._get_log() |
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
334 |
print >>self.stream, \ |
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
335 |
('^^^^[log from %s]' % test.id()).ljust(78,'-') |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
336 |
self.stream.writeln(self.separator2) |
337 |
self.stream.writeln("%s" % err) |
|
338 |
||
339 |
||
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
340 |
class TextTestRunner(object): |
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
341 |
stop_on_failure = False |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
342 |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
343 |
def __init__(self, |
344 |
stream=sys.stderr, |
|
345 |
descriptions=0, |
|
346 |
verbosity=1, |
|
347 |
keep_output=False, |
|
1819.1.2
by Carl Friedrich Bolz
(lifeless, cfbolz, hpk): Add a benchmark output parameter to TextTestRunner. |
348 |
pb=None, |
349 |
bench_history=None): |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
350 |
self.stream = unittest._WritelnDecorator(stream) |
351 |
self.descriptions = descriptions |
|
352 |
self.verbosity = verbosity |
|
353 |
self.keep_output = keep_output |
|
354 |
self.pb = pb |
|
1819.1.2
by Carl Friedrich Bolz
(lifeless, cfbolz, hpk): Add a benchmark output parameter to TextTestRunner. |
355 |
self._bench_history = bench_history |
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
356 |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
357 |
def _makeResult(self): |
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
358 |
result = _MyResult(self.stream, |
359 |
self.descriptions, |
|
360 |
self.verbosity, |
|
1819.1.2
by Carl Friedrich Bolz
(lifeless, cfbolz, hpk): Add a benchmark output parameter to TextTestRunner. |
361 |
pb=self.pb, |
362 |
bench_history=self._bench_history) |
|
1185.62.21
by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test. |
363 |
result.stop_early = self.stop_on_failure |
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
364 |
return result |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
365 |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
366 |
def run(self, test): |
367 |
"Run the given test case or test suite."
|
|
368 |
result = self._makeResult() |
|
369 |
startTime = time.time() |
|
370 |
if self.pb is not None: |
|
371 |
self.pb.update('Running tests', 0, test.countTestCases()) |
|
372 |
test.run(result) |
|
373 |
stopTime = time.time() |
|
374 |
timeTaken = stopTime - startTime |
|
375 |
result.printErrors() |
|
376 |
self.stream.writeln(result.separator2) |
|
377 |
run = result.testsRun |
|
378 |
self.stream.writeln("Ran %d test%s in %.3fs" % |
|
379 |
(run, run != 1 and "s" or "", timeTaken)) |
|
380 |
self.stream.writeln() |
|
381 |
if not result.wasSuccessful(): |
|
382 |
self.stream.write("FAILED (") |
|
383 |
failed, errored = map(len, (result.failures, result.errors)) |
|
384 |
if failed: |
|
385 |
self.stream.write("failures=%d" % failed) |
|
386 |
if errored: |
|
387 |
if failed: self.stream.write(", ") |
|
388 |
self.stream.write("errors=%d" % errored) |
|
389 |
self.stream.writeln(")") |
|
390 |
else: |
|
391 |
self.stream.writeln("OK") |
|
392 |
if self.pb is not None: |
|
393 |
self.pb.update('Cleaning up', 0, 1) |
|
394 |
# This is still a little bogus,
|
|
395 |
# but only a little. Folk not using our testrunner will
|
|
396 |
# have to delete their temp directories themselves.
|
|
1534.11.4
by Robert Collins
Merge from mainline. |
397 |
test_root = TestCaseInTempDir.TEST_ROOT |
1534.11.6
by Robert Collins
Adjust test-of-tests to accomodate the global state of TEST_ROOT. |
398 |
if result.wasSuccessful() or not self.keep_output: |
1534.11.4
by Robert Collins
Merge from mainline. |
399 |
if test_root is not None: |
1685.1.80
by Wouter van Heyst
more code cleanup |
400 |
# If LANG=C we probably have created some bogus paths
|
401 |
# which rmtree(unicode) will fail to delete
|
|
402 |
# 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. |
403 |
# except on win32, where rmtree(str) will fail
|
404 |
# since it doesn't have the property of byte-stream paths
|
|
405 |
# (they are either ascii or mbcs)
|
|
406 |
if sys.platform == 'win32': |
|
407 |
# make sure we are using the unicode win32 api
|
|
408 |
test_root = unicode(test_root) |
|
409 |
else: |
|
410 |
test_root = test_root.encode( |
|
411 |
sys.getfilesystemencoding()) |
|
412 |
osutils.rmtree(test_root) |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
413 |
else: |
1534.11.6
by Robert Collins
Adjust test-of-tests to accomodate the global state of TEST_ROOT. |
414 |
if self.pb is not None: |
415 |
self.pb.note("Failed tests working directories are in '%s'\n", |
|
416 |
test_root) |
|
417 |
else: |
|
418 |
self.stream.writeln( |
|
419 |
"Failed tests working directories are in '%s'\n" % |
|
420 |
test_root) |
|
421 |
TestCaseInTempDir.TEST_ROOT = None |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
422 |
if self.pb is not None: |
423 |
self.pb.clear() |
|
424 |
return result |
|
425 |
||
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
426 |
|
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
427 |
def iter_suite_tests(suite): |
428 |
"""Return all tests in a suite, recursing through nested suites"""
|
|
429 |
for item in suite._tests: |
|
430 |
if isinstance(item, unittest.TestCase): |
|
431 |
yield item |
|
432 |
elif isinstance(item, unittest.TestSuite): |
|
433 |
for r in iter_suite_tests(item): |
|
434 |
yield r |
|
435 |
else: |
|
436 |
raise Exception('unknown object %r inside test suite %r' |
|
437 |
% (item, suite)) |
|
438 |
||
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
439 |
|
440 |
class TestSkipped(Exception): |
|
441 |
"""Indicates that a test was intentionally skipped, rather than failing."""
|
|
442 |
||
443 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
444 |
class CommandFailed(Exception): |
445 |
pass
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
446 |
|
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 |
447 |
|
448 |
class StringIOWrapper(object): |
|
449 |
"""A wrapper around cStringIO which just adds an encoding attribute.
|
|
450 |
|
|
451 |
Internally we can check sys.stdout to see what the output encoding
|
|
452 |
should be. However, cStringIO has no encoding attribute that we can
|
|
453 |
set. So we wrap it instead.
|
|
454 |
"""
|
|
455 |
encoding='ascii' |
|
456 |
_cstring = None |
|
457 |
||
458 |
def __init__(self, s=None): |
|
459 |
if s is not None: |
|
460 |
self.__dict__['_cstring'] = StringIO(s) |
|
461 |
else: |
|
462 |
self.__dict__['_cstring'] = StringIO() |
|
463 |
||
464 |
def __getattr__(self, name, getattr=getattr): |
|
465 |
return getattr(self.__dict__['_cstring'], name) |
|
466 |
||
467 |
def __setattr__(self, name, val): |
|
468 |
if name == 'encoding': |
|
469 |
self.__dict__['encoding'] = val |
|
470 |
else: |
|
471 |
return setattr(self._cstring, name, val) |
|
472 |
||
473 |
||
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
474 |
class TestCase(unittest.TestCase): |
475 |
"""Base class for bzr unit tests.
|
|
476 |
|
|
477 |
Tests that need access to disk resources should subclass
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
478 |
TestCaseInTempDir not TestCase.
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
479 |
|
480 |
Error and debug log messages are redirected from their usual
|
|
481 |
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. |
482 |
retrieved by _get_log(). We use a real OS file, not an in-memory object,
|
483 |
so that it can also capture file IO. When the test completes this file
|
|
484 |
is read into memory and removed from disk.
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
485 |
|
486 |
There are also convenience functions to invoke bzr's command-line
|
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
487 |
routine, and to build and check bzr trees.
|
488 |
|
|
489 |
In addition to the usual method of overriding tearDown(), this class also
|
|
490 |
allows subclasses to register functions into the _cleanups list, which is
|
|
491 |
run in order as the object is torn down. It's less likely this will be
|
|
492 |
accidentally overlooked.
|
|
493 |
"""
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
494 |
|
1185.16.14
by Martin Pool
- make TestCase._get_log work even if setup was aborted |
495 |
_log_file_name = None |
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
496 |
_log_contents = '' |
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
497 |
_keep_log_file = False |
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
498 |
# record lsprof data when performing benchmark calls.
|
499 |
_gather_lsprof_in_benchmarks = False |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
500 |
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
501 |
def __init__(self, methodName='testMethod'): |
502 |
super(TestCase, self).__init__(methodName) |
|
503 |
self._cleanups = [] |
|
504 |
||
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
505 |
def setUp(self): |
506 |
unittest.TestCase.setUp(self) |
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
507 |
self._cleanEnvironment() |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
508 |
bzrlib.trace.disable_default_logging() |
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
509 |
self._startLogFile() |
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
510 |
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) |
511 |
self._benchtime = None |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
512 |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
513 |
def _ndiff_strings(self, a, b): |
1185.16.67
by Martin Pool
- assertEqualDiff handles strings without trailing newline |
514 |
"""Return ndiff between two strings containing lines.
|
515 |
|
|
516 |
A trailing newline is added if missing to make the strings
|
|
517 |
print properly."""
|
|
518 |
if b and b[-1] != '\n': |
|
519 |
b += '\n' |
|
520 |
if a and a[-1] != '\n': |
|
521 |
a += '\n' |
|
1185.16.21
by Martin Pool
- tweak diff shown by assertEqualDiff |
522 |
difflines = difflib.ndiff(a.splitlines(True), |
523 |
b.splitlines(True), |
|
524 |
linejunk=lambda x: False, |
|
525 |
charjunk=lambda x: False) |
|
526 |
return ''.join(difflines) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
527 |
|
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. |
528 |
def assertEqualDiff(self, a, b, message=None): |
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
529 |
"""Assert two texts are equal, if not raise an exception.
|
530 |
|
|
531 |
This is intended for use with multi-line strings where it can
|
|
532 |
be hard to find the differences by eye.
|
|
533 |
"""
|
|
534 |
# TODO: perhaps override assertEquals to call this for strings?
|
|
535 |
if a == b: |
|
536 |
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. |
537 |
if message is None: |
538 |
message = "texts not equal:\n" |
|
539 |
raise AssertionError(message + |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
540 |
self._ndiff_strings(a, b)) |
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
541 |
|
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. |
542 |
def assertEqualMode(self, mode, mode_test): |
543 |
self.assertEqual(mode, mode_test, |
|
544 |
'mode mismatch %o != %o' % (mode, mode_test)) |
|
545 |
||
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
546 |
def assertStartsWith(self, s, prefix): |
547 |
if not s.startswith(prefix): |
|
548 |
raise AssertionError('string %r does not start with %r' % (s, prefix)) |
|
549 |
||
550 |
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. |
551 |
"""Asserts that s ends with suffix."""
|
552 |
if not s.endswith(suffix): |
|
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
553 |
raise AssertionError('string %r does not end with %r' % (s, suffix)) |
1185.16.42
by Martin Pool
- Add assertContainsRe |
554 |
|
555 |
def assertContainsRe(self, haystack, needle_re): |
|
556 |
"""Assert that a contains something matching a regular expression."""
|
|
557 |
if not re.search(needle_re, haystack): |
|
558 |
raise AssertionError('pattern "%s" not found in "%s"' |
|
559 |
% (needle_re, haystack)) |
|
1442.1.70
by Robert Collins
Add assertFileEqual to TestCaseInTempDir. |
560 |
|
1185.84.3
by Aaron Bentley
Hide diffs for old revisions in bundles |
561 |
def assertNotContainsRe(self, haystack, needle_re): |
562 |
"""Assert that a does not match a regular expression"""
|
|
563 |
if re.search(needle_re, haystack): |
|
564 |
raise AssertionError('pattern "%s" found in "%s"' |
|
565 |
% (needle_re, haystack)) |
|
566 |
||
1553.5.3
by Martin Pool
[patch] Rename TestCase.AssertSubset to assertSubset for consistency (Jan Hudec) |
567 |
def assertSubset(self, sublist, superlist): |
1185.46.8
by Aaron Bentley
bzr add reports ignored patterns. |
568 |
"""Assert that every entry in sublist is present in superlist."""
|
569 |
missing = [] |
|
570 |
for entry in sublist: |
|
571 |
if entry not in superlist: |
|
572 |
missing.append(entry) |
|
573 |
if len(missing) > 0: |
|
574 |
raise AssertionError("value(s) %r not present in container %r" % |
|
575 |
(missing, superlist)) |
|
576 |
||
1185.68.1
by Aaron Bentley
test transactions |
577 |
def assertIs(self, left, right): |
578 |
if not (left is right): |
|
579 |
raise AssertionError("%r is not %r." % (left, right)) |
|
580 |
||
1530.1.21
by Robert Collins
Review feedback fixes. |
581 |
def assertTransportMode(self, transport, path, mode): |
1530.1.17
by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible. |
582 |
"""Fail if a path does not have mode mode.
|
583 |
|
|
1651.1.3
by Martin Pool
Use transport._can_roundtrip_unix_modebits to decide whether to check transport results |
584 |
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. |
585 |
"""
|
1651.1.3
by Martin Pool
Use transport._can_roundtrip_unix_modebits to decide whether to check transport results |
586 |
if not transport._can_roundtrip_unix_modebits(): |
1530.1.17
by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible. |
587 |
return
|
588 |
path_stat = transport.stat(path) |
|
589 |
actual_mode = stat.S_IMODE(path_stat.st_mode) |
|
590 |
self.assertEqual(mode, actual_mode, |
|
591 |
'mode of %r incorrect (%o != %o)' % (path, mode, actual_mode)) |
|
592 |
||
1540.3.22
by Martin Pool
[patch] Add TestCase.assertIsInstance |
593 |
def assertIsInstance(self, obj, kls): |
594 |
"""Fail if obj is not an instance of kls"""
|
|
595 |
if not isinstance(obj, kls): |
|
1666.1.6
by Robert Collins
Make knit the default format. |
596 |
self.fail("%r is an instance of %s rather than %s" % ( |
597 |
obj, obj.__class__, kls)) |
|
1540.3.22
by Martin Pool
[patch] Add TestCase.assertIsInstance |
598 |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
599 |
def _capture_warnings(self, a_callable, *args, **kwargs): |
600 |
"""A helper for callDeprecated and applyDeprecated.
|
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
601 |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
602 |
:param a_callable: A callable to call.
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
603 |
:param args: The positional arguments for the callable
|
604 |
:param kwargs: The keyword arguments for the callable
|
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
605 |
:return: A tuple (warnings, result). result is the result of calling
|
606 |
a_callable(*args, **kwargs).
|
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
607 |
"""
|
608 |
local_warnings = [] |
|
609 |
def capture_warnings(msg, cls, stacklevel=None): |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
610 |
# we've hooked into a deprecation specific callpath,
|
611 |
# only deprecations should getting sent via it.
|
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
612 |
self.assertEqual(cls, DeprecationWarning) |
613 |
local_warnings.append(msg) |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
614 |
original_warning_method = symbol_versioning.warn |
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
615 |
symbol_versioning.set_warning_method(capture_warnings) |
616 |
try: |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
617 |
result = a_callable(*args, **kwargs) |
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
618 |
finally: |
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
619 |
symbol_versioning.set_warning_method(original_warning_method) |
620 |
return (local_warnings, result) |
|
621 |
||
622 |
def applyDeprecated(self, deprecation_format, a_callable, *args, **kwargs): |
|
623 |
"""Call a deprecated callable without warning the user.
|
|
624 |
||
625 |
:param deprecation_format: The deprecation format that the callable
|
|
626 |
should have been deprecated with. This is the same type as the
|
|
627 |
parameter to deprecated_method/deprecated_function. If the
|
|
628 |
callable is not deprecated with this format, an assertion error
|
|
629 |
will be raised.
|
|
630 |
:param a_callable: A callable to call. This may be a bound method or
|
|
631 |
a regular function. It will be called with *args and **kwargs.
|
|
632 |
:param args: The positional arguments for the callable
|
|
633 |
:param kwargs: The keyword arguments for the callable
|
|
634 |
:return: The result of a_callable(*args, **kwargs)
|
|
635 |
"""
|
|
636 |
call_warnings, result = self._capture_warnings(a_callable, |
|
637 |
*args, **kwargs) |
|
638 |
expected_first_warning = symbol_versioning.deprecation_string( |
|
639 |
a_callable, deprecation_format) |
|
640 |
if len(call_warnings) == 0: |
|
1982.3.3
by Robert Collins
Change raise AssertionError to self.fail in the new applyDeprecated test support method. |
641 |
self.fail("No assertion generated by call to %s" % |
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
642 |
a_callable) |
643 |
self.assertEqual(expected_first_warning, call_warnings[0]) |
|
644 |
return result |
|
645 |
||
646 |
def callDeprecated(self, expected, callable, *args, **kwargs): |
|
647 |
"""Assert that a callable is deprecated in a particular way.
|
|
648 |
||
649 |
This is a very precise test for unusual requirements. The
|
|
650 |
applyDeprecated helper function is probably more suited for most tests
|
|
651 |
as it allows you to simply specify the deprecation format being used
|
|
652 |
and will ensure that that is issued for the function being called.
|
|
653 |
||
654 |
:param expected: a list of the deprecation warnings expected, in order
|
|
655 |
:param callable: The callable to call
|
|
656 |
:param args: The positional arguments for the callable
|
|
657 |
:param kwargs: The keyword arguments for the callable
|
|
658 |
"""
|
|
659 |
call_warnings, result = self._capture_warnings(callable, |
|
660 |
*args, **kwargs) |
|
661 |
self.assertEqual(expected, call_warnings) |
|
1910.2.9
by Aaron Bentley
Inroduce assertDeprecated, and use it to test old commitbuilder API |
662 |
return result |
663 |
||
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
664 |
def _startLogFile(self): |
665 |
"""Send bzr and test log messages to a temporary file.
|
|
666 |
||
667 |
The file is removed as the test is torn down.
|
|
668 |
"""
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
669 |
fileno, name = tempfile.mkstemp(suffix='.log', prefix='testbzr') |
1948.1.9
by John Arbash Meinel
Change mutter() so that it doesn't try so hard to write out perfect utf8, instead, rather than using a utf8 file, it changes unicode to utf8 manually |
670 |
self._log_file = os.fdopen(fileno, 'w+') |
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
671 |
self._log_nonce = bzrlib.trace.enable_test_log(self._log_file) |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
672 |
self._log_file_name = name |
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
673 |
self.addCleanup(self._finishLogFile) |
674 |
||
675 |
def _finishLogFile(self): |
|
676 |
"""Finished with the log file.
|
|
677 |
||
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
678 |
Close the file and delete it, unless setKeepLogfile was called.
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
679 |
"""
|
1711.7.10
by John Arbash Meinel
Nothing to clean up if self._log_file is None |
680 |
if self._log_file is None: |
681 |
return
|
|
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
682 |
bzrlib.trace.disable_test_log(self._log_nonce) |
1185.16.122
by Martin Pool
[patch] Close test log file before deleting, needed on Windows |
683 |
self._log_file.close() |
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
684 |
self._log_file = None |
685 |
if not self._keep_log_file: |
|
686 |
os.remove(self._log_file_name) |
|
687 |
self._log_file_name = None |
|
688 |
||
689 |
def setKeepLogfile(self): |
|
690 |
"""Make the logfile not be deleted when _finishLogFile is called."""
|
|
691 |
self._keep_log_file = True |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
692 |
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
693 |
def addCleanup(self, callable): |
694 |
"""Arrange to run a callable when this case is torn down.
|
|
695 |
||
696 |
Callables are run in the reverse of the order they are registered,
|
|
697 |
ie last-in first-out.
|
|
698 |
"""
|
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
699 |
if callable in self._cleanups: |
700 |
raise ValueError("cleanup function %r already registered on %s" |
|
701 |
% (callable, self)) |
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
702 |
self._cleanups.append(callable) |
703 |
||
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
704 |
def _cleanEnvironment(self): |
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
705 |
new_env = { |
706 |
'HOME': os.getcwd(), |
|
707 |
'APPDATA': os.getcwd(), |
|
1861.4.1
by Matthieu Moy
BZREMAIL renamed to BZR_EMAIL. |
708 |
'BZR_EMAIL': None, |
1912.2.1
by Adeodato Simó
Clear $BZREMAIL in tests, not only the newer $BZR_EMAIL, since the |
709 |
'BZREMAIL': None, # may still be present in the environment |
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
710 |
'EMAIL': None, |
1963.1.6
by John Arbash Meinel
Use the new helper function in a few places |
711 |
'BZR_PROGRESS_BAR': None, |
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
712 |
}
|
1185.38.4
by John Arbash Meinel
Making old_env a private member |
713 |
self.__old_env = {} |
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
714 |
self.addCleanup(self._restoreEnvironment) |
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
715 |
for name, value in new_env.iteritems(): |
716 |
self._captureVar(name, value) |
|
717 |
||
718 |
def _captureVar(self, name, newvalue): |
|
1963.1.6
by John Arbash Meinel
Use the new helper function in a few places |
719 |
"""Set an environment variable, and reset it when finished."""
|
720 |
self.__old_env[name] = osutils.set_or_unset_env(name, newvalue) |
|
1185.38.2
by John Arbash Meinel
[patch] Aaron Bentley's HOME fix. |
721 |
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
722 |
def _restoreEnvironment(self): |
1185.38.4
by John Arbash Meinel
Making old_env a private member |
723 |
for name, value in self.__old_env.iteritems(): |
1963.1.6
by John Arbash Meinel
Use the new helper function in a few places |
724 |
osutils.set_or_unset_env(name, value) |
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
725 |
|
726 |
def tearDown(self): |
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
727 |
self._runCleanups() |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
728 |
unittest.TestCase.tearDown(self) |
729 |
||
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) |
730 |
def time(self, callable, *args, **kwargs): |
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
731 |
"""Run callable and accrue the time it takes to the benchmark time.
|
732 |
|
|
733 |
If lsprofiling is enabled (i.e. by --lsprof-time to bzr selftest) then
|
|
734 |
this will cause lsprofile statistics to be gathered and stored in
|
|
735 |
self._benchcalls.
|
|
736 |
"""
|
|
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) |
737 |
if self._benchtime is None: |
738 |
self._benchtime = 0 |
|
739 |
start = time.time() |
|
740 |
try: |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
741 |
if not self._gather_lsprof_in_benchmarks: |
742 |
return callable(*args, **kwargs) |
|
743 |
else: |
|
744 |
# record this benchmark
|
|
745 |
ret, stats = bzrlib.lsprof.profile(callable, *args, **kwargs) |
|
746 |
stats.sort() |
|
747 |
self._benchcalls.append(((callable, args, kwargs), stats)) |
|
748 |
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) |
749 |
finally: |
750 |
self._benchtime += time.time() - start |
|
751 |
||
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
752 |
def _runCleanups(self): |
753 |
"""Run registered cleanup functions.
|
|
754 |
||
755 |
This should only be called from TestCase.tearDown.
|
|
756 |
"""
|
|
1541
by Martin Pool
doc |
757 |
# TODO: Perhaps this should keep running cleanups even if
|
758 |
# one of them fails?
|
|
1185.33.74
by Martin Pool
pychecker cleanups |
759 |
for cleanup_fn in reversed(self._cleanups): |
760 |
cleanup_fn() |
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
761 |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
762 |
def log(self, *args): |
1185.43.1
by Martin Pool
Remove direct logging calls from selftest |
763 |
mutter(*args) |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
764 |
|
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
765 |
def _get_log(self, keep_log_file=False): |
1927.3.3
by Carl Friedrich Bolz
Make docstring clearer. |
766 |
"""Return as a string the log for this test. If the file is still
|
767 |
on disk and keep_log_file=False, delete the log file and store the
|
|
768 |
content in self._log_contents."""
|
|
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
769 |
# flush the log file, to get all content
|
770 |
import bzrlib.trace |
|
771 |
bzrlib.trace._trace_file.flush() |
|
772 |
if self._log_contents: |
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
773 |
return self._log_contents |
1927.3.1
by Carl Friedrich Bolz
Throw away on-disk logfile when possible. |
774 |
if self._log_file_name is not None: |
775 |
logfile = open(self._log_file_name) |
|
776 |
try: |
|
777 |
log_contents = logfile.read() |
|
778 |
finally: |
|
779 |
logfile.close() |
|
780 |
if not keep_log_file: |
|
781 |
self._log_contents = log_contents |
|
782 |
os.remove(self._log_file_name) |
|
783 |
return log_contents |
|
784 |
else: |
|
785 |
return "DELETED log file to reduce memory footprint" |
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
786 |
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
787 |
def capture(self, cmd, retcode=0): |
1185.3.26
by Martin Pool
- remove remaining external executions of bzr |
788 |
"""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. |
789 |
return self.run_bzr_captured(cmd.split(), retcode=retcode)[0] |
1185.3.26
by Martin Pool
- remove remaining external executions of bzr |
790 |
|
1685.1.52
by John Arbash Meinel
[merge] bzr.dev 1704 |
791 |
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 |
792 |
"""Invoke bzr and return (stdout, stderr).
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
793 |
|
794 |
Useful for code that wants to check the contents of the
|
|
795 |
output, the way error messages are presented, etc.
|
|
796 |
||
797 |
This should be the main method for tests that want to exercise the
|
|
798 |
overall behavior of the bzr application (rather than a unit test
|
|
799 |
or a functional test of the library.)
|
|
800 |
||
801 |
Much of the old code runs bzr by forking a new copy of Python, but
|
|
802 |
that is slower, harder to debug, and generally not necessary.
|
|
803 |
||
1185.3.20
by Martin Pool
- run_bzr_captured also includes logged errors in |
804 |
This runs bzr through the interface that catches and reports
|
805 |
errors, and with logging set to something approximating the
|
|
806 |
default, so that error reporting can be checked.
|
|
807 |
||
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 |
808 |
:param argv: arguments to invoke bzr
|
809 |
:param retcode: expected return code, or None for don't-care.
|
|
810 |
: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. |
811 |
: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 |
812 |
"""
|
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 |
813 |
if encoding is None: |
814 |
encoding = bzrlib.user_encoding |
|
1687.1.2
by Robert Collins
Add stdin parameter to run_bzr and run_bzr_captured. |
815 |
if stdin is not None: |
816 |
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 |
817 |
stdout = StringIOWrapper() |
818 |
stderr = StringIOWrapper() |
|
819 |
stdout.encoding = encoding |
|
820 |
stderr.encoding = encoding |
|
821 |
||
1185.85.72
by John Arbash Meinel
Fix some of the tests. |
822 |
self.log('run bzr: %r', argv) |
1185.43.5
by Martin Pool
Update log message quoting |
823 |
# FIXME: don't call into logging here
|
1185.3.20
by Martin Pool
- run_bzr_captured also includes logged errors in |
824 |
handler = logging.StreamHandler(stderr) |
825 |
handler.setLevel(logging.INFO) |
|
826 |
logger = logging.getLogger('') |
|
827 |
logger.addHandler(handler) |
|
1692.3.3
by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory. |
828 |
old_ui_factory = bzrlib.ui.ui_factory |
829 |
bzrlib.ui.ui_factory = bzrlib.tests.blackbox.TestUIFactory( |
|
830 |
stdout=stdout, |
|
831 |
stderr=stderr) |
|
1687.1.11
by Robert Collins
Teach TestCase.run_bzr_captured about the ui factories. |
832 |
bzrlib.ui.ui_factory.stdin = stdin |
1185.3.20
by Martin Pool
- run_bzr_captured also includes logged errors in |
833 |
try: |
1687.1.2
by Robert Collins
Add stdin parameter to run_bzr and run_bzr_captured. |
834 |
result = self.apply_redirected(stdin, stdout, stderr, |
1185.3.20
by Martin Pool
- run_bzr_captured also includes logged errors in |
835 |
bzrlib.commands.run_bzr_catch_errors, |
836 |
argv) |
|
837 |
finally: |
|
838 |
logger.removeHandler(handler) |
|
1692.3.3
by Robert Collins
Get run_bzr in tests to always assign a new, clean ui factory. |
839 |
bzrlib.ui.ui_factory = old_ui_factory |
1685.1.69
by Wouter van Heyst
merge bzr.dev 1740 |
840 |
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
841 |
out = stdout.getvalue() |
842 |
err = stderr.getvalue() |
|
843 |
if out: |
|
1185.85.72
by John Arbash Meinel
Fix some of the tests. |
844 |
self.log('output:\n%r', out) |
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
845 |
if err: |
1185.85.72
by John Arbash Meinel
Fix some of the tests. |
846 |
self.log('errors:\n%r', err) |
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
847 |
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 |
848 |
self.assertEquals(retcode, result) |
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
849 |
return out, err |
850 |
||
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
851 |
def run_bzr(self, *args, **kwargs): |
1119
by Martin Pool
doc |
852 |
"""Invoke bzr, as if it were run from the command line.
|
853 |
||
854 |
This should be the main method for tests that want to exercise the
|
|
855 |
overall behavior of the bzr application (rather than a unit test
|
|
856 |
or a functional test of the library.)
|
|
857 |
||
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
858 |
This sends the stdout/stderr results into the test's log,
|
859 |
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. |
860 |
|
861 |
: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 |
862 |
"""
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
863 |
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 |
864 |
encoding = kwargs.pop('encoding', None) |
1687.1.2
by Robert Collins
Add stdin parameter to run_bzr and run_bzr_captured. |
865 |
stdin = kwargs.pop('stdin', None) |
1685.1.52
by John Arbash Meinel
[merge] bzr.dev 1704 |
866 |
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 |
867 |
|
1185.85.24
by John Arbash Meinel
Moved run_bzr_decode into TestCase |
868 |
def run_bzr_decode(self, *args, **kwargs): |
1963.2.1
by Robey Pointer
remove usage of has_key() |
869 |
if 'encoding' in kwargs: |
1185.85.24
by John Arbash Meinel
Moved run_bzr_decode into TestCase |
870 |
encoding = kwargs['encoding'] |
871 |
else: |
|
872 |
encoding = bzrlib.user_encoding |
|
873 |
return self.run_bzr(*args, **kwargs)[0].decode(encoding) |
|
874 |
||
1711.2.70
by John Arbash Meinel
Add run_bzr_errors alongside run_bzr, to make it easy to check the right error is occurring. |
875 |
def run_bzr_error(self, error_regexes, *args, **kwargs): |
1711.2.71
by John Arbash Meinel
Default to retcode=3, and add a test for run_bzr_error |
876 |
"""Run bzr, and check that stderr contains the supplied regexes
|
877 |
|
|
1711.7.11
by John Arbash Meinel
Clean up the documentation for run_bzr_error on Martin's suggestion. |
878 |
:param error_regexes: Sequence of regular expressions which
|
879 |
must each be found in the error output. The relative ordering
|
|
880 |
is not enforced.
|
|
881 |
:param args: command-line arguments for bzr
|
|
882 |
:param kwargs: Keyword arguments which are interpreted by run_bzr
|
|
883 |
This function changes the default value of retcode to be 3,
|
|
884 |
since in most cases this is run when you expect bzr to fail.
|
|
1711.2.71
by John Arbash Meinel
Default to retcode=3, and add a test for run_bzr_error |
885 |
:return: (out, err) The actual output of running the command (in case you
|
886 |
want to do more inspection)
|
|
1711.7.11
by John Arbash Meinel
Clean up the documentation for run_bzr_error on Martin's suggestion. |
887 |
|
888 |
Examples of use:
|
|
889 |
# Make sure that commit is failing because there is nothing to do
|
|
890 |
self.run_bzr_error(['no changes to commit'],
|
|
891 |
'commit', '-m', 'my commit comment')
|
|
892 |
# Make sure --strict is handling an unknown file, rather than
|
|
893 |
# giving us the 'nothing to do' error
|
|
894 |
self.build_tree(['unknown'])
|
|
895 |
self.run_bzr_error(['Commit refused because there are unknown files'],
|
|
896 |
'commit', '--strict', '-m', 'my commit comment')
|
|
1711.2.71
by John Arbash Meinel
Default to retcode=3, and add a test for run_bzr_error |
897 |
"""
|
898 |
kwargs.setdefault('retcode', 3) |
|
1711.2.70
by John Arbash Meinel
Add run_bzr_errors alongside run_bzr, to make it easy to check the right error is occurring. |
899 |
out, err = self.run_bzr(*args, **kwargs) |
900 |
for regex in error_regexes: |
|
901 |
self.assertContainsRe(err, regex) |
|
1711.2.71
by John Arbash Meinel
Default to retcode=3, and add a test for run_bzr_error |
902 |
return out, err |
1711.2.70
by John Arbash Meinel
Add run_bzr_errors alongside run_bzr, to make it easy to check the right error is occurring. |
903 |
|
1752.1.6
by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring |
904 |
def run_bzr_subprocess(self, *args, **kwargs): |
905 |
"""Run bzr in a subprocess for testing.
|
|
906 |
||
907 |
This starts a new Python interpreter and runs bzr in there.
|
|
908 |
This should only be used for tests that have a justifiable need for
|
|
909 |
this isolation: e.g. they are testing startup time, or signal
|
|
910 |
handling, or early startup code, etc. Subprocess code can't be
|
|
911 |
profiled or debugged so easily.
|
|
1752.1.7
by Aaron Bentley
Stop using shlex in run_bzr_subprocess |
912 |
|
913 |
:param retcode: The status code that is expected. Defaults to 0. If
|
|
1963.1.1
by John Arbash Meinel
run_bzr_subprocess() can take an env_changes parameter |
914 |
None is supplied, the status code is not checked.
|
915 |
:param env_changes: A dictionary which lists changes to environment
|
|
916 |
variables. A value of None will unset the env variable.
|
|
917 |
The values must be strings. The change will only occur in the
|
|
918 |
child, so you don't need to fix the environment after running.
|
|
1963.1.11
by John Arbash Meinel
Add a universal_newlines flag to run_bzr_subprocess, so we can be line-ending independent for tests |
919 |
:param universal_newlines: Convert CRLF => LF
|
1752.1.6
by Aaron Bentley
Rename run_bzr_external -> run_bzr_subprocess, add docstring |
920 |
"""
|
1963.1.2
by John Arbash Meinel
Cleanups suggested by Martin, add test that env_changes can remove an env variable |
921 |
env_changes = kwargs.get('env_changes', {}) |
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
922 |
process = self.start_bzr_subprocess(args, env_changes=env_changes) |
923 |
# We distinguish between retcode=None and retcode not passed.
|
|
924 |
supplied_retcode = kwargs.get('retcode', 0) |
|
925 |
return self.finish_bzr_subprocess(process, retcode=supplied_retcode, |
|
926 |
universal_newlines=kwargs.get('universal_newlines', False), |
|
927 |
process_args=args) |
|
928 |
||
1910.17.9
by Andrew Bennetts
Add skip_if_plan_to_signal flag to start_bzr_subprocess. |
929 |
def start_bzr_subprocess(self, process_args, env_changes=None, |
930 |
skip_if_plan_to_signal=False): |
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
931 |
"""Start bzr in a subprocess for testing.
|
932 |
||
933 |
This starts a new Python interpreter and runs bzr in there.
|
|
934 |
This should only be used for tests that have a justifiable need for
|
|
935 |
this isolation: e.g. they are testing startup time, or signal
|
|
936 |
handling, or early startup code, etc. Subprocess code can't be
|
|
937 |
profiled or debugged so easily.
|
|
938 |
||
939 |
:param process_args: a list of arguments to pass to the bzr executable,
|
|
940 |
for example `['--version']`.
|
|
941 |
:param env_changes: A dictionary which lists changes to environment
|
|
942 |
variables. A value of None will unset the env variable.
|
|
943 |
The values must be strings. The change will only occur in the
|
|
944 |
child, so you don't need to fix the environment after running.
|
|
1910.17.9
by Andrew Bennetts
Add skip_if_plan_to_signal flag to start_bzr_subprocess. |
945 |
:param skip_if_plan_to_signal: raise TestSkipped when true and os.kill
|
946 |
is not available.
|
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
947 |
|
948 |
:returns: Popen object for the started process.
|
|
949 |
"""
|
|
1910.17.9
by Andrew Bennetts
Add skip_if_plan_to_signal flag to start_bzr_subprocess. |
950 |
if skip_if_plan_to_signal: |
951 |
if not getattr(os, 'kill', None): |
|
952 |
raise TestSkipped("os.kill not available.") |
|
953 |
||
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
954 |
if env_changes is None: |
955 |
env_changes = {} |
|
1963.1.7
by John Arbash Meinel
Switch to directly setting the env, and cleaning it up. So that it works on all platforms |
956 |
old_env = {} |
957 |
||
1963.1.2
by John Arbash Meinel
Cleanups suggested by Martin, add test that env_changes can remove an env variable |
958 |
def cleanup_environment(): |
959 |
for env_var, value in env_changes.iteritems(): |
|
1963.1.7
by John Arbash Meinel
Switch to directly setting the env, and cleaning it up. So that it works on all platforms |
960 |
old_env[env_var] = osutils.set_or_unset_env(env_var, value) |
961 |
||
962 |
def restore_environment(): |
|
963 |
for env_var, value in old_env.iteritems(): |
|
964 |
osutils.set_or_unset_env(env_var, value) |
|
1963.1.1
by John Arbash Meinel
run_bzr_subprocess() can take an env_changes parameter |
965 |
|
2018.1.1
by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths). |
966 |
bzr_path = self.get_bzr_path() |
1963.1.7
by John Arbash Meinel
Switch to directly setting the env, and cleaning it up. So that it works on all platforms |
967 |
|
968 |
try: |
|
969 |
# win32 subprocess doesn't support preexec_fn
|
|
970 |
# so we will avoid using it on all platforms, just to
|
|
971 |
# make sure the code path is used, and we don't break on win32
|
|
972 |
cleanup_environment() |
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
973 |
process = Popen([sys.executable, bzr_path] + list(process_args), |
1910.19.11
by Andrew Bennetts
General code cleanup based on review comments and other observations. |
974 |
stdin=PIPE, stdout=PIPE, stderr=PIPE) |
1963.1.7
by John Arbash Meinel
Switch to directly setting the env, and cleaning it up. So that it works on all platforms |
975 |
finally: |
976 |
restore_environment() |
|
1910.17.2
by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue |
977 |
return process |
978 |
||
2018.1.1
by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths). |
979 |
def get_bzr_path(self): |
2018.1.9
by Andrew Bennetts
Implement ParamikoVendor.connect_ssh |
980 |
"""Return the path of the 'bzr' executable for this test suite."""
|
2018.1.1
by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths). |
981 |
bzr_path = os.path.dirname(os.path.dirname(bzrlib.__file__))+'/bzr' |
982 |
if not os.path.isfile(bzr_path): |
|
983 |
# We are probably installed. Assume sys.argv is the right file
|
|
984 |
bzr_path = sys.argv[0] |
|
985 |
return bzr_path |
|
986 |
||
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
987 |
def finish_bzr_subprocess(self, process, retcode=0, send_signal=None, |
988 |
universal_newlines=False, process_args=None): |
|
1910.17.2
by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue |
989 |
"""Finish the execution of process.
|
990 |
||
991 |
:param process: the Popen object returned from start_bzr_subprocess.
|
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
992 |
:param retcode: The status code that is expected. Defaults to 0. If
|
993 |
None is supplied, the status code is not checked.
|
|
1910.17.2
by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue |
994 |
:param send_signal: an optional signal to send to the process.
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
995 |
:param universal_newlines: Convert CRLF => LF
|
1910.17.2
by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue |
996 |
:returns: (stdout, stderr)
|
997 |
"""
|
|
998 |
if send_signal is not None: |
|
999 |
os.kill(process.pid, send_signal) |
|
1910.17.8
by Andrew Bennetts
Refactor run_bzr_subprocess to use start_bzr_subprocess and finish_bzr_subprocess. |
1000 |
out, err = process.communicate() |
1001 |
||
1002 |
if universal_newlines: |
|
1003 |
out = out.replace('\r\n', '\n') |
|
1004 |
err = err.replace('\r\n', '\n') |
|
1005 |
||
1006 |
if retcode is not None and retcode != process.returncode: |
|
1007 |
if process_args is None: |
|
1008 |
process_args = "(unknown args)" |
|
1009 |
mutter('Output of bzr %s:\n%s', process_args, out) |
|
1010 |
mutter('Error for bzr %s:\n%s', process_args, err) |
|
1011 |
self.fail('Command bzr %s failed with retcode %s != %s' |
|
1012 |
% (process_args, retcode, process.returncode)) |
|
1013 |
return [out, err] |
|
1910.17.2
by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue |
1014 |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1015 |
def check_inventory_shape(self, inv, shape): |
1291
by Martin Pool
- add test for moving files between directories |
1016 |
"""Compare an inventory to a list of expected names.
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1017 |
|
1018 |
Fail if they are not precisely equal.
|
|
1019 |
"""
|
|
1020 |
extras = [] |
|
1021 |
shape = list(shape) # copy |
|
1022 |
for path, ie in inv.entries(): |
|
1023 |
name = path.replace('\\', '/') |
|
1024 |
if ie.kind == 'dir': |
|
1025 |
name = name + '/' |
|
1026 |
if name in shape: |
|
1027 |
shape.remove(name) |
|
1028 |
else: |
|
1029 |
extras.append(name) |
|
1030 |
if shape: |
|
1031 |
self.fail("expected paths not found in inventory: %r" % shape) |
|
1032 |
if extras: |
|
1033 |
self.fail("unexpected paths found in inventory: %r" % extras) |
|
1034 |
||
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
1035 |
def apply_redirected(self, stdin=None, stdout=None, stderr=None, |
1036 |
a_callable=None, *args, **kwargs): |
|
1037 |
"""Call callable with redirected std io pipes.
|
|
1038 |
||
1039 |
Returns the return code."""
|
|
1040 |
if not callable(a_callable): |
|
1041 |
raise ValueError("a_callable must be callable.") |
|
1042 |
if stdin is None: |
|
1043 |
stdin = StringIO("") |
|
1044 |
if stdout is None: |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
1045 |
if getattr(self, "_log_file", None) is not None: |
974.1.70
by Aaron Bentley
Fixed selftest spewage (Brian M. Carlson) |
1046 |
stdout = self._log_file |
1047 |
else: |
|
1048 |
stdout = StringIO() |
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
1049 |
if stderr is None: |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
1050 |
if getattr(self, "_log_file", None is not None): |
974.1.70
by Aaron Bentley
Fixed selftest spewage (Brian M. Carlson) |
1051 |
stderr = self._log_file |
1052 |
else: |
|
1053 |
stderr = StringIO() |
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
1054 |
real_stdin = sys.stdin |
1055 |
real_stdout = sys.stdout |
|
1056 |
real_stderr = sys.stderr |
|
1057 |
try: |
|
1058 |
sys.stdout = stdout |
|
1059 |
sys.stderr = stderr |
|
1060 |
sys.stdin = stdin |
|
1160
by Martin Pool
- tiny refactoring |
1061 |
return a_callable(*args, **kwargs) |
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
1062 |
finally: |
1063 |
sys.stdout = real_stdout |
|
1064 |
sys.stderr = real_stderr |
|
1065 |
sys.stdin = real_stdin |
|
1066 |
||
1979.2.1
by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree. |
1067 |
@symbol_versioning.deprecated_method(symbol_versioning.zero_eleven) |
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
1068 |
def merge(self, branch_from, wt_to): |
1069 |
"""A helper for tests to do a ui-less merge.
|
|
1070 |
||
1071 |
This should move to the main library when someone has time to integrate
|
|
1072 |
it in.
|
|
1073 |
"""
|
|
1074 |
# minimal ui-less merge.
|
|
1075 |
wt_to.branch.fetch(branch_from) |
|
1076 |
base_rev = common_ancestor(branch_from.last_revision(), |
|
1077 |
wt_to.branch.last_revision(), |
|
1078 |
wt_to.branch.repository) |
|
1908.6.7
by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly. |
1079 |
merge_inner(wt_to.branch, branch_from.basis_tree(), |
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
1080 |
wt_to.branch.repository.revision_tree(base_rev), |
1081 |
this_tree=wt_to) |
|
1908.6.7
by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly. |
1082 |
wt_to.add_parent_tree_id(branch_from.last_revision()) |
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
1083 |
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
1084 |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1085 |
BzrTestBase = TestCase |
1086 |
||
1087 |
||
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
1088 |
class TestCaseInTempDir(TestCase): |
1089 |
"""Derived class that runs a test within a temporary directory.
|
|
1090 |
||
1091 |
This is useful for tests that need to create a branch, etc.
|
|
1092 |
||
1093 |
The directory is created in a slightly complex way: for each
|
|
1094 |
Python invocation, a new temporary top-level directory is created.
|
|
1095 |
All test cases create their own directory within that. If the
|
|
1096 |
tests complete successfully, the directory is removed.
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1097 |
|
1098 |
InTempDir is an old alias for FunctionalTestCase.
|
|
1099 |
"""
|
|
1100 |
||
1101 |
TEST_ROOT = None |
|
1102 |
_TEST_NAME = 'test' |
|
1103 |
OVERRIDE_PYTHON = 'python' |
|
1104 |
||
1105 |
def check_file_contents(self, filename, expect): |
|
1106 |
self.log("check contents of file %s" % filename) |
|
1107 |
contents = file(filename, 'r').read() |
|
1108 |
if contents != expect: |
|
1109 |
self.log("expected: %r" % expect) |
|
1110 |
self.log("actually: %r" % contents) |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
1111 |
self.fail("contents of %s not as expected" % filename) |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1112 |
|
1113 |
def _make_test_root(self): |
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
1114 |
if TestCaseInTempDir.TEST_ROOT is not None: |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1115 |
return
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
1116 |
i = 0 |
1117 |
while True: |
|
1185.16.147
by Martin Pool
[patch] Test base directory must be unicode (from Alexander) |
1118 |
root = u'test%04d.tmp' % i |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
1119 |
try: |
1120 |
os.mkdir(root) |
|
1121 |
except OSError, e: |
|
1122 |
if e.errno == errno.EEXIST: |
|
1123 |
i += 1 |
|
1124 |
continue
|
|
1125 |
else: |
|
1126 |
raise
|
|
1127 |
# successfully created
|
|
1185.31.37
by John Arbash Meinel
Switched os.path.abspath and os.path.realpath to osutils.* (still passes on cygwin) |
1128 |
TestCaseInTempDir.TEST_ROOT = osutils.abspath(root) |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
1129 |
break
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1130 |
# make a fake bzr directory there to prevent any tests propagating
|
1131 |
# 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. |
1132 |
bzrdir.BzrDir.create_standalone_workingtree(TestCaseInTempDir.TEST_ROOT) |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1133 |
|
1134 |
def setUp(self): |
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
1135 |
super(TestCaseInTempDir, self).setUp() |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1136 |
self._make_test_root() |
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
1137 |
_currentdir = os.getcwdu() |
1551.6.2
by Aaron Bentley
Added explanatory comment |
1138 |
# 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 |
1139 |
short_id = self.id().replace('bzrlib.tests.', '') \ |
1551.6.3
by Aaron Bentley
Updated from dev |
1140 |
.replace('__main__.', '')[-100:] |
1540.3.20
by Martin Pool
Construct unique test directory names even when test ids recurr |
1141 |
# it's possible the same test class is run several times for
|
1142 |
# parameterized tests, so make sure the names don't collide.
|
|
1143 |
i = 0 |
|
1144 |
while True: |
|
1145 |
if i > 0: |
|
1146 |
candidate_dir = '%s/%s.%d' % (self.TEST_ROOT, short_id, i) |
|
1147 |
else: |
|
1148 |
candidate_dir = '%s/%s' % (self.TEST_ROOT, short_id) |
|
1149 |
if os.path.exists(candidate_dir): |
|
1150 |
i = i + 1 |
|
1151 |
continue
|
|
1152 |
else: |
|
1987.1.1
by John Arbash Meinel
Update the test suite to put HOME in a different directory |
1153 |
os.mkdir(candidate_dir) |
1154 |
self.test_home_dir = candidate_dir + '/home' |
|
1155 |
os.mkdir(self.test_home_dir) |
|
1156 |
self.test_dir = candidate_dir + '/work' |
|
1540.3.20
by Martin Pool
Construct unique test directory names even when test ids recurr |
1157 |
os.mkdir(self.test_dir) |
1158 |
os.chdir(self.test_dir) |
|
1159 |
break
|
|
1987.1.1
by John Arbash Meinel
Update the test suite to put HOME in a different directory |
1160 |
os.environ['HOME'] = self.test_home_dir |
1161 |
os.environ['APPDATA'] = self.test_home_dir |
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
1162 |
def _leaveDirectory(): |
1163 |
os.chdir(_currentdir) |
|
1164 |
self.addCleanup(_leaveDirectory) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1165 |
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
1166 |
def build_tree(self, shape, line_endings='native', transport=None): |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1167 |
"""Build a test tree according to a pattern.
|
1168 |
||
1169 |
shape is a sequence of file specifications. If the final
|
|
1170 |
character is '/', a directory is created.
|
|
1171 |
||
1755.3.1
by Robert Collins
Tune the time to build our kernel_like tree : make LocalTransport.put faster, AtomicFile faster, LocalTransport.append faster. |
1172 |
This assumes that all the elements in the tree being built are new.
|
1173 |
||
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1174 |
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 |
1175 |
:param line_endings: Either 'binary' or 'native'
|
1176 |
in binary mode, exact contents are written
|
|
1177 |
in native mode, the line endings match the
|
|
1178 |
default platform endings.
|
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
1179 |
|
1180 |
:param transport: A transport to write to, for building trees on
|
|
1181 |
VFS's. If the transport is readonly or None,
|
|
1182 |
"." is opened automatically.
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1183 |
"""
|
1755.3.1
by Robert Collins
Tune the time to build our kernel_like tree : make LocalTransport.put faster, AtomicFile faster, LocalTransport.append faster. |
1184 |
# It's OK to just create them using forward slashes on windows.
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
1185 |
if transport is None or transport.is_readonly(): |
1553.5.9
by Martin Pool
Add TestCaseWithTransport.get_transport and get_readonly_transport |
1186 |
transport = get_transport(".") |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1187 |
for name in shape: |
1185.16.145
by Martin Pool
Remove all assert statements from test cases. |
1188 |
self.assert_(isinstance(name, basestring)) |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1189 |
if name[-1] == '/': |
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
1190 |
transport.mkdir(urlutils.escape(name[:-1])) |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1191 |
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 |
1192 |
if line_endings == 'binary': |
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
1193 |
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 |
1194 |
elif line_endings == 'native': |
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
1195 |
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 |
1196 |
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. |
1197 |
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 |
1198 |
content = "contents of %s%s" % (name.encode('utf-8'), end) |
1755.3.8
by John Arbash Meinel
Fix comments about why we do the things we do |
1199 |
# Technically 'put()' is the right command. However, put
|
1200 |
# uses an AtomicFile, which requires an extra rename into place
|
|
1201 |
# As long as the files didn't exist in the past, append() will
|
|
1202 |
# do the same thing as put()
|
|
1203 |
# On jam's machine, make_kernel_like_tree is:
|
|
1755.3.10
by John Arbash Meinel
Update the timing stats |
1204 |
# put: 4.5-7.5s (averaging 6s)
|
1205 |
# append: 2.9-4.5s
|
|
1955.3.27
by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions |
1206 |
# put_non_atomic: 2.9-4.5s
|
1207 |
transport.put_bytes_non_atomic(urlutils.escape(name), content) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1208 |
|
1185.16.53
by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests |
1209 |
def build_tree_contents(self, shape): |
1514
by Robert Collins
Unbreak self.build_tree_shape in tests. |
1210 |
build_tree_contents(shape) |
1185.16.53
by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests |
1211 |
|
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
1212 |
def failUnlessExists(self, path): |
1213 |
"""Fail unless path, which may be abs or relative, exists."""
|
|
1448
by Robert Collins
revert symlinks correctly |
1214 |
self.failUnless(osutils.lexists(path)) |
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
1215 |
|
1216 |
def failIfExists(self, path): |
|
1217 |
"""Fail if path, which may be abs or relative, exists."""
|
|
1218 |
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 |
1219 |
|
1442.1.70
by Robert Collins
Add assertFileEqual to TestCaseInTempDir. |
1220 |
def assertFileEqual(self, content, path): |
1221 |
"""Fail if path does not contain 'content'."""
|
|
1222 |
self.failUnless(osutils.lexists(path)) |
|
1685.1.31
by John Arbash Meinel
Adding tests for the rest of the _win32 functions. |
1223 |
# TODO: jam 20060427 Shouldn't this be 'rb'?
|
1442.1.70
by Robert Collins
Add assertFileEqual to TestCaseInTempDir. |
1224 |
self.assertEqualDiff(content, open(path, 'r').read()) |
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
1225 |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
1226 |
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
1227 |
class TestCaseWithTransport(TestCaseInTempDir): |
1228 |
"""A test case that provides get_url and get_readonly_url facilities.
|
|
1229 |
||
1230 |
These back onto two transport servers, one for readonly access and one for
|
|
1231 |
read write access.
|
|
1232 |
||
1233 |
If no explicit class is provided for readonly access, a
|
|
1234 |
ReadonlyTransportDecorator is used instead which allows the use of non disk
|
|
1235 |
based read write transports.
|
|
1236 |
||
1237 |
If an explicit class is provided for readonly access, that server and the
|
|
1238 |
readwrite one must both define get_url() as resolving to os.getcwd().
|
|
1239 |
"""
|
|
1240 |
||
1241 |
def __init__(self, methodName='testMethod'): |
|
1242 |
super(TestCaseWithTransport, self).__init__(methodName) |
|
1243 |
self.__readonly_server = None |
|
1244 |
self.__server = None |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1245 |
self.transport_server = default_transport |
1534.4.13
by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url. |
1246 |
self.transport_readonly_server = None |
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
1247 |
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
1248 |
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. |
1249 |
"""Get a URL for the readonly transport.
|
1250 |
||
1251 |
This will either be backed by '.' or a decorator to the transport
|
|
1252 |
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. |
1253 |
relpath provides for clients to get a path relative to the base url.
|
1254 |
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. |
1255 |
"""
|
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. |
1256 |
base = self.get_readonly_server().get_url() |
1257 |
if relpath is not None: |
|
1258 |
if not base.endswith('/'): |
|
1259 |
base = base + '/' |
|
1260 |
base = base + relpath |
|
1261 |
return base |
|
1262 |
||
1263 |
def get_readonly_server(self): |
|
1264 |
"""Get the server instance for the readonly transport
|
|
1265 |
||
1266 |
This is useful for some tests with specific servers to do diagnostics.
|
|
1267 |
"""
|
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
1268 |
if self.__readonly_server is None: |
1269 |
if self.transport_readonly_server is None: |
|
1270 |
# readonly decorator requested
|
|
1271 |
# bring up the server
|
|
1272 |
self.get_url() |
|
1273 |
self.__readonly_server = ReadonlyServer() |
|
1274 |
self.__readonly_server.setUp(self.__server) |
|
1275 |
else: |
|
1276 |
self.__readonly_server = self.transport_readonly_server() |
|
1277 |
self.__readonly_server.setUp() |
|
1278 |
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. |
1279 |
return self.__readonly_server |
1280 |
||
1281 |
def get_server(self): |
|
1282 |
"""Get the read/write server instance.
|
|
1283 |
||
1284 |
This is useful for some tests with specific servers that need
|
|
1285 |
diagnostics.
|
|
1286 |
"""
|
|
1287 |
if self.__server is None: |
|
1288 |
self.__server = self.transport_server() |
|
1289 |
self.__server.setUp() |
|
1290 |
self.addCleanup(self.__server.tearDown) |
|
1291 |
return self.__server |
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
1292 |
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
1293 |
def get_url(self, relpath=None): |
1910.7.17
by Andrew Bennetts
Various cosmetic changes. |
1294 |
"""Get a URL (or maybe a path) for the readwrite transport.
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
1295 |
|
1296 |
This will either be backed by '.' or to an equivalent non-file based
|
|
1297 |
facility.
|
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
1298 |
relpath provides for clients to get a path relative to the base url.
|
1299 |
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. |
1300 |
"""
|
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. |
1301 |
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. |
1302 |
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. |
1303 |
if not base.endswith('/'): |
1304 |
base = base + '/' |
|
1910.17.1
by Andrew Bennetts
Change TestCaseWithTransport.get_url so that test_add_in_nonascii_branch passes. |
1305 |
# XXX: Really base should be a url; we did after all call
|
1306 |
# get_url()! But sometimes it's just a path (from
|
|
1307 |
# LocalAbspathServer), and it'd be wrong to append urlescaped data
|
|
1308 |
# to a non-escaped local path.
|
|
1309 |
if base.startswith('./') or base.startswith('/'): |
|
1310 |
base += relpath |
|
1311 |
else: |
|
1312 |
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. |
1313 |
return base |
1314 |
||
1553.5.9
by Martin Pool
Add TestCaseWithTransport.get_transport and get_readonly_transport |
1315 |
def get_transport(self): |
1316 |
"""Return a writeable transport for the test scratch space"""
|
|
1317 |
t = get_transport(self.get_url()) |
|
1318 |
self.assertFalse(t.is_readonly()) |
|
1319 |
return t |
|
1320 |
||
1321 |
def get_readonly_transport(self): |
|
1322 |
"""Return a readonly transport for the test scratch space
|
|
1323 |
|
|
1324 |
This can be used to test that operations which should only need
|
|
1325 |
readonly access in fact do not try to write.
|
|
1326 |
"""
|
|
1327 |
t = get_transport(self.get_readonly_url()) |
|
1328 |
self.assertTrue(t.is_readonly()) |
|
1329 |
return t |
|
1330 |
||
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
1331 |
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. |
1332 |
"""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 |
1333 |
repo = self.make_repository(relpath, format=format) |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1334 |
return repo.bzrdir.create_branch() |
1335 |
||
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
1336 |
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. |
1337 |
try: |
1910.13.1
by Andrew Bennetts
Make make_bzrdir preserve the transport. |
1338 |
# might be a relative or absolute path
|
1339 |
maybe_a_url = self.get_url(relpath) |
|
1910.13.4
by Andrew Bennetts
Do slightly less splitting. |
1340 |
segments = maybe_a_url.rsplit('/', 1) |
1910.13.1
by Andrew Bennetts
Make make_bzrdir preserve the transport. |
1341 |
t = get_transport(maybe_a_url) |
1910.13.4
by Andrew Bennetts
Do slightly less splitting. |
1342 |
if len(segments) > 1 and segments[-1] not in ('', '.'): |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1343 |
try: |
1910.13.1
by Andrew Bennetts
Make make_bzrdir preserve the transport. |
1344 |
t.mkdir('.') |
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. |
1345 |
except errors.FileExists: |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1346 |
pass
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
1347 |
if format is None: |
1910.13.1
by Andrew Bennetts
Make make_bzrdir preserve the transport. |
1348 |
format = bzrlib.bzrdir.BzrDirFormat.get_default_format() |
1349 |
return format.initialize_on_transport(t) |
|
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. |
1350 |
except errors.UninitializableFormat: |
1684.1.4
by Martin Pool
(patch) better warnings when tests are skipped (Alexander) |
1351 |
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. |
1352 |
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
1353 |
def make_repository(self, relpath, shared=False, format=None): |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
1354 |
"""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 |
1355 |
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. |
1356 |
return made_control.create_repository(shared=shared) |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
1357 |
|
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
1358 |
def make_branch_and_memory_tree(self, relpath): |
1359 |
"""Create a branch on the default transport and a MemoryTree for it."""
|
|
1360 |
b = self.make_branch(relpath) |
|
1361 |
return memorytree.MemoryTree.create_on_branch(b) |
|
1362 |
||
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
1363 |
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. |
1364 |
"""Create a branch on the transport and a tree locally.
|
1365 |
||
1910.7.17
by Andrew Bennetts
Various cosmetic changes. |
1366 |
If the transport is not a LocalTransport, the Tree can't be created on
|
1367 |
the transport. In that case the working tree is created in the local
|
|
1368 |
directory, and the returned tree's branch and repository will also be
|
|
1369 |
accessed locally.
|
|
1370 |
||
1371 |
This will fail if the original default transport for this test
|
|
1372 |
case wasn't backed by the working directory, as the branch won't
|
|
1373 |
be on disk for us to open it.
|
|
1374 |
||
1375 |
:param format: The BzrDirFormat.
|
|
1376 |
:returns: the WorkingTree.
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1377 |
"""
|
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. |
1378 |
# TODO: always use the local disk path for the working tree,
|
1379 |
# this obviously requires a format that supports branch references
|
|
1380 |
# so check for that by checking bzrdir.BzrDirFormat.get_default_format()
|
|
1381 |
# RBC 20060208
|
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
1382 |
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. |
1383 |
try: |
1384 |
return b.bzrdir.create_workingtree() |
|
1385 |
except errors.NotLocalUrl: |
|
1910.14.1
by Andrew Bennetts
Fix to make_branch_and_tree's behavior when used with an sftp transport. |
1386 |
# We can only make working trees locally at the moment. If the
|
1387 |
# transport can't support them, then reopen the branch on a local
|
|
1388 |
# transport, and create the working tree there.
|
|
1389 |
#
|
|
1390 |
# Possibly we should instead keep
|
|
1391 |
# the non-disk-backed branch and create a local checkout?
|
|
1392 |
bd = bzrdir.BzrDir.open(relpath) |
|
1393 |
return bd.create_workingtree() |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1394 |
|
1553.5.68
by Martin Pool
Add new TestCaseWithTransport.assertIsDirectory() and tests |
1395 |
def assertIsDirectory(self, relpath, transport): |
1396 |
"""Assert that relpath within transport is a directory.
|
|
1397 |
||
1398 |
This may not be possible on all transports; in that case it propagates
|
|
1399 |
a TransportNotPossible.
|
|
1400 |
"""
|
|
1401 |
try: |
|
1402 |
mode = transport.stat(relpath).st_mode |
|
1403 |
except errors.NoSuchFile: |
|
1404 |
self.fail("path %s is not a directory; no such file" |
|
1405 |
% (relpath)) |
|
1406 |
if not stat.S_ISDIR(mode): |
|
1407 |
self.fail("path %s is not a directory; has mode %#o" |
|
1408 |
% (relpath, mode)) |
|
1409 |
||
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
1410 |
|
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
1411 |
class ChrootedTestCase(TestCaseWithTransport): |
1412 |
"""A support class that provides readonly urls outside the local namespace.
|
|
1413 |
||
1414 |
This is done by checking if self.transport_server is a MemoryServer. if it
|
|
1415 |
is then we are chrooted already, if it is not then an HttpServer is used
|
|
1416 |
for readonly urls.
|
|
1417 |
||
1418 |
TODO RBC 20060127: make this an option to TestCaseWithTransport so it can
|
|
1419 |
be used without needed to redo it when a different
|
|
1420 |
subclass is in use ?
|
|
1421 |
"""
|
|
1422 |
||
1423 |
def setUp(self): |
|
1424 |
super(ChrootedTestCase, self).setUp() |
|
1425 |
if not self.transport_server == bzrlib.transport.memory.MemoryServer: |
|
1426 |
self.transport_readonly_server = bzrlib.transport.http.HttpServer |
|
1427 |
||
1428 |
||
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
1429 |
def filter_suite_by_re(suite, pattern): |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
1430 |
result = TestUtil.TestSuite() |
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
1431 |
filter_re = re.compile(pattern) |
1432 |
for test in iter_suite_tests(suite): |
|
1185.1.57
by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls. |
1433 |
if filter_re.search(test.id()): |
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
1434 |
result.addTest(test) |
1435 |
return result |
|
1436 |
||
1437 |
||
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
1438 |
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. |
1439 |
stop_on_failure=False, keep_output=False, |
1819.1.3
by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history |
1440 |
transport=None, lsprof_timed=None, bench_history=None): |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
1441 |
TestCaseInTempDir._TEST_NAME = name |
1728.1.1
by Robert Collins
(rbc)Merge in benchmark --lsprof-timed lsprofiling feature. (Robert Collins, Martin Pool). |
1442 |
TestCase._gather_lsprof_in_benchmarks = lsprof_timed |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
1443 |
if verbose: |
1444 |
verbosity = 2 |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
1445 |
pb = None |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
1446 |
else: |
1447 |
verbosity = 1 |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
1448 |
pb = progress.ProgressBar() |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
1449 |
runner = TextTestRunner(stream=sys.stdout, |
1450 |
descriptions=0, |
|
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
1451 |
verbosity=verbosity, |
1452 |
keep_output=keep_output, |
|
1819.1.3
by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history |
1453 |
pb=pb, |
1454 |
bench_history=bench_history) |
|
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
1455 |
runner.stop_on_failure=stop_on_failure |
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
1456 |
if pattern != '.*': |
1457 |
suite = filter_suite_by_re(suite, pattern) |
|
1458 |
result = runner.run(suite) |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
1459 |
return result.wasSuccessful() |
1460 |
||
1461 |
||
1185.35.20
by Aaron Bentley
Only keep test failure directories if --keep-output is specified |
1462 |
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. |
1463 |
keep_output=False, |
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
1464 |
transport=None, |
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
1465 |
test_suite_factory=None, |
1819.1.3
by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history |
1466 |
lsprof_timed=None, |
1467 |
bench_history=None): |
|
1204
by Martin Pool
doc |
1468 |
"""Run the whole test suite under the enhanced runner"""
|
1904.2.5
by Martin Pool
Fix format warning inside test suite and add test |
1469 |
# XXX: Very ugly way to do this...
|
1470 |
# Disable warning about old formats because we don't want it to disturb
|
|
1471 |
# any blackbox tests.
|
|
1472 |
from bzrlib import repository |
|
1473 |
repository._deprecation_warning_done = True |
|
1474 |
||
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. |
1475 |
global default_transport |
1476 |
if transport is None: |
|
1477 |
transport = default_transport |
|
1478 |
old_transport = default_transport |
|
1479 |
default_transport = transport |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1480 |
try: |
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
1481 |
if test_suite_factory is None: |
1482 |
suite = test_suite() |
|
1483 |
else: |
|
1484 |
suite = test_suite_factory() |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1485 |
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. |
1486 |
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 |
1487 |
transport=transport, |
1819.1.3
by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history |
1488 |
lsprof_timed=lsprof_timed, |
1489 |
bench_history=bench_history) |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1490 |
finally: |
1491 |
default_transport = old_transport |
|
1492 |
||
1092.1.17
by Robert Collins
remove TEST_CLASSES dead code and provide a bzrlib.test_suite() convenience method |
1493 |
|
1494 |
def test_suite(): |
|
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
1495 |
"""Build and return TestSuite for the whole of bzrlib.
|
1496 |
|
|
1497 |
This function can be replaced if you need to change the default test
|
|
1498 |
suite on a global basis, but it is not encouraged.
|
|
1499 |
"""
|
|
1740.6.1
by Martin Pool
Remove Scratch objects used by doctests |
1500 |
testmod_names = [ |
1518
by Robert Collins
Merge from mbp. |
1501 |
'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 |
1502 |
'bzrlib.tests.test_api', |
1755.3.6
by John Arbash Meinel
Add a test suite for Atomic File, and clean it up so that it really does set the mode properly. |
1503 |
'bzrlib.tests.test_atomicfile', |
1518
by Robert Collins
Merge from mbp. |
1504 |
'bzrlib.tests.test_bad_files', |
1505 |
'bzrlib.tests.test_branch', |
|
1185.82.130
by Aaron Bentley
Rename changesets to revision bundles |
1506 |
'bzrlib.tests.test_bundle', |
1534.4.39
by Robert Collins
Basic BzrDir support. |
1507 |
'bzrlib.tests.test_bzrdir', |
1911.2.3
by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids |
1508 |
'bzrlib.tests.test_cache_utf8', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1509 |
'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 |
1510 |
'bzrlib.tests.test_commit', |
1511 |
'bzrlib.tests.test_commit_merge', |
|
1512 |
'bzrlib.tests.test_config', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1513 |
'bzrlib.tests.test_conflicts', |
1551.3.11
by Aaron Bentley
Merge from Robert |
1514 |
'bzrlib.tests.test_decorators', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1515 |
'bzrlib.tests.test_diff', |
1551.3.11
by Aaron Bentley
Merge from Robert |
1516 |
'bzrlib.tests.test_doc_generate', |
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
1517 |
'bzrlib.tests.test_errors', |
1185.80.5
by John Arbash Meinel
Changing the escaping just a little bit. Now we can handle unicode characters. |
1518 |
'bzrlib.tests.test_escaped_store', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1519 |
'bzrlib.tests.test_fetch', |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
1520 |
'bzrlib.tests.test_ftp_transport', |
1518
by Robert Collins
Merge from mbp. |
1521 |
'bzrlib.tests.test_gpg', |
1522 |
'bzrlib.tests.test_graph', |
|
1523 |
'bzrlib.tests.test_hashcache', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1524 |
'bzrlib.tests.test_http', |
1786.1.8
by John Arbash Meinel
[merge] Johan Rydberg test updates |
1525 |
'bzrlib.tests.test_http_response', |
1518
by Robert Collins
Merge from mbp. |
1526 |
'bzrlib.tests.test_identitymap', |
1836.1.13
by John Arbash Meinel
Adding functions for getting user ignores. |
1527 |
'bzrlib.tests.test_ignores', |
1518
by Robert Collins
Merge from mbp. |
1528 |
'bzrlib.tests.test_inv', |
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
1529 |
'bzrlib.tests.test_knit', |
1996.1.1
by John Arbash Meinel
Adding a ScopeReplacer class, which can replace itself on demand |
1530 |
'bzrlib.tests.test_lazy_import', |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
1531 |
'bzrlib.tests.test_lockdir', |
1185.67.4
by Aaron Bentley
Throw if we try to write to a LockableFiles with no write lock |
1532 |
'bzrlib.tests.test_lockable_files', |
1518
by Robert Collins
Merge from mbp. |
1533 |
'bzrlib.tests.test_log', |
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
1534 |
'bzrlib.tests.test_memorytree', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1535 |
'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 |
1536 |
'bzrlib.tests.test_merge3', |
1518
by Robert Collins
Merge from mbp. |
1537 |
'bzrlib.tests.test_merge_core', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1538 |
'bzrlib.tests.test_missing', |
1518
by Robert Collins
Merge from mbp. |
1539 |
'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 |
1540 |
'bzrlib.tests.test_nonascii', |
1518
by Robert Collins
Merge from mbp. |
1541 |
'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. |
1542 |
'bzrlib.tests.test_osutils', |
1558.15.6
by Aaron Bentley
Added more tests |
1543 |
'bzrlib.tests.test_patch', |
1185.82.9
by John Arbash Meinel
Moving patches testing into main test suite. |
1544 |
'bzrlib.tests.test_patches', |
1185.58.1
by John Arbash Meinel
Added new permissions test (currently don't pass) |
1545 |
'bzrlib.tests.test_permissions', |
1515
by Robert Collins
* Plugins with the same name in different directories in the bzr plugin |
1546 |
'bzrlib.tests.test_plugins', |
1551.2.27
by Aaron Bentley
Got propogation under test |
1547 |
'bzrlib.tests.test_progress', |
1570.1.11
by Robert Collins
Make reconcile work with shared repositories. |
1548 |
'bzrlib.tests.test_reconcile', |
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
1549 |
'bzrlib.tests.test_repository', |
1551.8.15
by Aaron Bentley
bug #54172: handle new directories properly in revert |
1550 |
'bzrlib.tests.test_revert', |
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
1551 |
'bzrlib.tests.test_revision', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1552 |
'bzrlib.tests.test_revisionnamespaces', |
1773.2.1
by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids. |
1553 |
'bzrlib.tests.test_revisiontree', |
1185.47.1
by Martin Pool
[broken] start converting basic_io to more rfc822-like format |
1554 |
'bzrlib.tests.test_rio', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1555 |
'bzrlib.tests.test_sampler', |
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
1556 |
'bzrlib.tests.test_selftest', |
1185.33.89
by Martin Pool
[patch] add a selftest test that the setup build script works (Alexander Belchenko) |
1557 |
'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. |
1558 |
'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 |
1559 |
'bzrlib.tests.test_smart_add', |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
1560 |
'bzrlib.tests.test_smart_transport', |
1522
by Robert Collins
Test for the number of uses of self.working_tree() in branch.py |
1561 |
'bzrlib.tests.test_source', |
1551.6.19
by Aaron Bentley
Fix pending merge status on empty trees |
1562 |
'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 |
1563 |
'bzrlib.tests.test_store', |
1534.2.1
by Robert Collins
Implement deprecated_method |
1564 |
'bzrlib.tests.test_symbol_versioning', |
1518
by Robert Collins
Merge from mbp. |
1565 |
'bzrlib.tests.test_testament', |
1558.15.1
by Aaron Bentley
Add text_file function |
1566 |
'bzrlib.tests.test_textfile', |
1551.6.7
by Aaron Bentley
Implemented two-way merge, refactored weave merge |
1567 |
'bzrlib.tests.test_textmerge', |
1518
by Robert Collins
Merge from mbp. |
1568 |
'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 |
1569 |
'bzrlib.tests.test_transactions', |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
1570 |
'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 |
1571 |
'bzrlib.tests.test_transport', |
1852.8.2
by Robert Collins
Add InterTree class to represent InterTree operations. |
1572 |
'bzrlib.tests.test_tree', |
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
1573 |
'bzrlib.tests.test_treebuilder', |
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
1574 |
'bzrlib.tests.test_tsort', |
1666.1.2
by Robert Collins
Fix race condition between end of stream and end of file with tuned_gzip. |
1575 |
'bzrlib.tests.test_tuned_gzip', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1576 |
'bzrlib.tests.test_ui', |
1577 |
'bzrlib.tests.test_upgrade', |
|
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
1578 |
'bzrlib.tests.test_urlutils', |
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
1579 |
'bzrlib.tests.test_versionedfile', |
1819.1.8
by Martin Pool
Improved reporting of bzrlib revision_id |
1580 |
'bzrlib.tests.test_version', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1581 |
'bzrlib.tests.test_weave', |
1582 |
'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 |
1583 |
'bzrlib.tests.test_workingtree', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1584 |
'bzrlib.tests.test_xml', |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1585 |
]
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
1586 |
test_transport_implementations = [ |
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
1587 |
'bzrlib.tests.test_transport_implementations', |
1588 |
'bzrlib.tests.test_read_bundle', |
|
1589 |
]
|
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
1590 |
suite = TestUtil.TestSuite() |
1707.2.2
by Robert Collins
Start on bench_add, an add benchtest. |
1591 |
loader = TestUtil.TestLoader() |
1864.3.1
by John Arbash Meinel
Print out when a test fails in non verbose mode, run transport tests later |
1592 |
suite.addTest(loader.loadTestsFromModuleNames(testmod_names)) |
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
1593 |
from bzrlib.transport import TransportTestProviderAdapter |
1594 |
adapter = TransportTestProviderAdapter() |
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
1595 |
adapt_modules(test_transport_implementations, adapter, loader, suite) |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
1596 |
for package in packages_to_test(): |
1597 |
suite.addTest(package.test_suite()) |
|
855
by Martin Pool
- Patch from John to allow plugins to add their own tests. |
1598 |
for m in MODULES_TO_TEST: |
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
1599 |
suite.addTest(loader.loadTestsFromModule(m)) |
1740.6.1
by Martin Pool
Remove Scratch objects used by doctests |
1600 |
for m in MODULES_TO_DOCTEST: |
1601 |
suite.addTest(doctest.DocTestSuite(m)) |
|
1516
by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a |
1602 |
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. |
1603 |
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 |
1604 |
suite.addTest(plugin.test_suite()) |
1092.1.17
by Robert Collins
remove TEST_CLASSES dead code and provide a bzrlib.test_suite() convenience method |
1605 |
return suite |
764
by Martin Pool
- log messages from a particular test are printed if that test fails |
1606 |
|
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
1607 |
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
1608 |
def adapt_modules(mods_list, adapter, loader, suite): |
1609 |
"""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. |
1610 |
for test in iter_suite_tests(loader.loadTestsFromModuleNames(mods_list)): |
1611 |
suite.addTests(adapter.adapt(test)) |