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