1553.5.19
by Martin Pool
Run lockdir doctests |
1 |
# Copyright (C) 2005, 2006 by Canonical Ltd
|
608
by Martin Pool
- Split selftests out into a new module and start changing them |
2 |
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
||
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
||
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
609
by Martin Pool
- cleanup test code |
17 |
|
1535
by Martin Pool
todo idea from John |
18 |
# TODO: Perhaps there should be an API to find out if bzr running under the
|
19 |
# test suite -- some plugins might want to avoid making intrusive changes if
|
|
20 |
# this is the case. However, we want behaviour under to test to diverge as
|
|
21 |
# little as possible, so this should be used rarely if it's added at all.
|
|
22 |
# (Suggestion from j-a-meinel, 2005-11-24)
|
|
23 |
||
1553.5.68
by Martin Pool
Add new TestCaseWithTransport.assertIsDirectory() and tests |
24 |
# NOTE: Some classes in here use camelCaseNaming() rather than
|
25 |
# underscore_naming(). That's for consistency with unittest; it's not the
|
|
26 |
# general style of bzrlib. Please continue that consistency when adding e.g.
|
|
27 |
# new assertFoo() methods.
|
|
28 |
||
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
29 |
import codecs |
1185.1.29
by Robert Collins
merge merge tweaks from aaron, which includes latest .dev |
30 |
from cStringIO import StringIO |
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
31 |
import difflib |
32 |
import errno |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
33 |
import logging |
34 |
import os |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
35 |
import re |
36 |
import shutil |
|
1530.1.17
by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible. |
37 |
import stat |
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
38 |
import sys |
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
39 |
import tempfile |
40 |
import unittest |
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
41 |
import time |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
42 |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
43 |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
44 |
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. |
45 |
import bzrlib.bzrdir as bzrdir |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
46 |
import bzrlib.commands |
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
47 |
import bzrlib.errors as errors |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
48 |
import bzrlib.inventory |
1185.67.6
by Aaron Bentley
Added tests and fixes for LockableFiles.put_utf8(); imported IterableFile |
49 |
import bzrlib.iterablefile |
1553.5.19
by Martin Pool
Run lockdir doctests |
50 |
import bzrlib.lockdir |
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
51 |
from bzrlib.merge import merge_inner |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
52 |
import bzrlib.merge3 |
53 |
import bzrlib.osutils |
|
54 |
import bzrlib.osutils as osutils |
|
55 |
import bzrlib.plugin |
|
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
56 |
from bzrlib.revision import common_ancestor |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
57 |
import bzrlib.store |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
58 |
import bzrlib.trace |
1553.5.9
by Martin Pool
Add TestCaseWithTransport.get_transport and get_readonly_transport |
59 |
from bzrlib.transport import urlescape, get_transport |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
60 |
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. |
61 |
from bzrlib.transport.local import LocalRelpathServer |
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
62 |
from bzrlib.transport.readonly import ReadonlyServer |
1185.43.1
by Martin Pool
Remove direct logging calls from selftest |
63 |
from bzrlib.trace import mutter |
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
64 |
from bzrlib.tests.TestUtil import TestLoader, TestSuite |
1514
by Robert Collins
Unbreak self.build_tree_shape in tests. |
65 |
from bzrlib.tests.treeshape import build_tree_contents |
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
66 |
from bzrlib.workingtree import WorkingTree, WorkingTreeFormat2 |
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
67 |
|
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. |
68 |
default_transport = LocalRelpathServer |
69 |
||
855
by Martin Pool
- Patch from John to allow plugins to add their own tests. |
70 |
MODULES_TO_TEST = [] |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
71 |
MODULES_TO_DOCTEST = [ |
72 |
bzrlib.branch, |
|
73 |
bzrlib.commands, |
|
74 |
bzrlib.errors, |
|
75 |
bzrlib.inventory, |
|
1185.67.6
by Aaron Bentley
Added tests and fixes for LockableFiles.put_utf8(); imported IterableFile |
76 |
bzrlib.iterablefile, |
1553.5.19
by Martin Pool
Run lockdir doctests |
77 |
bzrlib.lockdir, |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
78 |
bzrlib.merge3, |
1545.1.2
by Denys Duchier
order MODULES_TO_DOCTEST alphabetically |
79 |
bzrlib.option, |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
80 |
bzrlib.osutils, |
1545.1.2
by Denys Duchier
order MODULES_TO_DOCTEST alphabetically |
81 |
bzrlib.store |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
82 |
]
|
83 |
def packages_to_test(): |
|
1530.2.1
by Robert Collins
Start tests for api usage. |
84 |
"""Return a list of packages to test.
|
85 |
||
86 |
The packages are not globally imported so that import failures are
|
|
87 |
triggered when running selftest, not when importing the command.
|
|
88 |
"""
|
|
89 |
import bzrlib.doc |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
90 |
import bzrlib.tests.blackbox |
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
91 |
import bzrlib.tests.branch_implementations |
1534.4.39
by Robert Collins
Basic BzrDir support. |
92 |
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. |
93 |
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. |
94 |
import bzrlib.tests.interversionedfile_implementations |
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
95 |
import bzrlib.tests.repository_implementations |
1563.2.21
by Robert Collins
Smoke test for RevisionStore factories creating revision stores. |
96 |
import bzrlib.tests.revisionstore_implementations |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
97 |
import bzrlib.tests.workingtree_implementations |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
98 |
return [ |
1530.2.1
by Robert Collins
Start tests for api usage. |
99 |
bzrlib.doc, |
1551.2.6
by Aaron Bentley
Restored blackbox tests [recommit] |
100 |
bzrlib.tests.blackbox, |
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
101 |
bzrlib.tests.branch_implementations, |
1534.4.39
by Robert Collins
Basic BzrDir support. |
102 |
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. |
103 |
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. |
104 |
bzrlib.tests.interversionedfile_implementations, |
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
105 |
bzrlib.tests.repository_implementations, |
1563.2.21
by Robert Collins
Smoke test for RevisionStore factories creating revision stores. |
106 |
bzrlib.tests.revisionstore_implementations, |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
107 |
bzrlib.tests.workingtree_implementations, |
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
108 |
]
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
109 |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
110 |
|
111 |
class _MyResult(unittest._TextTestResult): |
|
1185.43.2
by Martin Pool
Nicer display of verbose test results and progress |
112 |
"""Custom TestResult.
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
113 |
|
1185.33.54
by Martin Pool
[merge] test renames and other fixes (John) |
114 |
Shows output in a different format, including displaying runtime for tests.
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
115 |
"""
|
1185.62.21
by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test. |
116 |
stop_early = False |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
117 |
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
118 |
def _elapsedTime(self): |
1185.43.2
by Martin Pool
Nicer display of verbose test results and progress |
119 |
return "%5dms" % (1000 * (time.time() - self._start_time)) |
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
120 |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
121 |
def startTest(self, test): |
122 |
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 |
123 |
# In a short description, the important words are in
|
124 |
# the beginning, but in an id, the important words are
|
|
125 |
# at the end
|
|
1185.33.54
by Martin Pool
[merge] test renames and other fixes (John) |
126 |
SHOW_DESCRIPTIONS = False |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
127 |
if self.showAll: |
1185.33.60
by Martin Pool
Use full terminal width for verbose test output. |
128 |
width = osutils.terminal_width() |
129 |
name_width = width - 15 |
|
130 |
what = None |
|
131 |
if SHOW_DESCRIPTIONS: |
|
132 |
what = test.shortDescription() |
|
133 |
if what: |
|
134 |
if len(what) > name_width: |
|
135 |
what = what[:name_width-3] + '...' |
|
136 |
if what is None: |
|
137 |
what = test.id() |
|
138 |
if what.startswith('bzrlib.tests.'): |
|
139 |
what = what[13:] |
|
140 |
if len(what) > name_width: |
|
141 |
what = '...' + what[3-name_width:] |
|
142 |
what = what.ljust(name_width) |
|
143 |
self.stream.write(what) |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
144 |
self.stream.flush() |
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
145 |
self._start_time = time.time() |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
146 |
|
147 |
def addError(self, test, err): |
|
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
148 |
if isinstance(err[1], TestSkipped): |
149 |
return self.addSkipped(test, err) |
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
150 |
unittest.TestResult.addError(self, test, err) |
151 |
if self.showAll: |
|
152 |
self.stream.writeln("ERROR %s" % self._elapsedTime()) |
|
153 |
elif self.dots: |
|
154 |
self.stream.write('E') |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
155 |
self.stream.flush() |
1185.62.21
by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test. |
156 |
if self.stop_early: |
157 |
self.stop() |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
158 |
|
159 |
def addFailure(self, test, err): |
|
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
160 |
unittest.TestResult.addFailure(self, test, err) |
161 |
if self.showAll: |
|
1185.43.2
by Martin Pool
Nicer display of verbose test results and progress |
162 |
self.stream.writeln(" FAIL %s" % self._elapsedTime()) |
1185.1.58
by Robert Collins
make selftest -v show the elapsed time for each test run. |
163 |
elif self.dots: |
164 |
self.stream.write('F') |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
165 |
self.stream.flush() |
1185.62.21
by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test. |
166 |
if self.stop_early: |
167 |
self.stop() |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
168 |
|
169 |
def addSuccess(self, test): |
|
170 |
if self.showAll: |
|
1185.43.2
by Martin Pool
Nicer display of verbose test results and progress |
171 |
self.stream.writeln(' OK %s' % self._elapsedTime()) |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
172 |
elif self.dots: |
173 |
self.stream.write('~') |
|
174 |
self.stream.flush() |
|
175 |
unittest.TestResult.addSuccess(self, test) |
|
176 |
||
1185.33.96
by Martin Pool
Fix up display of reasons why tests were skipped. |
177 |
def addSkipped(self, test, skip_excinfo): |
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
178 |
if self.showAll: |
1185.33.96
by Martin Pool
Fix up display of reasons why tests were skipped. |
179 |
print >>self.stream, ' SKIP %s' % self._elapsedTime() |
180 |
print >>self.stream, ' %s' % skip_excinfo[1] |
|
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
181 |
elif self.dots: |
182 |
self.stream.write('S') |
|
183 |
self.stream.flush() |
|
184 |
# seems best to treat this as success from point-of-view of unittest
|
|
185 |
# -- it actually does nothing so it barely matters :)
|
|
186 |
unittest.TestResult.addSuccess(self, test) |
|
187 |
||
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
188 |
def printErrorList(self, flavour, errors): |
189 |
for test, err in errors: |
|
190 |
self.stream.writeln(self.separator1) |
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
191 |
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. |
192 |
if getattr(test, '_get_log', None) is not None: |
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
193 |
print >>self.stream |
194 |
print >>self.stream, \ |
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
195 |
('vvvv[log from %s]' % test.id()).ljust(78,'-') |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
196 |
print >>self.stream, test._get_log() |
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
197 |
print >>self.stream, \ |
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
198 |
('^^^^[log from %s]' % test.id()).ljust(78,'-') |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
199 |
self.stream.writeln(self.separator2) |
200 |
self.stream.writeln("%s" % err) |
|
201 |
||
202 |
||
203 |
class TextTestRunner(unittest.TextTestRunner): |
|
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
204 |
stop_on_failure = False |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
205 |
|
206 |
def _makeResult(self): |
|
207 |
result = _MyResult(self.stream, self.descriptions, self.verbosity) |
|
1185.62.21
by John Arbash Meinel
Allow bzr selftest --one to continue, even if we have a Skipped test. |
208 |
result.stop_early = self.stop_on_failure |
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
209 |
return result |
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
210 |
|
211 |
||
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
212 |
def iter_suite_tests(suite): |
213 |
"""Return all tests in a suite, recursing through nested suites"""
|
|
214 |
for item in suite._tests: |
|
215 |
if isinstance(item, unittest.TestCase): |
|
216 |
yield item |
|
217 |
elif isinstance(item, unittest.TestSuite): |
|
218 |
for r in iter_suite_tests(item): |
|
219 |
yield r |
|
220 |
else: |
|
221 |
raise Exception('unknown object %r inside test suite %r' |
|
222 |
% (item, suite)) |
|
223 |
||
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
224 |
|
225 |
class TestSkipped(Exception): |
|
226 |
"""Indicates that a test was intentionally skipped, rather than failing."""
|
|
227 |
# XXX: Not used yet
|
|
228 |
||
229 |
||
1147
by Martin Pool
- split builtin commands into separate module bzrlib.builtins; |
230 |
class CommandFailed(Exception): |
231 |
pass
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
232 |
|
233 |
class TestCase(unittest.TestCase): |
|
234 |
"""Base class for bzr unit tests.
|
|
235 |
|
|
236 |
Tests that need access to disk resources should subclass
|
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
237 |
TestCaseInTempDir not TestCase.
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
238 |
|
239 |
Error and debug log messages are redirected from their usual
|
|
240 |
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. |
241 |
retrieved by _get_log(). We use a real OS file, not an in-memory object,
|
242 |
so that it can also capture file IO. When the test completes this file
|
|
243 |
is read into memory and removed from disk.
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
244 |
|
245 |
There are also convenience functions to invoke bzr's command-line
|
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
246 |
routine, and to build and check bzr trees.
|
247 |
|
|
248 |
In addition to the usual method of overriding tearDown(), this class also
|
|
249 |
allows subclasses to register functions into the _cleanups list, which is
|
|
250 |
run in order as the object is torn down. It's less likely this will be
|
|
251 |
accidentally overlooked.
|
|
252 |
"""
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
253 |
|
254 |
BZRPATH = 'bzr' |
|
1185.16.14
by Martin Pool
- make TestCase._get_log work even if setup was aborted |
255 |
_log_file_name = None |
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
256 |
_log_contents = '' |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
257 |
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
258 |
def __init__(self, methodName='testMethod'): |
259 |
super(TestCase, self).__init__(methodName) |
|
260 |
self._cleanups = [] |
|
261 |
||
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
262 |
def setUp(self): |
263 |
unittest.TestCase.setUp(self) |
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
264 |
self._cleanEnvironment() |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
265 |
bzrlib.trace.disable_default_logging() |
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
266 |
self._startLogFile() |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
267 |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
268 |
def _ndiff_strings(self, a, b): |
1185.16.67
by Martin Pool
- assertEqualDiff handles strings without trailing newline |
269 |
"""Return ndiff between two strings containing lines.
|
270 |
|
|
271 |
A trailing newline is added if missing to make the strings
|
|
272 |
print properly."""
|
|
273 |
if b and b[-1] != '\n': |
|
274 |
b += '\n' |
|
275 |
if a and a[-1] != '\n': |
|
276 |
a += '\n' |
|
1185.16.21
by Martin Pool
- tweak diff shown by assertEqualDiff |
277 |
difflines = difflib.ndiff(a.splitlines(True), |
278 |
b.splitlines(True), |
|
279 |
linejunk=lambda x: False, |
|
280 |
charjunk=lambda x: False) |
|
281 |
return ''.join(difflines) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
282 |
|
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. |
283 |
def assertEqualDiff(self, a, b, message=None): |
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
284 |
"""Assert two texts are equal, if not raise an exception.
|
285 |
|
|
286 |
This is intended for use with multi-line strings where it can
|
|
287 |
be hard to find the differences by eye.
|
|
288 |
"""
|
|
289 |
# TODO: perhaps override assertEquals to call this for strings?
|
|
290 |
if a == b: |
|
291 |
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. |
292 |
if message is None: |
293 |
message = "texts not equal:\n" |
|
294 |
raise AssertionError(message + |
|
1185.16.16
by Martin Pool
- add TestCase.assertEqualDiffs helper |
295 |
self._ndiff_strings(a, b)) |
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
296 |
|
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. |
297 |
def assertEqualMode(self, mode, mode_test): |
298 |
self.assertEqual(mode, mode_test, |
|
299 |
'mode mismatch %o != %o' % (mode, mode_test)) |
|
300 |
||
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
301 |
def assertStartsWith(self, s, prefix): |
302 |
if not s.startswith(prefix): |
|
303 |
raise AssertionError('string %r does not start with %r' % (s, prefix)) |
|
304 |
||
305 |
def assertEndsWith(self, s, suffix): |
|
306 |
if not s.endswith(prefix): |
|
307 |
raise AssertionError('string %r does not end with %r' % (s, suffix)) |
|
1185.16.42
by Martin Pool
- Add assertContainsRe |
308 |
|
309 |
def assertContainsRe(self, haystack, needle_re): |
|
310 |
"""Assert that a contains something matching a regular expression."""
|
|
311 |
if not re.search(needle_re, haystack): |
|
312 |
raise AssertionError('pattern "%s" not found in "%s"' |
|
313 |
% (needle_re, haystack)) |
|
1442.1.70
by Robert Collins
Add assertFileEqual to TestCaseInTempDir. |
314 |
|
1553.5.3
by Martin Pool
[patch] Rename TestCase.AssertSubset to assertSubset for consistency (Jan Hudec) |
315 |
def assertSubset(self, sublist, superlist): |
1185.46.8
by Aaron Bentley
bzr add reports ignored patterns. |
316 |
"""Assert that every entry in sublist is present in superlist."""
|
317 |
missing = [] |
|
318 |
for entry in sublist: |
|
319 |
if entry not in superlist: |
|
320 |
missing.append(entry) |
|
321 |
if len(missing) > 0: |
|
322 |
raise AssertionError("value(s) %r not present in container %r" % |
|
323 |
(missing, superlist)) |
|
324 |
||
1185.68.1
by Aaron Bentley
test transactions |
325 |
def assertIs(self, left, right): |
326 |
if not (left is right): |
|
327 |
raise AssertionError("%r is not %r." % (left, right)) |
|
328 |
||
1530.1.21
by Robert Collins
Review feedback fixes. |
329 |
def assertTransportMode(self, transport, path, mode): |
1530.1.17
by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible. |
330 |
"""Fail if a path does not have mode mode.
|
331 |
|
|
1651.1.3
by Martin Pool
Use transport._can_roundtrip_unix_modebits to decide whether to check transport results |
332 |
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. |
333 |
"""
|
1651.1.3
by Martin Pool
Use transport._can_roundtrip_unix_modebits to decide whether to check transport results |
334 |
if not transport._can_roundtrip_unix_modebits(): |
1530.1.17
by Robert Collins
Move check_mode to TestCase.assertMode to make it generally accessible. |
335 |
return
|
336 |
path_stat = transport.stat(path) |
|
337 |
actual_mode = stat.S_IMODE(path_stat.st_mode) |
|
338 |
self.assertEqual(mode, actual_mode, |
|
339 |
'mode of %r incorrect (%o != %o)' % (path, mode, actual_mode)) |
|
340 |
||
1540.3.22
by Martin Pool
[patch] Add TestCase.assertIsInstance |
341 |
def assertIsInstance(self, obj, kls): |
342 |
"""Fail if obj is not an instance of kls"""
|
|
343 |
if not isinstance(obj, kls): |
|
344 |
self.fail("%r is not an instance of %s" % (obj, kls)) |
|
345 |
||
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
346 |
def _startLogFile(self): |
347 |
"""Send bzr and test log messages to a temporary file.
|
|
348 |
||
349 |
The file is removed as the test is torn down.
|
|
350 |
"""
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
351 |
fileno, name = tempfile.mkstemp(suffix='.log', prefix='testbzr') |
1185.52.1
by James Henstridge
Don't encode unicode messages to UTF-8 in mutter() (the stream writer does it). |
352 |
encoder, decoder, stream_reader, stream_writer = codecs.lookup('UTF-8') |
353 |
self._log_file = stream_writer(os.fdopen(fileno, 'w+')) |
|
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
354 |
self._log_nonce = bzrlib.trace.enable_test_log(self._log_file) |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
355 |
self._log_file_name = name |
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
356 |
self.addCleanup(self._finishLogFile) |
357 |
||
358 |
def _finishLogFile(self): |
|
359 |
"""Finished with the log file.
|
|
360 |
||
361 |
Read contents into memory, close, and delete.
|
|
362 |
"""
|
|
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. |
363 |
bzrlib.trace.disable_test_log(self._log_nonce) |
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
364 |
self._log_file.seek(0) |
365 |
self._log_contents = self._log_file.read() |
|
1185.16.122
by Martin Pool
[patch] Close test log file before deleting, needed on Windows |
366 |
self._log_file.close() |
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
367 |
os.remove(self._log_file_name) |
368 |
self._log_file = self._log_file_name = None |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
369 |
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
370 |
def addCleanup(self, callable): |
371 |
"""Arrange to run a callable when this case is torn down.
|
|
372 |
||
373 |
Callables are run in the reverse of the order they are registered,
|
|
374 |
ie last-in first-out.
|
|
375 |
"""
|
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
376 |
if callable in self._cleanups: |
377 |
raise ValueError("cleanup function %r already registered on %s" |
|
378 |
% (callable, self)) |
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
379 |
self._cleanups.append(callable) |
380 |
||
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
381 |
def _cleanEnvironment(self): |
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
382 |
new_env = { |
383 |
'HOME': os.getcwd(), |
|
384 |
'APPDATA': os.getcwd(), |
|
385 |
'BZREMAIL': None, |
|
386 |
'EMAIL': None, |
|
387 |
}
|
|
1185.38.4
by John Arbash Meinel
Making old_env a private member |
388 |
self.__old_env = {} |
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
389 |
self.addCleanup(self._restoreEnvironment) |
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
390 |
for name, value in new_env.iteritems(): |
391 |
self._captureVar(name, value) |
|
392 |
||
393 |
||
394 |
def _captureVar(self, name, newvalue): |
|
395 |
"""Set an environment variable, preparing it to be reset when finished."""
|
|
1185.38.4
by John Arbash Meinel
Making old_env a private member |
396 |
self.__old_env[name] = os.environ.get(name, None) |
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
397 |
if newvalue is None: |
398 |
if name in os.environ: |
|
399 |
del os.environ[name] |
|
400 |
else: |
|
401 |
os.environ[name] = newvalue |
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
402 |
|
1185.38.2
by John Arbash Meinel
[patch] Aaron Bentley's HOME fix. |
403 |
@staticmethod
|
404 |
def _restoreVar(name, value): |
|
405 |
if value is None: |
|
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
406 |
if name in os.environ: |
407 |
del os.environ[name] |
|
1185.38.2
by John Arbash Meinel
[patch] Aaron Bentley's HOME fix. |
408 |
else: |
409 |
os.environ[name] = value |
|
410 |
||
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
411 |
def _restoreEnvironment(self): |
1185.38.4
by John Arbash Meinel
Making old_env a private member |
412 |
for name, value in self.__old_env.iteritems(): |
1185.38.3
by John Arbash Meinel
Refactored environment cleaning code |
413 |
self._restoreVar(name, value) |
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
414 |
|
415 |
def tearDown(self): |
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
416 |
self._runCleanups() |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
417 |
unittest.TestCase.tearDown(self) |
418 |
||
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
419 |
def _runCleanups(self): |
420 |
"""Run registered cleanup functions.
|
|
421 |
||
422 |
This should only be called from TestCase.tearDown.
|
|
423 |
"""
|
|
1541
by Martin Pool
doc |
424 |
# TODO: Perhaps this should keep running cleanups even if
|
425 |
# one of them fails?
|
|
1185.33.74
by Martin Pool
pychecker cleanups |
426 |
for cleanup_fn in reversed(self._cleanups): |
427 |
cleanup_fn() |
|
1185.16.108
by mbp at sourcefrog
Add TestCase.addCleanup method. |
428 |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
429 |
def log(self, *args): |
1185.43.1
by Martin Pool
Remove direct logging calls from selftest |
430 |
mutter(*args) |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
431 |
|
432 |
def _get_log(self): |
|
433 |
"""Return as a string the log for this test"""
|
|
1185.16.14
by Martin Pool
- make TestCase._get_log work even if setup was aborted |
434 |
if self._log_file_name: |
435 |
return open(self._log_file_name).read() |
|
436 |
else: |
|
1185.16.109
by mbp at sourcefrog
Clean up test log files when tests complete. |
437 |
return self._log_contents |
1185.43.1
by Martin Pool
Remove direct logging calls from selftest |
438 |
# TODO: Delete the log after it's been read in
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
439 |
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
440 |
def capture(self, cmd, retcode=0): |
1185.3.26
by Martin Pool
- remove remaining external executions of bzr |
441 |
"""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. |
442 |
return self.run_bzr_captured(cmd.split(), retcode=retcode)[0] |
1185.3.26
by Martin Pool
- remove remaining external executions of bzr |
443 |
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
444 |
def run_bzr_captured(self, argv, retcode=0): |
1185.22.7
by Michael Ellerman
Fix error in run_bzr_captured() doco |
445 |
"""Invoke bzr and return (stdout, stderr).
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
446 |
|
447 |
Useful for code that wants to check the contents of the
|
|
448 |
output, the way error messages are presented, etc.
|
|
449 |
||
450 |
This should be the main method for tests that want to exercise the
|
|
451 |
overall behavior of the bzr application (rather than a unit test
|
|
452 |
or a functional test of the library.)
|
|
453 |
||
454 |
Much of the old code runs bzr by forking a new copy of Python, but
|
|
455 |
that is slower, harder to debug, and generally not necessary.
|
|
456 |
||
1185.3.20
by Martin Pool
- run_bzr_captured also includes logged errors in |
457 |
This runs bzr through the interface that catches and reports
|
458 |
errors, and with logging set to something approximating the
|
|
459 |
default, so that error reporting can be checked.
|
|
460 |
||
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
461 |
argv -- arguments to invoke bzr
|
462 |
retcode -- expected return code, or None for don't-care.
|
|
463 |
"""
|
|
464 |
stdout = StringIO() |
|
465 |
stderr = StringIO() |
|
466 |
self.log('run bzr: %s', ' '.join(argv)) |
|
1185.43.5
by Martin Pool
Update log message quoting |
467 |
# FIXME: don't call into logging here
|
1185.3.20
by Martin Pool
- run_bzr_captured also includes logged errors in |
468 |
handler = logging.StreamHandler(stderr) |
469 |
handler.setFormatter(bzrlib.trace.QuietFormatter()) |
|
470 |
handler.setLevel(logging.INFO) |
|
471 |
logger = logging.getLogger('') |
|
472 |
logger.addHandler(handler) |
|
473 |
try: |
|
474 |
result = self.apply_redirected(None, stdout, stderr, |
|
475 |
bzrlib.commands.run_bzr_catch_errors, |
|
476 |
argv) |
|
477 |
finally: |
|
478 |
logger.removeHandler(handler) |
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
479 |
out = stdout.getvalue() |
480 |
err = stderr.getvalue() |
|
481 |
if out: |
|
482 |
self.log('output:\n%s', out) |
|
483 |
if err: |
|
484 |
self.log('errors:\n%s', err) |
|
485 |
if retcode is not None: |
|
486 |
self.assertEquals(result, retcode) |
|
487 |
return out, err |
|
488 |
||
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
489 |
def run_bzr(self, *args, **kwargs): |
1119
by Martin Pool
doc |
490 |
"""Invoke bzr, as if it were run from the command line.
|
491 |
||
492 |
This should be the main method for tests that want to exercise the
|
|
493 |
overall behavior of the bzr application (rather than a unit test
|
|
494 |
or a functional test of the library.)
|
|
495 |
||
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
496 |
This sends the stdout/stderr results into the test's log,
|
497 |
where it may be useful for debugging. See also run_captured.
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
498 |
"""
|
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
499 |
retcode = kwargs.pop('retcode', 0) |
1185.3.21
by Martin Pool
TestBase.run_bzr doesn't need to be deprecated |
500 |
return self.run_bzr_captured(args, retcode) |
1185.3.18
by Martin Pool
- add new helper TestBase.run_bzr_captured |
501 |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
502 |
def check_inventory_shape(self, inv, shape): |
1291
by Martin Pool
- add test for moving files between directories |
503 |
"""Compare an inventory to a list of expected names.
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
504 |
|
505 |
Fail if they are not precisely equal.
|
|
506 |
"""
|
|
507 |
extras = [] |
|
508 |
shape = list(shape) # copy |
|
509 |
for path, ie in inv.entries(): |
|
510 |
name = path.replace('\\', '/') |
|
511 |
if ie.kind == 'dir': |
|
512 |
name = name + '/' |
|
513 |
if name in shape: |
|
514 |
shape.remove(name) |
|
515 |
else: |
|
516 |
extras.append(name) |
|
517 |
if shape: |
|
518 |
self.fail("expected paths not found in inventory: %r" % shape) |
|
519 |
if extras: |
|
520 |
self.fail("unexpected paths found in inventory: %r" % extras) |
|
521 |
||
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
522 |
def apply_redirected(self, stdin=None, stdout=None, stderr=None, |
523 |
a_callable=None, *args, **kwargs): |
|
524 |
"""Call callable with redirected std io pipes.
|
|
525 |
||
526 |
Returns the return code."""
|
|
527 |
if not callable(a_callable): |
|
528 |
raise ValueError("a_callable must be callable.") |
|
529 |
if stdin is None: |
|
530 |
stdin = StringIO("") |
|
531 |
if stdout is None: |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
532 |
if getattr(self, "_log_file", None) is not None: |
974.1.70
by Aaron Bentley
Fixed selftest spewage (Brian M. Carlson) |
533 |
stdout = self._log_file |
534 |
else: |
|
535 |
stdout = StringIO() |
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
536 |
if stderr is None: |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
537 |
if getattr(self, "_log_file", None is not None): |
974.1.70
by Aaron Bentley
Fixed selftest spewage (Brian M. Carlson) |
538 |
stderr = self._log_file |
539 |
else: |
|
540 |
stderr = StringIO() |
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
541 |
real_stdin = sys.stdin |
542 |
real_stdout = sys.stdout |
|
543 |
real_stderr = sys.stderr |
|
544 |
try: |
|
545 |
sys.stdout = stdout |
|
546 |
sys.stderr = stderr |
|
547 |
sys.stdin = stdin |
|
1160
by Martin Pool
- tiny refactoring |
548 |
return a_callable(*args, **kwargs) |
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
549 |
finally: |
550 |
sys.stdout = real_stdout |
|
551 |
sys.stderr = real_stderr |
|
552 |
sys.stdin = real_stdin |
|
553 |
||
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
554 |
def merge(self, branch_from, wt_to): |
555 |
"""A helper for tests to do a ui-less merge.
|
|
556 |
||
557 |
This should move to the main library when someone has time to integrate
|
|
558 |
it in.
|
|
559 |
"""
|
|
560 |
# minimal ui-less merge.
|
|
561 |
wt_to.branch.fetch(branch_from) |
|
562 |
base_rev = common_ancestor(branch_from.last_revision(), |
|
563 |
wt_to.branch.last_revision(), |
|
564 |
wt_to.branch.repository) |
|
565 |
merge_inner(wt_to.branch, branch_from.basis_tree(), |
|
566 |
wt_to.branch.repository.revision_tree(base_rev), |
|
567 |
this_tree=wt_to) |
|
568 |
wt_to.add_pending_merge(branch_from.last_revision()) |
|
569 |
||
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
570 |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
571 |
BzrTestBase = TestCase |
572 |
||
573 |
||
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
574 |
class TestCaseInTempDir(TestCase): |
575 |
"""Derived class that runs a test within a temporary directory.
|
|
576 |
||
577 |
This is useful for tests that need to create a branch, etc.
|
|
578 |
||
579 |
The directory is created in a slightly complex way: for each
|
|
580 |
Python invocation, a new temporary top-level directory is created.
|
|
581 |
All test cases create their own directory within that. If the
|
|
582 |
tests complete successfully, the directory is removed.
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
583 |
|
584 |
InTempDir is an old alias for FunctionalTestCase.
|
|
585 |
"""
|
|
586 |
||
587 |
TEST_ROOT = None |
|
588 |
_TEST_NAME = 'test' |
|
589 |
OVERRIDE_PYTHON = 'python' |
|
590 |
||
591 |
def check_file_contents(self, filename, expect): |
|
592 |
self.log("check contents of file %s" % filename) |
|
593 |
contents = file(filename, 'r').read() |
|
594 |
if contents != expect: |
|
595 |
self.log("expected: %r" % expect) |
|
596 |
self.log("actually: %r" % contents) |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
597 |
self.fail("contents of %s not as expected" % filename) |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
598 |
|
599 |
def _make_test_root(self): |
|
1141
by Martin Pool
- rename FunctionalTest to TestCaseInTempDir |
600 |
if TestCaseInTempDir.TEST_ROOT is not None: |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
601 |
return
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
602 |
i = 0 |
603 |
while True: |
|
1185.16.147
by Martin Pool
[patch] Test base directory must be unicode (from Alexander) |
604 |
root = u'test%04d.tmp' % i |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
605 |
try: |
606 |
os.mkdir(root) |
|
607 |
except OSError, e: |
|
608 |
if e.errno == errno.EEXIST: |
|
609 |
i += 1 |
|
610 |
continue
|
|
611 |
else: |
|
612 |
raise
|
|
613 |
# successfully created
|
|
1185.31.37
by John Arbash Meinel
Switched os.path.abspath and os.path.realpath to osutils.* (still passes on cygwin) |
614 |
TestCaseInTempDir.TEST_ROOT = osutils.abspath(root) |
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
615 |
break
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
616 |
# make a fake bzr directory there to prevent any tests propagating
|
617 |
# 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. |
618 |
bzrdir.BzrDir.create_standalone_workingtree(TestCaseInTempDir.TEST_ROOT) |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
619 |
|
620 |
def setUp(self): |
|
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
621 |
super(TestCaseInTempDir, self).setUp() |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
622 |
self._make_test_root() |
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
623 |
_currentdir = os.getcwdu() |
1551.6.2
by Aaron Bentley
Added explanatory comment |
624 |
# 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 |
625 |
short_id = self.id().replace('bzrlib.tests.', '') \ |
1551.6.3
by Aaron Bentley
Updated from dev |
626 |
.replace('__main__.', '')[-100:] |
1540.3.20
by Martin Pool
Construct unique test directory names even when test ids recurr |
627 |
# it's possible the same test class is run several times for
|
628 |
# parameterized tests, so make sure the names don't collide.
|
|
629 |
i = 0 |
|
630 |
while True: |
|
631 |
if i > 0: |
|
632 |
candidate_dir = '%s/%s.%d' % (self.TEST_ROOT, short_id, i) |
|
633 |
else: |
|
634 |
candidate_dir = '%s/%s' % (self.TEST_ROOT, short_id) |
|
635 |
if os.path.exists(candidate_dir): |
|
636 |
i = i + 1 |
|
637 |
continue
|
|
638 |
else: |
|
639 |
self.test_dir = candidate_dir |
|
640 |
os.mkdir(self.test_dir) |
|
641 |
os.chdir(self.test_dir) |
|
642 |
break
|
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
643 |
os.environ['HOME'] = self.test_dir |
1185.31.39
by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(), |
644 |
os.environ['APPDATA'] = self.test_dir |
1185.16.110
by mbp at sourcefrog
Refactor test setup/teardown into cleanup callbacks |
645 |
def _leaveDirectory(): |
646 |
os.chdir(_currentdir) |
|
647 |
self.addCleanup(_leaveDirectory) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
648 |
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
649 |
def build_tree(self, shape, line_endings='native', transport=None): |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
650 |
"""Build a test tree according to a pattern.
|
651 |
||
652 |
shape is a sequence of file specifications. If the final
|
|
653 |
character is '/', a directory is created.
|
|
654 |
||
655 |
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 |
656 |
:param line_endings: Either 'binary' or 'native'
|
657 |
in binary mode, exact contents are written
|
|
658 |
in native mode, the line endings match the
|
|
659 |
default platform endings.
|
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
660 |
|
661 |
:param transport: A transport to write to, for building trees on
|
|
662 |
VFS's. If the transport is readonly or None,
|
|
663 |
"." is opened automatically.
|
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
664 |
"""
|
665 |
# XXX: It's OK to just create them using forward slashes on windows?
|
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
666 |
if transport is None or transport.is_readonly(): |
1553.5.9
by Martin Pool
Add TestCaseWithTransport.get_transport and get_readonly_transport |
667 |
transport = get_transport(".") |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
668 |
for name in shape: |
1185.16.145
by Martin Pool
Remove all assert statements from test cases. |
669 |
self.assert_(isinstance(name, basestring)) |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
670 |
if name[-1] == '/': |
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
671 |
transport.mkdir(urlescape(name[:-1])) |
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
672 |
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 |
673 |
if line_endings == 'binary': |
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
674 |
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 |
675 |
elif line_endings == 'native': |
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
676 |
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 |
677 |
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. |
678 |
raise errors.BzrError('Invalid line ending request %r' % (line_endings,)) |
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
679 |
content = "contents of %s%s" % (name, end) |
680 |
transport.put(urlescape(name), StringIO(content)) |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
681 |
|
1185.16.53
by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests |
682 |
def build_tree_contents(self, shape): |
1514
by Robert Collins
Unbreak self.build_tree_shape in tests. |
683 |
build_tree_contents(shape) |
1185.16.53
by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests |
684 |
|
1405
by Robert Collins
remove some of the upgrade code that was duplicated with inventory_entry, and give all inventory entries a weave |
685 |
def failUnlessExists(self, path): |
686 |
"""Fail unless path, which may be abs or relative, exists."""
|
|
1448
by Robert Collins
revert symlinks correctly |
687 |
self.failUnless(osutils.lexists(path)) |
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
688 |
|
689 |
def failIfExists(self, path): |
|
690 |
"""Fail if path, which may be abs or relative, exists."""
|
|
691 |
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 |
692 |
|
1442.1.70
by Robert Collins
Add assertFileEqual to TestCaseInTempDir. |
693 |
def assertFileEqual(self, content, path): |
694 |
"""Fail if path does not contain 'content'."""
|
|
695 |
self.failUnless(osutils.lexists(path)) |
|
696 |
self.assertEqualDiff(content, open(path, 'r').read()) |
|
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
697 |
|
1123
by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest |
698 |
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
699 |
class TestCaseWithTransport(TestCaseInTempDir): |
700 |
"""A test case that provides get_url and get_readonly_url facilities.
|
|
701 |
||
702 |
These back onto two transport servers, one for readonly access and one for
|
|
703 |
read write access.
|
|
704 |
||
705 |
If no explicit class is provided for readonly access, a
|
|
706 |
ReadonlyTransportDecorator is used instead which allows the use of non disk
|
|
707 |
based read write transports.
|
|
708 |
||
709 |
If an explicit class is provided for readonly access, that server and the
|
|
710 |
readwrite one must both define get_url() as resolving to os.getcwd().
|
|
711 |
"""
|
|
712 |
||
713 |
def __init__(self, methodName='testMethod'): |
|
714 |
super(TestCaseWithTransport, self).__init__(methodName) |
|
715 |
self.__readonly_server = None |
|
716 |
self.__server = None |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
717 |
self.transport_server = default_transport |
1534.4.13
by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url. |
718 |
self.transport_readonly_server = None |
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
719 |
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
720 |
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. |
721 |
"""Get a URL for the readonly transport.
|
722 |
||
723 |
This will either be backed by '.' or a decorator to the transport
|
|
724 |
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. |
725 |
relpath provides for clients to get a path relative to the base url.
|
726 |
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. |
727 |
"""
|
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. |
728 |
base = self.get_readonly_server().get_url() |
729 |
if relpath is not None: |
|
730 |
if not base.endswith('/'): |
|
731 |
base = base + '/' |
|
732 |
base = base + relpath |
|
733 |
return base |
|
734 |
||
735 |
def get_readonly_server(self): |
|
736 |
"""Get the server instance for the readonly transport
|
|
737 |
||
738 |
This is useful for some tests with specific servers to do diagnostics.
|
|
739 |
"""
|
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
740 |
if self.__readonly_server is None: |
741 |
if self.transport_readonly_server is None: |
|
742 |
# readonly decorator requested
|
|
743 |
# bring up the server
|
|
744 |
self.get_url() |
|
745 |
self.__readonly_server = ReadonlyServer() |
|
746 |
self.__readonly_server.setUp(self.__server) |
|
747 |
else: |
|
748 |
self.__readonly_server = self.transport_readonly_server() |
|
749 |
self.__readonly_server.setUp() |
|
750 |
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. |
751 |
return self.__readonly_server |
752 |
||
753 |
def get_server(self): |
|
754 |
"""Get the read/write server instance.
|
|
755 |
||
756 |
This is useful for some tests with specific servers that need
|
|
757 |
diagnostics.
|
|
758 |
"""
|
|
759 |
if self.__server is None: |
|
760 |
self.__server = self.transport_server() |
|
761 |
self.__server.setUp() |
|
762 |
self.addCleanup(self.__server.tearDown) |
|
763 |
return self.__server |
|
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
764 |
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
765 |
def get_url(self, relpath=None): |
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
766 |
"""Get a URL for the readwrite transport.
|
767 |
||
768 |
This will either be backed by '.' or to an equivalent non-file based
|
|
769 |
facility.
|
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
770 |
relpath provides for clients to get a path relative to the base url.
|
771 |
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. |
772 |
"""
|
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. |
773 |
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. |
774 |
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. |
775 |
if not base.endswith('/'): |
776 |
base = base + '/' |
|
777 |
base = base + relpath |
|
778 |
return base |
|
779 |
||
1553.5.9
by Martin Pool
Add TestCaseWithTransport.get_transport and get_readonly_transport |
780 |
def get_transport(self): |
781 |
"""Return a writeable transport for the test scratch space"""
|
|
782 |
t = get_transport(self.get_url()) |
|
783 |
self.assertFalse(t.is_readonly()) |
|
784 |
return t |
|
785 |
||
786 |
def get_readonly_transport(self): |
|
787 |
"""Return a readonly transport for the test scratch space
|
|
788 |
|
|
789 |
This can be used to test that operations which should only need
|
|
790 |
readonly access in fact do not try to write.
|
|
791 |
"""
|
|
792 |
t = get_transport(self.get_readonly_url()) |
|
793 |
self.assertTrue(t.is_readonly()) |
|
794 |
return t |
|
795 |
||
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
796 |
def make_branch(self, relpath): |
797 |
"""Create a branch on the transport at relpath."""
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
798 |
repo = self.make_repository(relpath) |
799 |
return repo.bzrdir.create_branch() |
|
800 |
||
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
801 |
def make_bzrdir(self, relpath): |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
802 |
try: |
803 |
url = self.get_url(relpath) |
|
804 |
segments = relpath.split('/') |
|
805 |
if segments and segments[-1] not in ('', '.'): |
|
806 |
parent = self.get_url('/'.join(segments[:-1])) |
|
1553.5.9
by Martin Pool
Add TestCaseWithTransport.get_transport and get_readonly_transport |
807 |
t = get_transport(parent) |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
808 |
try: |
809 |
t.mkdir(segments[-1]) |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
810 |
except errors.FileExists: |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
811 |
pass
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
812 |
return bzrlib.bzrdir.BzrDir.create(url) |
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. |
813 |
except errors.UninitializableFormat: |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
814 |
raise TestSkipped("Format %s is not initializable.") |
815 |
||
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. |
816 |
def make_repository(self, relpath, shared=False): |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
817 |
"""Create a repository on our default transport at relpath."""
|
818 |
made_control = self.make_bzrdir(relpath) |
|
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. |
819 |
return made_control.create_repository(shared=shared) |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
820 |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
821 |
def make_branch_and_tree(self, relpath): |
822 |
"""Create a branch on the transport and a tree locally.
|
|
823 |
||
824 |
Returns the tree.
|
|
825 |
"""
|
|
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. |
826 |
# TODO: always use the local disk path for the working tree,
|
827 |
# this obviously requires a format that supports branch references
|
|
828 |
# so check for that by checking bzrdir.BzrDirFormat.get_default_format()
|
|
829 |
# RBC 20060208
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
830 |
b = self.make_branch(relpath) |
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
831 |
try: |
832 |
return b.bzrdir.create_workingtree() |
|
833 |
except errors.NotLocalUrl: |
|
834 |
# new formats - catch No tree error and create
|
|
835 |
# a branch reference and a checkout.
|
|
836 |
# old formats at that point - raise TestSkipped.
|
|
837 |
# TODO: rbc 20060208
|
|
838 |
return WorkingTreeFormat2().initialize(bzrdir.BzrDir.open(relpath)) |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
839 |
|
1553.5.68
by Martin Pool
Add new TestCaseWithTransport.assertIsDirectory() and tests |
840 |
def assertIsDirectory(self, relpath, transport): |
841 |
"""Assert that relpath within transport is a directory.
|
|
842 |
||
843 |
This may not be possible on all transports; in that case it propagates
|
|
844 |
a TransportNotPossible.
|
|
845 |
"""
|
|
846 |
try: |
|
847 |
mode = transport.stat(relpath).st_mode |
|
848 |
except errors.NoSuchFile: |
|
849 |
self.fail("path %s is not a directory; no such file" |
|
850 |
% (relpath)) |
|
851 |
if not stat.S_ISDIR(mode): |
|
852 |
self.fail("path %s is not a directory; has mode %#o" |
|
853 |
% (relpath, mode)) |
|
854 |
||
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
855 |
|
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
856 |
class ChrootedTestCase(TestCaseWithTransport): |
857 |
"""A support class that provides readonly urls outside the local namespace.
|
|
858 |
||
859 |
This is done by checking if self.transport_server is a MemoryServer. if it
|
|
860 |
is then we are chrooted already, if it is not then an HttpServer is used
|
|
861 |
for readonly urls.
|
|
862 |
||
863 |
TODO RBC 20060127: make this an option to TestCaseWithTransport so it can
|
|
864 |
be used without needed to redo it when a different
|
|
865 |
subclass is in use ?
|
|
866 |
"""
|
|
867 |
||
868 |
def setUp(self): |
|
869 |
super(ChrootedTestCase, self).setUp() |
|
870 |
if not self.transport_server == bzrlib.transport.memory.MemoryServer: |
|
871 |
self.transport_readonly_server = bzrlib.transport.http.HttpServer |
|
872 |
||
873 |
||
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
874 |
def filter_suite_by_re(suite, pattern): |
1185.33.74
by Martin Pool
pychecker cleanups |
875 |
result = TestSuite() |
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
876 |
filter_re = re.compile(pattern) |
877 |
for test in iter_suite_tests(suite): |
|
1185.1.57
by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls. |
878 |
if filter_re.search(test.id()): |
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
879 |
result.addTest(test) |
880 |
return result |
|
881 |
||
882 |
||
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
883 |
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. |
884 |
stop_on_failure=False, keep_output=False, |
885 |
transport=None): |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
886 |
TestCaseInTempDir._TEST_NAME = name |
887 |
if verbose: |
|
888 |
verbosity = 2 |
|
889 |
else: |
|
890 |
verbosity = 1 |
|
891 |
runner = TextTestRunner(stream=sys.stdout, |
|
892 |
descriptions=0, |
|
893 |
verbosity=verbosity) |
|
1185.16.58
by mbp at sourcefrog
- run all selftests by default |
894 |
runner.stop_on_failure=stop_on_failure |
1393.1.46
by Martin Pool
- bzr selftest arguments can be partial ids of tests to run |
895 |
if pattern != '.*': |
896 |
suite = filter_suite_by_re(suite, pattern) |
|
897 |
result = runner.run(suite) |
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
898 |
# This is still a little bogus,
|
899 |
# but only a little. Folk not using our testrunner will
|
|
900 |
# have to delete their temp directories themselves.
|
|
1610.1.6
by Martin Pool
Show a message while deleting the test directories |
901 |
test_root = TestCaseInTempDir.TEST_ROOT |
1185.35.20
by Aaron Bentley
Only keep test failure directories if --keep-output is specified |
902 |
if result.wasSuccessful() or not keep_output: |
1610.1.6
by Martin Pool
Show a message while deleting the test directories |
903 |
if test_root is not None: |
904 |
print 'Deleting test root %s...' % test_root |
|
905 |
try: |
|
906 |
shutil.rmtree(test_root) |
|
907 |
finally: |
|
908 |
print
|
|
1393.1.6
by Martin Pool
- fold testsweet into bzrlib.selftest |
909 |
else: |
910 |
print "Failed tests working directories are in '%s'\n" % TestCaseInTempDir.TEST_ROOT |
|
911 |
return result.wasSuccessful() |
|
912 |
||
913 |
||
1185.35.20
by Aaron Bentley
Only keep test failure directories if --keep-output is specified |
914 |
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. |
915 |
keep_output=False, |
916 |
transport=None): |
|
1204
by Martin Pool
doc |
917 |
"""Run the whole test suite under the enhanced runner"""
|
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
918 |
global default_transport |
919 |
if transport is None: |
|
920 |
transport = default_transport |
|
921 |
old_transport = default_transport |
|
922 |
default_transport = transport |
|
923 |
suite = test_suite() |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
924 |
try: |
925 |
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. |
926 |
stop_on_failure=stop_on_failure, keep_output=keep_output, |
927 |
transport=transport) |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
928 |
finally: |
929 |
default_transport = old_transport |
|
930 |
||
1092.1.17
by Robert Collins
remove TEST_CLASSES dead code and provide a bzrlib.test_suite() convenience method |
931 |
|
932 |
||
933 |
def test_suite(): |
|
1204
by Martin Pool
doc |
934 |
"""Build and return TestSuite for the whole program."""
|
721
by Martin Pool
- framework for running external commands from unittest suite |
935 |
from doctest import DocTestSuite |
936 |
||
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
937 |
global MODULES_TO_DOCTEST |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
938 |
|
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
939 |
testmod_names = [ \ |
1518
by Robert Collins
Merge from mbp. |
940 |
'bzrlib.tests.test_ancestry', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
941 |
'bzrlib.tests.test_annotate', |
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
942 |
'bzrlib.tests.test_api', |
1518
by Robert Collins
Merge from mbp. |
943 |
'bzrlib.tests.test_bad_files', |
1185.50.21
by John Arbash Meinel
Added a test for basis-inventory, which should have happened before. |
944 |
'bzrlib.tests.test_basis_inventory', |
1518
by Robert Collins
Merge from mbp. |
945 |
'bzrlib.tests.test_branch', |
1534.4.39
by Robert Collins
Basic BzrDir support. |
946 |
'bzrlib.tests.test_bzrdir', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
947 |
'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 |
948 |
'bzrlib.tests.test_commit', |
949 |
'bzrlib.tests.test_commit_merge', |
|
950 |
'bzrlib.tests.test_config', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
951 |
'bzrlib.tests.test_conflicts', |
1551.3.11
by Aaron Bentley
Merge from Robert |
952 |
'bzrlib.tests.test_decorators', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
953 |
'bzrlib.tests.test_diff', |
1551.3.11
by Aaron Bentley
Merge from Robert |
954 |
'bzrlib.tests.test_doc_generate', |
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
955 |
'bzrlib.tests.test_errors', |
1185.80.5
by John Arbash Meinel
Changing the escaping just a little bit. Now we can handle unicode characters. |
956 |
'bzrlib.tests.test_escaped_store', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
957 |
'bzrlib.tests.test_fetch', |
1518
by Robert Collins
Merge from mbp. |
958 |
'bzrlib.tests.test_gpg', |
959 |
'bzrlib.tests.test_graph', |
|
960 |
'bzrlib.tests.test_hashcache', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
961 |
'bzrlib.tests.test_http', |
1518
by Robert Collins
Merge from mbp. |
962 |
'bzrlib.tests.test_identitymap', |
963 |
'bzrlib.tests.test_inv', |
|
1563.2.4
by Robert Collins
First cut at including the knit implementation of versioned_file. |
964 |
'bzrlib.tests.test_knit', |
1553.5.12
by Martin Pool
New LockDir locking mechanism |
965 |
'bzrlib.tests.test_lockdir', |
1185.67.4
by Aaron Bentley
Throw if we try to write to a LockableFiles with no write lock |
966 |
'bzrlib.tests.test_lockable_files', |
1518
by Robert Collins
Merge from mbp. |
967 |
'bzrlib.tests.test_log', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
968 |
'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 |
969 |
'bzrlib.tests.test_merge3', |
1518
by Robert Collins
Merge from mbp. |
970 |
'bzrlib.tests.test_merge_core', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
971 |
'bzrlib.tests.test_missing', |
1518
by Robert Collins
Merge from mbp. |
972 |
'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 |
973 |
'bzrlib.tests.test_nonascii', |
1518
by Robert Collins
Merge from mbp. |
974 |
'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. |
975 |
'bzrlib.tests.test_osutils', |
1185.58.1
by John Arbash Meinel
Added new permissions test (currently don't pass) |
976 |
'bzrlib.tests.test_permissions', |
1515
by Robert Collins
* Plugins with the same name in different directories in the bzr plugin |
977 |
'bzrlib.tests.test_plugins', |
1551.2.27
by Aaron Bentley
Got propogation under test |
978 |
'bzrlib.tests.test_progress', |
1570.1.11
by Robert Collins
Make reconcile work with shared repositories. |
979 |
'bzrlib.tests.test_reconcile', |
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
980 |
'bzrlib.tests.test_repository', |
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
981 |
'bzrlib.tests.test_revision', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
982 |
'bzrlib.tests.test_revisionnamespaces', |
1518
by Robert Collins
Merge from mbp. |
983 |
'bzrlib.tests.test_revprops', |
1185.47.1
by Martin Pool
[broken] start converting basic_io to more rfc822-like format |
984 |
'bzrlib.tests.test_rio', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
985 |
'bzrlib.tests.test_sampler', |
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
986 |
'bzrlib.tests.test_selftest', |
1185.33.89
by Martin Pool
[patch] add a selftest test that the setup build script works (Alexander Belchenko) |
987 |
'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. |
988 |
'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 |
989 |
'bzrlib.tests.test_smart_add', |
1522
by Robert Collins
Test for the number of uses of self.working_tree() in branch.py |
990 |
'bzrlib.tests.test_source', |
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
991 |
'bzrlib.tests.test_store', |
1534.2.1
by Robert Collins
Implement deprecated_method |
992 |
'bzrlib.tests.test_symbol_versioning', |
1518
by Robert Collins
Merge from mbp. |
993 |
'bzrlib.tests.test_testament', |
994 |
'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 |
995 |
'bzrlib.tests.test_transactions', |
1534.7.1
by Aaron Bentley
Got creation of a versioned file working |
996 |
'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 |
997 |
'bzrlib.tests.test_transport', |
998 |
'bzrlib.tests.test_tsort', |
|
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
999 |
'bzrlib.tests.test_ui', |
1000 |
'bzrlib.tests.test_upgrade', |
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
1001 |
'bzrlib.tests.test_versionedfile', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1002 |
'bzrlib.tests.test_weave', |
1003 |
'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 |
1004 |
'bzrlib.tests.test_workingtree', |
1185.33.91
by Martin Pool
[merge] improved 'missing' command from aaron |
1005 |
'bzrlib.tests.test_xml', |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1006 |
]
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
1007 |
test_transport_implementations = [ |
1008 |
'bzrlib.tests.test_transport_implementations'] |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1009 |
|
1185.31.33
by John Arbash Meinel
A couple more path.join statements needed changing. |
1010 |
TestCase.BZRPATH = osutils.pathjoin( |
1011 |
osutils.realpath(osutils.dirname(bzrlib.__path__[0])), 'bzr') |
|
1185.31.57
by John Arbash Meinel
[merge] bzr.dev |
1012 |
print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0])) |
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
1013 |
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0]) |
744
by Martin Pool
- show nicer descriptions while running tests |
1014 |
print
|
721
by Martin Pool
- framework for running external commands from unittest suite |
1015 |
suite = TestSuite() |
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
1016 |
# python2.4's TestLoader.loadTestsFromNames gives very poor
|
1017 |
# errors if it fails to load a named module - no indication of what's
|
|
1018 |
# actually wrong, just "no such module". We should probably override that
|
|
1019 |
# class, but for the moment just load them ourselves. (mbp 20051202)
|
|
1020 |
loader = TestLoader() |
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
1021 |
from bzrlib.transport import TransportTestProviderAdapter |
1022 |
adapter = TransportTestProviderAdapter() |
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
1023 |
adapt_modules(test_transport_implementations, adapter, loader, suite) |
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
1024 |
for mod_name in testmod_names: |
1025 |
mod = _load_module_by_name(mod_name) |
|
1026 |
suite.addTest(loader.loadTestsFromModule(mod)) |
|
1513
by Robert Collins
Blackbox tests are maintained within the bzrlib.tests.blackbox directory. |
1027 |
for package in packages_to_test(): |
1028 |
suite.addTest(package.test_suite()) |
|
855
by Martin Pool
- Patch from John to allow plugins to add their own tests. |
1029 |
for m in MODULES_TO_TEST: |
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
1030 |
suite.addTest(loader.loadTestsFromModule(m)) |
855
by Martin Pool
- Patch from John to allow plugins to add their own tests. |
1031 |
for m in (MODULES_TO_DOCTEST): |
721
by Martin Pool
- framework for running external commands from unittest suite |
1032 |
suite.addTest(DocTestSuite(m)) |
1516
by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a |
1033 |
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. |
1034 |
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 |
1035 |
suite.addTest(plugin.test_suite()) |
1092.1.17
by Robert Collins
remove TEST_CLASSES dead code and provide a bzrlib.test_suite() convenience method |
1036 |
return suite |
764
by Martin Pool
- log messages from a particular test are printed if that test fails |
1037 |
|
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
1038 |
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
1039 |
def adapt_modules(mods_list, adapter, loader, suite): |
1040 |
"""Adapt the modules in mods_list using adapter and add to suite."""
|
|
1041 |
for mod_name in mods_list: |
|
1042 |
mod = _load_module_by_name(mod_name) |
|
1043 |
for test in iter_suite_tests(loader.loadTestsFromModule(mod)): |
|
1044 |
suite.addTests(adapter.adapt(test)) |
|
1045 |
||
1046 |
||
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
1047 |
def _load_module_by_name(mod_name): |
1048 |
parts = mod_name.split('.') |
|
1049 |
module = __import__(mod_name) |
|
1050 |
del parts[0] |
|
1051 |
# for historical reasons python returns the top-level module even though
|
|
1052 |
# it loads the submodule; we need to walk down to get the one we want.
|
|
1053 |
while parts: |
|
1054 |
module = getattr(module, parts.pop(0)) |
|
1055 |
return module |