5557.1.7
by John Arbash Meinel
Merge in the bzr.dev 5582 |
1 |
# Copyright (C) 2005-2011 Canonical Ltd
|
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
2 |
#
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
2052.3.1
by John Arbash Meinel
Add tests to cleanup the copyright of all source files |
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.
|
|
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
7 |
#
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
16 |
|
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
17 |
"""Tests for the test framework."""
|
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
18 |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
19 |
from cStringIO import StringIO |
5340.15.1
by John Arbash Meinel
supersede exc-info branch |
20 |
import gc |
5574.7.3
by Vincent Ladeuil
Some test infrastructure for tests.DocTestSuite. |
21 |
import doctest |
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
22 |
import os |
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
23 |
import signal |
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
24 |
import sys |
5412.1.3
by Martin
Add tests for test case thread leak detection |
25 |
import threading |
1707.2.3
by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool). |
26 |
import time |
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
27 |
import unittest |
1185.62.24
by John Arbash Meinel
Changing the exception that sftp.py throws when it can't find paramiko, so that the test suite can handle it. |
28 |
import warnings |
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
29 |
|
5495.1.1
by Andrew Bennetts
Remove unused definition of ForwardingResult, and switch all code to use the testtools name for it. Also remove a few unused imports. |
30 |
from testtools import ( |
31 |
ExtendedToOriginalDecorator, |
|
32 |
MultiTestResult, |
|
33 |
)
|
|
5050.33.2
by Andrew Bennetts
More robust fix for TestCase cloning, this time with tests. |
34 |
from testtools.content import Content |
4794.1.6
by Robert Collins
Add a details object to bzr tests containing the test log. May currently result in failures show the log twice (but will now show the log in --subunit mode [which includes --parallel]). |
35 |
from testtools.content_type import ContentType |
36 |
from testtools.matchers import ( |
|
37 |
DocTestMatches, |
|
38 |
Equals, |
|
39 |
)
|
|
5340.15.1
by John Arbash Meinel
supersede exc-info branch |
40 |
import testtools.testresult.doubles |
4794.1.2
by Robert Collins
First cut at testtools support: rename, remove TestCase.run() and change testcase tests to not assume the same instance runs (for cleaner testing at this point). |
41 |
|
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. |
42 |
import bzrlib |
1986.4.9
by Robert Collins
``TestCase.make_branch_and_memory_tree`` now takes a format |
43 |
from bzrlib import ( |
3567.4.12
by John Arbash Meinel
Expose the branch building framework to the test suite. |
44 |
branchbuilder, |
1986.4.9
by Robert Collins
``TestCase.make_branch_and_memory_tree`` now takes a format |
45 |
bzrdir, |
6472.2.1
by Jelmer Vernooij
Use bzrdir.controldir for generic access to control directories. |
46 |
controldir, |
2241.1.4
by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo. |
47 |
errors, |
5743.14.13
by Vincent Ladeuil
Some more doc and tests. |
48 |
hooks, |
3331.4.1
by Robert Collins
* -Dlock when passed to the selftest (e.g. ``bzr -Dlock selftest``) will |
49 |
lockdir, |
1986.4.9
by Robert Collins
``TestCase.make_branch_and_memory_tree`` now takes a format |
50 |
memorytree, |
51 |
osutils, |
|
3543.1.4
by Martin Pool
test_formats_to_scenarios uses real format objects |
52 |
remote, |
1986.4.9
by Robert Collins
``TestCase.make_branch_and_memory_tree`` now takes a format |
53 |
repository, |
2241.1.4
by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo. |
54 |
symbol_versioning, |
3193.1.1
by Vincent Ladeuil
Helper to filter test suite building by module when loading a list. |
55 |
tests, |
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
56 |
transport, |
3543.1.8
by Martin Pool
Update more scenario tests to use real format objects. |
57 |
workingtree, |
5816.5.4
by Jelmer Vernooij
Merge bzr.dev. |
58 |
workingtree_3, |
5816.2.4
by Jelmer Vernooij
Fix some imports. |
59 |
workingtree_4, |
1986.4.9
by Robert Collins
``TestCase.make_branch_and_memory_tree`` now takes a format |
60 |
)
|
3543.1.4
by Martin Pool
test_formats_to_scenarios uses real format objects |
61 |
from bzrlib.repofmt import ( |
4599.4.16
by Robert Collins
Update test_selftest for the 2a default format change. |
62 |
groupcompress_repo, |
3543.1.4
by Martin Pool
test_formats_to_scenarios uses real format objects |
63 |
)
|
2696.1.1
by Martin Pool
Remove things deprecated in 0.11 and earlier |
64 |
from bzrlib.symbol_versioning import ( |
3948.3.1
by Martin Pool
Remove old static deprecation template strings, and update style of their tests |
65 |
deprecated_function, |
66 |
deprecated_in, |
|
67 |
deprecated_method, |
|
3128.1.2
by Vincent Ladeuil
Tweak as per review feedback: s/randomise.*/randomize&/, 0.92 -> 1.0. |
68 |
)
|
1526.1.3
by Robert Collins
Merge from upstream. |
69 |
from bzrlib.tests import ( |
4913.2.17
by John Arbash Meinel
Found another paramiko dependent |
70 |
features, |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
71 |
test_lsprof, |
5017.3.24
by Vincent Ladeuil
selftest -s bt.test_selftest passing |
72 |
test_server, |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
73 |
TestUtil, |
74 |
)
|
|
5387.2.4
by John Arbash Meinel
Add tests for when we should and shouldn't get a 'log' in the details. |
75 |
from bzrlib.trace import note, mutter |
5017.3.24
by Vincent Ladeuil
selftest -s bt.test_selftest passing |
76 |
from bzrlib.transport import memory |
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
77 |
|
78 |
||
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
79 |
def _test_ids(test_suite): |
80 |
"""Get the ids for the tests in a test suite."""
|
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
81 |
return [t.id() for t in tests.iter_suite_tests(test_suite)] |
82 |
||
83 |
||
84 |
class MetaTestLog(tests.TestCase): |
|
1526.1.1
by Robert Collins
Run the test suite with no locale as well as the default locale. Also add a test for build_tree_shape to selftest. |
85 |
|
1185.51.1
by Martin Pool
Better message when failing to import a test suite. |
86 |
def test_logging(self): |
87 |
"""Test logs are captured when a test fails."""
|
|
88 |
self.log('a test message') |
|
4794.1.6
by Robert Collins
Add a details object to bzr tests containing the test log. May currently result in failures show the log twice (but will now show the log in --subunit mode [which includes --parallel]). |
89 |
details = self.getDetails() |
90 |
log = details['log'] |
|
91 |
self.assertThat(log.content_type, Equals(ContentType( |
|
92 |
"text", "plain", {"charset": "utf8"}))) |
|
4794.1.15
by Robert Collins
Review feedback. |
93 |
self.assertThat(u"".join(log.iter_text()), Equals(self.get_log())) |
94 |
self.assertThat(self.get_log(), |
|
5574.7.3
by Vincent Ladeuil
Some test infrastructure for tests.DocTestSuite. |
95 |
DocTestMatches(u"...a test message\n", doctest.ELLIPSIS)) |
1185.33.95
by Martin Pool
New TestSkipped facility, and tests for it. |
96 |
|
97 |
||
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
98 |
class TestTreeShape(tests.TestCaseInTempDir): |
1526.1.1
by Robert Collins
Run the test suite with no locale as well as the default locale. Also add a test for build_tree_shape to selftest. |
99 |
|
100 |
def test_unicode_paths(self): |
|
5967.12.3
by Martin Pool
Unify duplicated UnicodeFilename and _PosixPermissionsFeature |
101 |
self.requireFeature(features.UnicodeFilenameFeature) |
3287.20.2
by John Arbash Meinel
Raise a clear error about the offending filename when there is a filename with bad characters. |
102 |
|
1526.1.1
by Robert Collins
Run the test suite with no locale as well as the default locale. Also add a test for build_tree_shape to selftest. |
103 |
filename = u'hell\u00d8' |
3287.20.2
by John Arbash Meinel
Raise a clear error about the offending filename when there is a filename with bad characters. |
104 |
self.build_tree_contents([(filename, 'contents of hello')]) |
5784.1.3
by Martin Pool
Switch away from using failUnlessExists and failIfExists |
105 |
self.assertPathExists(filename) |
1526.1.3
by Robert Collins
Merge from upstream. |
106 |
|
107 |
||
5404.2.1
by John Arbash Meinel
Fix bug #627438 by restoring TestSuite and TestLoader. |
108 |
class TestClassesAvailable(tests.TestCase): |
109 |
"""As a convenience we expose Test* classes from bzrlib.tests"""
|
|
110 |
||
111 |
def test_test_case(self): |
|
112 |
from bzrlib.tests import TestCase |
|
113 |
||
114 |
def test_test_loader(self): |
|
115 |
from bzrlib.tests import TestLoader |
|
116 |
||
117 |
def test_test_suite(self): |
|
118 |
from bzrlib.tests import TestSuite |
|
119 |
||
120 |
||
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
121 |
class TestTransportScenarios(tests.TestCase): |
1530.1.21
by Robert Collins
Review feedback fixes. |
122 |
"""A group of tests that test the transport implementation adaption core.
|
123 |
||
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
124 |
This is a meta test that the tests are applied to all available
|
1551.1.1
by Martin Pool
[merge] branch-formats branch, and reconcile changes |
125 |
transports.
|
126 |
||
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
127 |
This will be generalised in the future which is why it is in this
|
1530.1.21
by Robert Collins
Review feedback fixes. |
128 |
test file even though it is specific to transport tests at the moment.
|
129 |
"""
|
|
1530.1.1
by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter. |
130 |
|
1530.1.11
by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports. |
131 |
def test_get_transport_permutations(self): |
3455.1.1
by Vincent Ladeuil
Fix typos in comments. |
132 |
# this checks that get_test_permutations defined by the module is
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
133 |
# called by the get_transport_test_permutations function.
|
1530.1.11
by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports. |
134 |
class MockModule(object): |
135 |
def get_test_permutations(self): |
|
136 |
return sample_permutation |
|
137 |
sample_permutation = [(1,2), (3,4)] |
|
4523.1.5
by Vincent Ladeuil
Fixed as asked in review. |
138 |
from bzrlib.tests.per_transport import get_transport_test_permutations |
1530.1.11
by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports. |
139 |
self.assertEqual(sample_permutation, |
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
140 |
get_transport_test_permutations(MockModule())) |
1530.1.11
by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports. |
141 |
|
4476.3.4
by Andrew Bennetts
Network serialisation, and most tests passing with InterDifferingSerializer commented out. |
142 |
def test_scenarios_include_all_modules(self): |
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
143 |
# this checks that the scenario generator returns as many permutations
|
144 |
# as there are in all the registered transport modules - we assume if
|
|
145 |
# this matches its probably doing the right thing especially in
|
|
146 |
# combination with the tests for setting the right classes below.
|
|
4523.1.5
by Vincent Ladeuil
Fixed as asked in review. |
147 |
from bzrlib.tests.per_transport import transport_test_permutations |
2553.2.5
by Robert Collins
And overhaul TransportTestProviderAdapter too. |
148 |
from bzrlib.transport import _get_transport_modules |
1530.1.11
by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports. |
149 |
modules = _get_transport_modules() |
150 |
permutation_count = 0 |
|
151 |
for module in modules: |
|
1185.62.24
by John Arbash Meinel
Changing the exception that sftp.py throws when it can't find paramiko, so that the test suite can handle it. |
152 |
try: |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
153 |
permutation_count += len(reduce(getattr, |
1185.62.24
by John Arbash Meinel
Changing the exception that sftp.py throws when it can't find paramiko, so that the test suite can handle it. |
154 |
(module + ".get_test_permutations").split('.')[1:], |
155 |
__import__(module))()) |
|
156 |
except errors.DependencyNotPresent: |
|
157 |
pass
|
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
158 |
scenarios = transport_test_permutations() |
159 |
self.assertEqual(permutation_count, len(scenarios)) |
|
1530.1.11
by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports. |
160 |
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
161 |
def test_scenarios_include_transport_class(self): |
1540.3.21
by Martin Pool
Trim test for TestTransportProviderAdapter to be less dependent on |
162 |
# This test used to know about all the possible transports and the
|
163 |
# order they were returned but that seems overly brittle (mbp
|
|
164 |
# 20060307)
|
|
4523.1.5
by Vincent Ladeuil
Fixed as asked in review. |
165 |
from bzrlib.tests.per_transport import transport_test_permutations |
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
166 |
scenarios = transport_test_permutations() |
1540.3.21
by Martin Pool
Trim test for TestTransportProviderAdapter to be less dependent on |
167 |
# there are at least that many builtin transports
|
2553.2.5
by Robert Collins
And overhaul TransportTestProviderAdapter too. |
168 |
self.assertTrue(len(scenarios) > 6) |
169 |
one_scenario = scenarios[0] |
|
170 |
self.assertIsInstance(one_scenario[0], str) |
|
171 |
self.assertTrue(issubclass(one_scenario[1]["transport_class"], |
|
1540.3.21
by Martin Pool
Trim test for TestTransportProviderAdapter to be less dependent on |
172 |
bzrlib.transport.Transport)) |
2553.2.5
by Robert Collins
And overhaul TransportTestProviderAdapter too. |
173 |
self.assertTrue(issubclass(one_scenario[1]["transport_server"], |
1540.3.21
by Martin Pool
Trim test for TestTransportProviderAdapter to be less dependent on |
174 |
bzrlib.transport.Server)) |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
175 |
|
176 |
||
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
177 |
class TestBranchScenarios(tests.TestCase): |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
178 |
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
179 |
def test_scenarios(self): |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
180 |
# check that constructor parameters are passed through to the adapted
|
181 |
# test.
|
|
4523.1.1
by Martin Pool
Rename tests.branch_implementations to per_branch |
182 |
from bzrlib.tests.per_branch import make_scenarios |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
183 |
server1 = "a" |
184 |
server2 = "b" |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
185 |
formats = [("c", "C"), ("d", "D")] |
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
186 |
scenarios = make_scenarios(server1, server2, formats) |
187 |
self.assertEqual(2, len(scenarios)) |
|
2553.2.6
by Robert Collins
And overhaul BranchTestProviderAdapter too. |
188 |
self.assertEqual([ |
189 |
('str', |
|
190 |
{'branch_format': 'c', |
|
191 |
'bzrdir_format': 'C', |
|
192 |
'transport_readonly_server': 'b', |
|
193 |
'transport_server': 'a'}), |
|
194 |
('str', |
|
195 |
{'branch_format': 'd', |
|
196 |
'bzrdir_format': 'D', |
|
197 |
'transport_readonly_server': 'b', |
|
198 |
'transport_server': 'a'})], |
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
199 |
scenarios) |
200 |
||
201 |
||
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
202 |
class TestBzrDirScenarios(tests.TestCase): |
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
203 |
|
204 |
def test_scenarios(self): |
|
1534.4.39
by Robert Collins
Basic BzrDir support. |
205 |
# check that constructor parameters are passed through to the adapted
|
206 |
# test.
|
|
5363.2.2
by Jelmer Vernooij
Rename per_bzrdir => per_controldir. |
207 |
from bzrlib.tests.per_controldir import make_scenarios |
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
208 |
vfs_factory = "v" |
1534.4.39
by Robert Collins
Basic BzrDir support. |
209 |
server1 = "a" |
210 |
server2 = "b" |
|
211 |
formats = ["c", "d"] |
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
212 |
scenarios = make_scenarios(vfs_factory, server1, server2, formats) |
2553.2.7
by Robert Collins
And overhaul BzrDirTestProviderAdapter too. |
213 |
self.assertEqual([ |
214 |
('str', |
|
215 |
{'bzrdir_format': 'c', |
|
216 |
'transport_readonly_server': 'b', |
|
217 |
'transport_server': 'a', |
|
218 |
'vfs_transport_factory': 'v'}), |
|
219 |
('str', |
|
220 |
{'bzrdir_format': 'd', |
|
221 |
'transport_readonly_server': 'b', |
|
222 |
'transport_server': 'a', |
|
223 |
'vfs_transport_factory': 'v'})], |
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
224 |
scenarios) |
225 |
||
226 |
||
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
227 |
class TestRepositoryScenarios(tests.TestCase): |
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
228 |
|
2553.2.1
by Robert Collins
Overhaul RepositoryTestAdapter to be cleaner and more modular. |
229 |
def test_formats_to_scenarios(self): |
3689.1.3
by John Arbash Meinel
Track down other tests that used repository_implementations. |
230 |
from bzrlib.tests.per_repository import formats_to_scenarios |
3543.1.4
by Martin Pool
test_formats_to_scenarios uses real format objects |
231 |
formats = [("(c)", remote.RemoteRepositoryFormat()), |
232 |
("(d)", repository.format_registry.get( |
|
4599.4.16
by Robert Collins
Update test_selftest for the 2a default format change. |
233 |
'Bazaar repository format 2a (needs bzr 1.16 or later)\n'))] |
3221.10.5
by Robert Collins
Update repository parameterisation tests to match refactoring. |
234 |
no_vfs_scenarios = formats_to_scenarios(formats, "server", "readonly", |
235 |
None) |
|
236 |
vfs_scenarios = formats_to_scenarios(formats, "server", "readonly", |
|
237 |
vfs_transport_factory="vfs") |
|
3543.1.4
by Martin Pool
test_formats_to_scenarios uses real format objects |
238 |
# no_vfs generate scenarios without vfs_transport_factory
|
4599.4.16
by Robert Collins
Update test_selftest for the 2a default format change. |
239 |
expected = [ |
3543.1.4
by Martin Pool
test_formats_to_scenarios uses real format objects |
240 |
('RemoteRepositoryFormat(c)', |
241 |
{'bzrdir_format': remote.RemoteBzrDirFormat(), |
|
242 |
'repository_format': remote.RemoteRepositoryFormat(), |
|
2553.2.1
by Robert Collins
Overhaul RepositoryTestAdapter to be cleaner and more modular. |
243 |
'transport_readonly_server': 'readonly', |
244 |
'transport_server': 'server'}), |
|
4599.4.16
by Robert Collins
Update test_selftest for the 2a default format change. |
245 |
('RepositoryFormat2a(d)', |
3543.1.4
by Martin Pool
test_formats_to_scenarios uses real format objects |
246 |
{'bzrdir_format': bzrdir.BzrDirMetaFormat1(), |
4599.4.16
by Robert Collins
Update test_selftest for the 2a default format change. |
247 |
'repository_format': groupcompress_repo.RepositoryFormat2a(), |
2553.2.1
by Robert Collins
Overhaul RepositoryTestAdapter to be cleaner and more modular. |
248 |
'transport_readonly_server': 'readonly', |
4599.4.16
by Robert Collins
Update test_selftest for the 2a default format change. |
249 |
'transport_server': 'server'})] |
250 |
self.assertEqual(expected, no_vfs_scenarios) |
|
2553.2.1
by Robert Collins
Overhaul RepositoryTestAdapter to be cleaner and more modular. |
251 |
self.assertEqual([ |
3543.1.4
by Martin Pool
test_formats_to_scenarios uses real format objects |
252 |
('RemoteRepositoryFormat(c)', |
253 |
{'bzrdir_format': remote.RemoteBzrDirFormat(), |
|
254 |
'repository_format': remote.RemoteRepositoryFormat(), |
|
2553.2.1
by Robert Collins
Overhaul RepositoryTestAdapter to be cleaner and more modular. |
255 |
'transport_readonly_server': 'readonly', |
256 |
'transport_server': 'server', |
|
257 |
'vfs_transport_factory': 'vfs'}), |
|
4599.4.16
by Robert Collins
Update test_selftest for the 2a default format change. |
258 |
('RepositoryFormat2a(d)', |
3543.1.4
by Martin Pool
test_formats_to_scenarios uses real format objects |
259 |
{'bzrdir_format': bzrdir.BzrDirMetaFormat1(), |
4599.4.16
by Robert Collins
Update test_selftest for the 2a default format change. |
260 |
'repository_format': groupcompress_repo.RepositoryFormat2a(), |
2553.2.1
by Robert Collins
Overhaul RepositoryTestAdapter to be cleaner and more modular. |
261 |
'transport_readonly_server': 'readonly', |
262 |
'transport_server': 'server', |
|
263 |
'vfs_transport_factory': 'vfs'})], |
|
3221.10.5
by Robert Collins
Update repository parameterisation tests to match refactoring. |
264 |
vfs_scenarios) |
2553.2.1
by Robert Collins
Overhaul RepositoryTestAdapter to be cleaner and more modular. |
265 |
|
2553.2.3
by Robert Collins
Split out the common test scenario support from the repository implementation specific code. |
266 |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
267 |
class TestTestScenarioApplication(tests.TestCase): |
2553.2.3
by Robert Collins
Split out the common test scenario support from the repository implementation specific code. |
268 |
"""Tests for the test adaption facilities."""
|
269 |
||
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
270 |
def test_apply_scenario(self): |
271 |
from bzrlib.tests import apply_scenario |
|
272 |
input_test = TestTestScenarioApplication("test_apply_scenario") |
|
2553.2.1
by Robert Collins
Overhaul RepositoryTestAdapter to be cleaner and more modular. |
273 |
# setup two adapted tests
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
274 |
adapted_test1 = apply_scenario(input_test, |
2553.2.1
by Robert Collins
Overhaul RepositoryTestAdapter to be cleaner and more modular. |
275 |
("new id", |
276 |
{"bzrdir_format":"bzr_format", |
|
277 |
"repository_format":"repo_fmt", |
|
278 |
"transport_server":"transport_server", |
|
279 |
"transport_readonly_server":"readonly-server"})) |
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
280 |
adapted_test2 = apply_scenario(input_test, |
2553.2.1
by Robert Collins
Overhaul RepositoryTestAdapter to be cleaner and more modular. |
281 |
("new id 2", {"bzrdir_format":None})) |
282 |
# input_test should have been altered.
|
|
283 |
self.assertRaises(AttributeError, getattr, input_test, "bzrdir_format") |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
284 |
# the new tests are mutually incompatible, ensuring it has
|
2553.2.1
by Robert Collins
Overhaul RepositoryTestAdapter to be cleaner and more modular. |
285 |
# made new ones, and unspecified elements in the scenario
|
286 |
# should not have been altered.
|
|
287 |
self.assertEqual("bzr_format", adapted_test1.bzrdir_format) |
|
288 |
self.assertEqual("repo_fmt", adapted_test1.repository_format) |
|
289 |
self.assertEqual("transport_server", adapted_test1.transport_server) |
|
290 |
self.assertEqual("readonly-server", |
|
291 |
adapted_test1.transport_readonly_server) |
|
292 |
self.assertEqual( |
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
293 |
"bzrlib.tests.test_selftest.TestTestScenarioApplication."
|
294 |
"test_apply_scenario(new id)", |
|
2553.2.1
by Robert Collins
Overhaul RepositoryTestAdapter to be cleaner and more modular. |
295 |
adapted_test1.id()) |
296 |
self.assertEqual(None, adapted_test2.bzrdir_format) |
|
297 |
self.assertEqual( |
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
298 |
"bzrlib.tests.test_selftest.TestTestScenarioApplication."
|
299 |
"test_apply_scenario(new id 2)", |
|
2553.2.1
by Robert Collins
Overhaul RepositoryTestAdapter to be cleaner and more modular. |
300 |
adapted_test2.id()) |
2018.5.64
by Robert Collins
Allow Repository tests to be backed onto a specific VFS as needed. |
301 |
|
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
302 |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
303 |
class TestInterRepositoryScenarios(tests.TestCase): |
1534.1.29
by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository. |
304 |
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
305 |
def test_scenarios(self): |
1534.1.29
by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository. |
306 |
# check that constructor parameters are passed through to the adapted
|
307 |
# test.
|
|
4523.1.5
by Vincent Ladeuil
Fixed as asked in review. |
308 |
from bzrlib.tests.per_interrepository import make_scenarios |
1534.1.29
by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository. |
309 |
server1 = "a" |
310 |
server2 = "b" |
|
5050.32.2
by Andrew Bennetts
Fix test_selftest.TestInterRepositoryScenarios to expect the extra_setup field in the format tuples. |
311 |
formats = [("C0", "C1", "C2", "C3"), ("D0", "D1", "D2", "D3")] |
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
312 |
scenarios = make_scenarios(server1, server2, formats) |
2553.2.4
by Robert Collins
Treat InterRepositoryTestProviderAdapter like RepositoryTestProviderAdapter |
313 |
self.assertEqual([ |
4476.3.85
by Andrew Bennetts
Update TestInterRepositoryScenarios.test_scenarios for change to per_interrepo make_scenarios. |
314 |
('C0,str,str', |
4476.3.4
by Andrew Bennetts
Network serialisation, and most tests passing with InterDifferingSerializer commented out. |
315 |
{'repository_format': 'C1', |
2553.2.4
by Robert Collins
Treat InterRepositoryTestProviderAdapter like RepositoryTestProviderAdapter |
316 |
'repository_format_to': 'C2', |
317 |
'transport_readonly_server': 'b', |
|
5050.32.2
by Andrew Bennetts
Fix test_selftest.TestInterRepositoryScenarios to expect the extra_setup field in the format tuples. |
318 |
'transport_server': 'a', |
319 |
'extra_setup': 'C3'}), |
|
4476.3.85
by Andrew Bennetts
Update TestInterRepositoryScenarios.test_scenarios for change to per_interrepo make_scenarios. |
320 |
('D0,str,str', |
4476.3.4
by Andrew Bennetts
Network serialisation, and most tests passing with InterDifferingSerializer commented out. |
321 |
{'repository_format': 'D1', |
2553.2.4
by Robert Collins
Treat InterRepositoryTestProviderAdapter like RepositoryTestProviderAdapter |
322 |
'repository_format_to': 'D2', |
323 |
'transport_readonly_server': 'b', |
|
5050.32.2
by Andrew Bennetts
Fix test_selftest.TestInterRepositoryScenarios to expect the extra_setup field in the format tuples. |
324 |
'transport_server': 'a', |
325 |
'extra_setup': 'D3'})], |
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
326 |
scenarios) |
327 |
||
328 |
||
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
329 |
class TestWorkingTreeScenarios(tests.TestCase): |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
330 |
|
2553.2.10
by Robert Collins
And overhaul WorkingTreeTestProviderAdapter too. |
331 |
def test_scenarios(self): |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
332 |
# check that constructor parameters are passed through to the adapted
|
333 |
# test.
|
|
4523.1.5
by Vincent Ladeuil
Fixed as asked in review. |
334 |
from bzrlib.tests.per_workingtree import make_scenarios |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
335 |
server1 = "a" |
336 |
server2 = "b" |
|
5816.2.4
by Jelmer Vernooij
Fix some imports. |
337 |
formats = [workingtree_4.WorkingTreeFormat4(), |
6437.70.16
by John Arbash Meinel
per_tree re-uses the per_workingtree scenarios. |
338 |
workingtree_3.WorkingTreeFormat3(), |
339 |
workingtree_4.WorkingTreeFormat6()] |
|
340 |
scenarios = make_scenarios(server1, server2, formats, |
|
341 |
remote_server='c', remote_readonly_server='d', |
|
342 |
remote_backing_server='e') |
|
2553.2.10
by Robert Collins
And overhaul WorkingTreeTestProviderAdapter too. |
343 |
self.assertEqual([ |
5582.10.30
by Jelmer Vernooij
Remove more weave_fmt imports. |
344 |
('WorkingTreeFormat4', |
3543.1.8
by Martin Pool
Update more scenario tests to use real format objects. |
345 |
{'bzrdir_format': formats[0]._matchingbzrdir, |
346 |
'transport_readonly_server': 'b', |
|
347 |
'transport_server': 'a', |
|
348 |
'workingtree_format': formats[0]}), |
|
349 |
('WorkingTreeFormat3', |
|
350 |
{'bzrdir_format': formats[1]._matchingbzrdir, |
|
6437.70.16
by John Arbash Meinel
per_tree re-uses the per_workingtree scenarios. |
351 |
'transport_readonly_server': 'b', |
352 |
'transport_server': 'a', |
|
353 |
'workingtree_format': formats[1]}), |
|
354 |
('WorkingTreeFormat6', |
|
355 |
{'bzrdir_format': formats[2]._matchingbzrdir, |
|
356 |
'transport_readonly_server': 'b', |
|
357 |
'transport_server': 'a', |
|
358 |
'workingtree_format': formats[2]}), |
|
359 |
('WorkingTreeFormat6,remote', |
|
360 |
{'bzrdir_format': formats[2]._matchingbzrdir, |
|
361 |
'repo_is_remote': True, |
|
362 |
'transport_readonly_server': 'd', |
|
363 |
'transport_server': 'c', |
|
364 |
'vfs_transport_factory': 'e', |
|
365 |
'workingtree_format': formats[2]}), |
|
366 |
], scenarios) |
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
367 |
|
368 |
||
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
369 |
class TestTreeScenarios(tests.TestCase): |
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
370 |
|
371 |
def test_scenarios(self): |
|
372 |
# the tree implementation scenario generator is meant to setup one
|
|
6437.70.16
by John Arbash Meinel
per_tree re-uses the per_workingtree scenarios. |
373 |
# instance for each working tree format, one additional instance
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
374 |
# that will use the default wt format, but create a revision tree for
|
6437.70.16
by John Arbash Meinel
per_tree re-uses the per_workingtree scenarios. |
375 |
# the tests, and one more that uses the default wt format as a
|
376 |
# lightweight checkout of a remote repository. This means that the wt
|
|
377 |
# ones should have the workingtree_to_test_tree attribute set to
|
|
378 |
# 'return_parameter' and the revision one set to
|
|
379 |
# revision_tree_from_workingtree.
|
|
1852.6.1
by Robert Collins
Start tree implementation tests. |
380 |
|
4523.1.4
by Martin Pool
Rename remaining *_implementations tests |
381 |
from bzrlib.tests.per_tree import ( |
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
382 |
_dirstate_tree_from_workingtree, |
383 |
make_scenarios, |
|
384 |
preview_tree_pre, |
|
385 |
preview_tree_post, |
|
1852.6.1
by Robert Collins
Start tree implementation tests. |
386 |
return_parameter, |
387 |
revision_tree_from_workingtree
|
|
388 |
)
|
|
389 |
server1 = "a" |
|
390 |
server2 = "b" |
|
6437.70.16
by John Arbash Meinel
per_tree re-uses the per_workingtree scenarios. |
391 |
smart_server = test_server.SmartTCPServer_for_testing |
392 |
smart_readonly_server = test_server.ReadonlySmartTCPServer_for_testing |
|
393 |
mem_server = memory.MemoryServer |
|
5816.2.4
by Jelmer Vernooij
Fix some imports. |
394 |
formats = [workingtree_4.WorkingTreeFormat4(), |
5816.5.4
by Jelmer Vernooij
Merge bzr.dev. |
395 |
workingtree_3.WorkingTreeFormat3(),] |
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
396 |
scenarios = make_scenarios(server1, server2, formats) |
6437.70.16
by John Arbash Meinel
per_tree re-uses the per_workingtree scenarios. |
397 |
self.assertEqual(8, len(scenarios)) |
5662.3.5
by Jelmer Vernooij
Fix retrieval of default working tree format in test. |
398 |
default_wt_format = workingtree.format_registry.get_default() |
5816.2.4
by Jelmer Vernooij
Fix some imports. |
399 |
wt4_format = workingtree_4.WorkingTreeFormat4() |
400 |
wt5_format = workingtree_4.WorkingTreeFormat5() |
|
6437.70.16
by John Arbash Meinel
per_tree re-uses the per_workingtree scenarios. |
401 |
wt6_format = workingtree_4.WorkingTreeFormat6() |
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
402 |
expected_scenarios = [ |
5669.2.1
by Jelmer Vernooij
Avoid the use of weave formats in test_selftest. |
403 |
('WorkingTreeFormat4', |
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
404 |
{'bzrdir_format': formats[0]._matchingbzrdir, |
405 |
'transport_readonly_server': 'b', |
|
406 |
'transport_server': 'a', |
|
407 |
'workingtree_format': formats[0], |
|
408 |
'_workingtree_to_test_tree': return_parameter, |
|
409 |
}),
|
|
410 |
('WorkingTreeFormat3', |
|
411 |
{'bzrdir_format': formats[1]._matchingbzrdir, |
|
412 |
'transport_readonly_server': 'b', |
|
413 |
'transport_server': 'a', |
|
414 |
'workingtree_format': formats[1], |
|
415 |
'_workingtree_to_test_tree': return_parameter, |
|
416 |
}),
|
|
6437.70.16
by John Arbash Meinel
per_tree re-uses the per_workingtree scenarios. |
417 |
('WorkingTreeFormat6,remote', |
418 |
{'bzrdir_format': wt6_format._matchingbzrdir, |
|
419 |
'repo_is_remote': True, |
|
420 |
'transport_readonly_server': smart_readonly_server, |
|
421 |
'transport_server': smart_server, |
|
422 |
'vfs_transport_factory': mem_server, |
|
423 |
'workingtree_format': wt6_format, |
|
424 |
'_workingtree_to_test_tree': return_parameter, |
|
425 |
}),
|
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
426 |
('RevisionTree', |
427 |
{'_workingtree_to_test_tree': revision_tree_from_workingtree, |
|
428 |
'bzrdir_format': default_wt_format._matchingbzrdir, |
|
429 |
'transport_readonly_server': 'b', |
|
430 |
'transport_server': 'a', |
|
431 |
'workingtree_format': default_wt_format, |
|
432 |
}),
|
|
433 |
('DirStateRevisionTree,WT4', |
|
434 |
{'_workingtree_to_test_tree': _dirstate_tree_from_workingtree, |
|
435 |
'bzrdir_format': wt4_format._matchingbzrdir, |
|
436 |
'transport_readonly_server': 'b', |
|
437 |
'transport_server': 'a', |
|
438 |
'workingtree_format': wt4_format, |
|
439 |
}),
|
|
440 |
('DirStateRevisionTree,WT5', |
|
441 |
{'_workingtree_to_test_tree': _dirstate_tree_from_workingtree, |
|
442 |
'bzrdir_format': wt5_format._matchingbzrdir, |
|
443 |
'transport_readonly_server': 'b', |
|
444 |
'transport_server': 'a', |
|
445 |
'workingtree_format': wt5_format, |
|
446 |
}),
|
|
447 |
('PreviewTree', |
|
448 |
{'_workingtree_to_test_tree': preview_tree_pre, |
|
449 |
'bzrdir_format': default_wt_format._matchingbzrdir, |
|
450 |
'transport_readonly_server': 'b', |
|
451 |
'transport_server': 'a', |
|
452 |
'workingtree_format': default_wt_format}), |
|
453 |
('PreviewTreePost', |
|
454 |
{'_workingtree_to_test_tree': preview_tree_post, |
|
455 |
'bzrdir_format': default_wt_format._matchingbzrdir, |
|
456 |
'transport_readonly_server': 'b', |
|
457 |
'transport_server': 'a', |
|
458 |
'workingtree_format': default_wt_format}), |
|
459 |
]
|
|
460 |
self.assertEqual(expected_scenarios, scenarios) |
|
461 |
||
462 |
||
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
463 |
class TestInterTreeScenarios(tests.TestCase): |
1852.8.3
by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case. |
464 |
"""A group of tests that test the InterTreeTestAdapter."""
|
465 |
||
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
466 |
def test_scenarios(self): |
1852.8.3
by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case. |
467 |
# check that constructor parameters are passed through to the adapted
|
468 |
# test.
|
|
469 |
# for InterTree tests we want the machinery to bring up two trees in
|
|
470 |
# each instance: the base one, and the one we are interacting with.
|
|
471 |
# because each optimiser can be direction specific, we need to test
|
|
472 |
# each optimiser in its chosen direction.
|
|
473 |
# unlike the TestProviderAdapter we dont want to automatically add a
|
|
3128.1.3
by Vincent Ladeuil
Since we are there s/parameteris.*/parameteriz&/. |
474 |
# parameterized one for WorkingTree - the optimisers will tell us what
|
1852.8.3
by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case. |
475 |
# ones to add.
|
4523.1.4
by Martin Pool
Rename remaining *_implementations tests |
476 |
from bzrlib.tests.per_tree import ( |
1852.8.3
by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case. |
477 |
return_parameter, |
478 |
)
|
|
4523.1.4
by Martin Pool
Rename remaining *_implementations tests |
479 |
from bzrlib.tests.per_intertree import ( |
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
480 |
make_scenarios, |
1852.8.3
by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case. |
481 |
)
|
5816.5.7
by Jelmer Vernooij
Fix more imports. |
482 |
from bzrlib.workingtree_3 import WorkingTreeFormat3 |
5816.2.4
by Jelmer Vernooij
Fix some imports. |
483 |
from bzrlib.workingtree_4 import WorkingTreeFormat4 |
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
484 |
input_test = TestInterTreeScenarios( |
485 |
"test_scenarios") |
|
1852.8.3
by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case. |
486 |
server1 = "a" |
487 |
server2 = "b" |
|
5582.10.30
by Jelmer Vernooij
Remove more weave_fmt imports. |
488 |
format1 = WorkingTreeFormat4() |
1852.8.3
by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case. |
489 |
format2 = WorkingTreeFormat3() |
3696.4.19
by Robert Collins
Update missed test for InterTree test generation. |
490 |
formats = [("1", str, format1, format2, "converter1"), |
491 |
("2", int, format2, format1, "converter2")] |
|
4084.5.1
by Robert Collins
Bulk update all test adaptation into a single approach, using multiply_tests rather than test adapters. |
492 |
scenarios = make_scenarios(server1, server2, formats) |
493 |
self.assertEqual(2, len(scenarios)) |
|
494 |
expected_scenarios = [ |
|
495 |
("1", { |
|
496 |
"bzrdir_format": format1._matchingbzrdir, |
|
497 |
"intertree_class": formats[0][1], |
|
498 |
"workingtree_format": formats[0][2], |
|
499 |
"workingtree_format_to": formats[0][3], |
|
500 |
"mutable_trees_to_test_trees": formats[0][4], |
|
501 |
"_workingtree_to_test_tree": return_parameter, |
|
502 |
"transport_server": server1, |
|
503 |
"transport_readonly_server": server2, |
|
504 |
}),
|
|
505 |
("2", { |
|
506 |
"bzrdir_format": format2._matchingbzrdir, |
|
507 |
"intertree_class": formats[1][1], |
|
508 |
"workingtree_format": formats[1][2], |
|
509 |
"workingtree_format_to": formats[1][3], |
|
510 |
"mutable_trees_to_test_trees": formats[1][4], |
|
511 |
"_workingtree_to_test_tree": return_parameter, |
|
512 |
"transport_server": server1, |
|
513 |
"transport_readonly_server": server2, |
|
514 |
}),
|
|
515 |
]
|
|
516 |
self.assertEqual(scenarios, expected_scenarios) |
|
1852.8.3
by Robert Collins
Implement an InterTreeTestProvider and a trivial test_compare test case. |
517 |
|
1987.1.1
by John Arbash Meinel
Update the test suite to put HOME in a different directory |
518 |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
519 |
class TestTestCaseInTempDir(tests.TestCaseInTempDir): |
1987.1.1
by John Arbash Meinel
Update the test suite to put HOME in a different directory |
520 |
|
521 |
def test_home_is_not_working(self): |
|
522 |
self.assertNotEqual(self.test_dir, self.test_home_dir) |
|
523 |
cwd = osutils.getcwd() |
|
2823.1.4
by Vincent Ladeuil
Use assertIsSameRealPath to avoid OSX aliasing (specifically /tmp |
524 |
self.assertIsSameRealPath(self.test_dir, cwd) |
525 |
self.assertIsSameRealPath(self.test_home_dir, os.environ['HOME']) |
|
1987.1.1
by John Arbash Meinel
Update the test suite to put HOME in a different directory |
526 |
|
3709.3.2
by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat. |
527 |
def test_assertEqualStat_equal(self): |
528 |
from bzrlib.tests.test_dirstate import _FakeStat |
|
529 |
self.build_tree(["foo"]) |
|
530 |
real = os.lstat("foo") |
|
531 |
fake = _FakeStat(real.st_size, real.st_mtime, real.st_ctime, |
|
532 |
real.st_dev, real.st_ino, real.st_mode) |
|
533 |
self.assertEqualStat(real, fake) |
|
534 |
||
535 |
def test_assertEqualStat_notequal(self): |
|
4789.26.10
by John Arbash Meinel
If the filesystem has low resolution build_tree(['a', 'b']) |
536 |
self.build_tree(["foo", "longname"]) |
3709.3.2
by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat. |
537 |
self.assertRaises(AssertionError, self.assertEqualStat, |
4789.26.10
by John Arbash Meinel
If the filesystem has low resolution build_tree(['a', 'b']) |
538 |
os.lstat("foo"), os.lstat("longname")) |
3709.3.2
by Robert Collins
Race-free stat-fingerprint updating during commit via a new method get_file_with_stat. |
539 |
|
5784.1.2
by Martin Pool
Deprecate, and test, failIfExists and failUnlessExists |
540 |
def test_failUnlessExists(self): |
541 |
"""Deprecated failUnlessExists and failIfExists"""
|
|
542 |
self.applyDeprecated( |
|
543 |
deprecated_in((2, 4)), |
|
544 |
self.failUnlessExists, '.') |
|
545 |
self.build_tree(['foo/', 'foo/bar']) |
|
546 |
self.applyDeprecated( |
|
547 |
deprecated_in((2, 4)), |
|
548 |
self.failUnlessExists, 'foo/bar') |
|
549 |
self.applyDeprecated( |
|
550 |
deprecated_in((2, 4)), |
|
551 |
self.failIfExists, 'foo/foo') |
|
552 |
||
553 |
def test_assertPathExists(self): |
|
554 |
self.assertPathExists('.') |
|
555 |
self.build_tree(['foo/', 'foo/bar']) |
|
556 |
self.assertPathExists('foo/bar') |
|
557 |
self.assertPathDoesNotExist('foo/foo') |
|
558 |
||
1987.1.1
by John Arbash Meinel
Update the test suite to put HOME in a different directory |
559 |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
560 |
class TestTestCaseWithMemoryTransport(tests.TestCaseWithMemoryTransport): |
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
561 |
|
562 |
def test_home_is_non_existant_dir_under_root(self): |
|
563 |
"""The test_home_dir for TestCaseWithMemoryTransport is missing.
|
|
564 |
||
565 |
This is because TestCaseWithMemoryTransport is for tests that do not
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
566 |
need any disk resources: they should be hooked into bzrlib in such a
|
567 |
way that no global settings are being changed by the test (only a
|
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
568 |
few tests should need to do that), and having a missing dir as home is
|
569 |
an effective way to ensure that this is the case.
|
|
570 |
"""
|
|
2823.1.4
by Vincent Ladeuil
Use assertIsSameRealPath to avoid OSX aliasing (specifically /tmp |
571 |
self.assertIsSameRealPath( |
572 |
self.TEST_ROOT + "/MemoryTransportMissingHomeDir", |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
573 |
self.test_home_dir) |
2823.1.4
by Vincent Ladeuil
Use assertIsSameRealPath to avoid OSX aliasing (specifically /tmp |
574 |
self.assertIsSameRealPath(self.test_home_dir, os.environ['HOME']) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
575 |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
576 |
def test_cwd_is_TEST_ROOT(self): |
2823.1.4
by Vincent Ladeuil
Use assertIsSameRealPath to avoid OSX aliasing (specifically /tmp |
577 |
self.assertIsSameRealPath(self.test_dir, self.TEST_ROOT) |
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
578 |
cwd = osutils.getcwd() |
2823.1.4
by Vincent Ladeuil
Use assertIsSameRealPath to avoid OSX aliasing (specifically /tmp |
579 |
self.assertIsSameRealPath(self.test_dir, cwd) |
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
580 |
|
4815.2.3
by Michael Hudson
add test |
581 |
def test_BZR_HOME_and_HOME_are_bytestrings(self): |
582 |
"""The $BZR_HOME and $HOME environment variables should not be unicode.
|
|
4815.2.5
by Michael Hudson
NEWS, comment in test |
583 |
|
4815.2.6
by Michael Hudson
final tweak |
584 |
See https://bugs.launchpad.net/bzr/+bug/464174
|
4815.2.3
by Michael Hudson
add test |
585 |
"""
|
586 |
self.assertIsInstance(os.environ['BZR_HOME'], str) |
|
587 |
self.assertIsInstance(os.environ['HOME'], str) |
|
588 |
||
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
589 |
def test_make_branch_and_memory_tree(self): |
590 |
"""In TestCaseWithMemoryTransport we should not make the branch on disk.
|
|
591 |
||
592 |
This is hard to comprehensively robustly test, so we settle for making
|
|
593 |
a branch and checking no directory was created at its relpath.
|
|
594 |
"""
|
|
595 |
tree = self.make_branch_and_memory_tree('dir') |
|
2227.2.2
by v.ladeuil+lp at free
Cleanup. |
596 |
# Guard against regression into MemoryTransport leaking
|
597 |
# files to disk instead of keeping them in memory.
|
|
5784.1.1
by Martin Pool
Stop using failIf, failUnless, etc |
598 |
self.assertFalse(osutils.lexists('dir')) |
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
599 |
self.assertIsInstance(tree, memorytree.MemoryTree) |
600 |
||
1986.4.9
by Robert Collins
``TestCase.make_branch_and_memory_tree`` now takes a format |
601 |
def test_make_branch_and_memory_tree_with_format(self): |
602 |
"""make_branch_and_memory_tree should accept a format option."""
|
|
603 |
format = bzrdir.BzrDirMetaFormat1() |
|
5669.2.1
by Jelmer Vernooij
Avoid the use of weave formats in test_selftest. |
604 |
format.repository_format = repository.format_registry.get_default() |
1986.4.9
by Robert Collins
``TestCase.make_branch_and_memory_tree`` now takes a format |
605 |
tree = self.make_branch_and_memory_tree('dir', format=format) |
2227.2.2
by v.ladeuil+lp at free
Cleanup. |
606 |
# Guard against regression into MemoryTransport leaking
|
607 |
# files to disk instead of keeping them in memory.
|
|
5784.1.1
by Martin Pool
Stop using failIf, failUnless, etc |
608 |
self.assertFalse(osutils.lexists('dir')) |
1986.4.9
by Robert Collins
``TestCase.make_branch_and_memory_tree`` now takes a format |
609 |
self.assertIsInstance(tree, memorytree.MemoryTree) |
610 |
self.assertEqual(format.repository_format.__class__, |
|
611 |
tree.branch.repository._format.__class__) |
|
612 |
||
3567.4.12
by John Arbash Meinel
Expose the branch building framework to the test suite. |
613 |
def test_make_branch_builder(self): |
614 |
builder = self.make_branch_builder('dir') |
|
615 |
self.assertIsInstance(builder, branchbuilder.BranchBuilder) |
|
616 |
# Guard against regression into MemoryTransport leaking
|
|
617 |
# files to disk instead of keeping them in memory.
|
|
5784.1.1
by Martin Pool
Stop using failIf, failUnless, etc |
618 |
self.assertFalse(osutils.lexists('dir')) |
3567.4.12
by John Arbash Meinel
Expose the branch building framework to the test suite. |
619 |
|
620 |
def test_make_branch_builder_with_format(self): |
|
3567.4.18
by John Arbash Meinel
Apply the review changes from Martin to the exact patch he approved. |
621 |
# Use a repo layout that doesn't conform to a 'named' layout, to ensure
|
622 |
# that the format objects are used.
|
|
3567.4.12
by John Arbash Meinel
Expose the branch building framework to the test suite. |
623 |
format = bzrdir.BzrDirMetaFormat1() |
5669.2.1
by Jelmer Vernooij
Avoid the use of weave formats in test_selftest. |
624 |
repo_format = repository.format_registry.get_default() |
3567.4.18
by John Arbash Meinel
Apply the review changes from Martin to the exact patch he approved. |
625 |
format.repository_format = repo_format |
3567.4.12
by John Arbash Meinel
Expose the branch building framework to the test suite. |
626 |
builder = self.make_branch_builder('dir', format=format) |
627 |
the_branch = builder.get_branch() |
|
628 |
# Guard against regression into MemoryTransport leaking
|
|
629 |
# files to disk instead of keeping them in memory.
|
|
5784.1.1
by Martin Pool
Stop using failIf, failUnless, etc |
630 |
self.assertFalse(osutils.lexists('dir')) |
3567.4.12
by John Arbash Meinel
Expose the branch building framework to the test suite. |
631 |
self.assertEqual(format.repository_format.__class__, |
632 |
the_branch.repository._format.__class__) |
|
3567.4.18
by John Arbash Meinel
Apply the review changes from Martin to the exact patch he approved. |
633 |
self.assertEqual(repo_format.get_format_string(), |
634 |
self.get_transport().get_bytes( |
|
635 |
'dir/.bzr/repository/format')) |
|
3567.4.12
by John Arbash Meinel
Expose the branch building framework to the test suite. |
636 |
|
637 |
def test_make_branch_builder_with_format_name(self): |
|
638 |
builder = self.make_branch_builder('dir', format='knit') |
|
639 |
the_branch = builder.get_branch() |
|
640 |
# Guard against regression into MemoryTransport leaking
|
|
641 |
# files to disk instead of keeping them in memory.
|
|
5784.1.1
by Martin Pool
Stop using failIf, failUnless, etc |
642 |
self.assertFalse(osutils.lexists('dir')) |
6472.2.1
by Jelmer Vernooij
Use bzrdir.controldir for generic access to control directories. |
643 |
dir_format = controldir.format_registry.make_bzrdir('knit') |
3567.4.12
by John Arbash Meinel
Expose the branch building framework to the test suite. |
644 |
self.assertEqual(dir_format.repository_format.__class__, |
645 |
the_branch.repository._format.__class__) |
|
3567.4.18
by John Arbash Meinel
Apply the review changes from Martin to the exact patch he approved. |
646 |
self.assertEqual('Bazaar-NG Knit Repository Format 1', |
647 |
self.get_transport().get_bytes( |
|
648 |
'dir/.bzr/repository/format')) |
|
3567.4.12
by John Arbash Meinel
Expose the branch building framework to the test suite. |
649 |
|
3331.4.1
by Robert Collins
* -Dlock when passed to the selftest (e.g. ``bzr -Dlock selftest``) will |
650 |
def test_dangling_locks_cause_failures(self): |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
651 |
class TestDanglingLock(tests.TestCaseWithMemoryTransport): |
3331.4.1
by Robert Collins
* -Dlock when passed to the selftest (e.g. ``bzr -Dlock selftest``) will |
652 |
def test_function(self): |
6083.1.1
by Jelmer Vernooij
Use get_transport_from_{url,path} in more places. |
653 |
t = self.get_transport_from_path('.') |
3331.4.1
by Robert Collins
* -Dlock when passed to the selftest (e.g. ``bzr -Dlock selftest``) will |
654 |
l = lockdir.LockDir(t, 'lock') |
655 |
l.create() |
|
656 |
l.attempt_lock() |
|
657 |
test = TestDanglingLock('test_function') |
|
4314.2.1
by Robert Collins
Update lock debugging support patch. |
658 |
result = test.run() |
5223.2.1
by Robert Collins
Selftest was failing with testtools 0.9.3, which caused an |
659 |
total_failures = result.errors + result.failures |
4523.4.12
by John Arbash Meinel
Update the test_selftest tests so that they pass again. |
660 |
if self._lock_check_thorough: |
4797.70.1
by Vincent Ladeuil
Skip chmodbits dependent tests when running as root |
661 |
self.assertEqual(1, len(total_failures)) |
4523.4.12
by John Arbash Meinel
Update the test_selftest tests so that they pass again. |
662 |
else: |
663 |
# When _lock_check_thorough is disabled, then we don't trigger a
|
|
664 |
# failure
|
|
4797.70.1
by Vincent Ladeuil
Skip chmodbits dependent tests when running as root |
665 |
self.assertEqual(0, len(total_failures)) |
3331.4.1
by Robert Collins
* -Dlock when passed to the selftest (e.g. ``bzr -Dlock selftest``) will |
666 |
|
1986.2.3
by Robert Collins
New test base class TestCaseWithMemoryTransport offers memory-only |
667 |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
668 |
class TestTestCaseWithTransport(tests.TestCaseWithTransport): |
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
669 |
"""Tests for the convenience functions TestCaseWithTransport introduces."""
|
670 |
||
671 |
def test_get_readonly_url_none(self): |
|
672 |
from bzrlib.transport.readonly import ReadonlyTransportDecorator |
|
5017.3.45
by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry. |
673 |
self.vfs_transport_factory = memory.MemoryServer |
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
674 |
self.transport_readonly_server = None |
675 |
# calling get_readonly_transport() constructs a decorator on the url
|
|
676 |
# for the server
|
|
677 |
url = self.get_readonly_url() |
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
678 |
url2 = self.get_readonly_url('foo/bar') |
6083.1.1
by Jelmer Vernooij
Use get_transport_from_{url,path} in more places. |
679 |
t = transport.get_transport_from_url(url) |
680 |
t2 = transport.get_transport_from_url(url2) |
|
5784.1.1
by Martin Pool
Stop using failIf, failUnless, etc |
681 |
self.assertIsInstance(t, ReadonlyTransportDecorator) |
682 |
self.assertIsInstance(t2, ReadonlyTransportDecorator) |
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
683 |
self.assertEqual(t2.base[:-1], t.abspath('foo/bar')) |
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
684 |
|
685 |
def test_get_readonly_url_http(self): |
|
2929.3.7
by Vincent Ladeuil
Rename bzrlib/test/HttpServer.py to bzrlib/tests/http_server.py and fix uses. |
686 |
from bzrlib.tests.http_server import HttpServer |
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
687 |
from bzrlib.transport.http import HttpTransportBase |
5017.3.24
by Vincent Ladeuil
selftest -s bt.test_selftest passing |
688 |
self.transport_server = test_server.LocalURLServer |
1534.4.10
by Robert Collins
Add TestCaseWithTransport class that provides tests with read and write transport pairs. |
689 |
self.transport_readonly_server = HttpServer |
690 |
# calling get_readonly_transport() gives us a HTTP server instance.
|
|
691 |
url = self.get_readonly_url() |
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
692 |
url2 = self.get_readonly_url('foo/bar') |
1540.3.6
by Martin Pool
[merge] update from bzr.dev |
693 |
# the transport returned may be any HttpTransportBase subclass
|
6083.1.1
by Jelmer Vernooij
Use get_transport_from_{url,path} in more places. |
694 |
t = transport.get_transport_from_url(url) |
695 |
t2 = transport.get_transport_from_url(url2) |
|
5784.1.1
by Martin Pool
Stop using failIf, failUnless, etc |
696 |
self.assertIsInstance(t, HttpTransportBase) |
697 |
self.assertIsInstance(t2, HttpTransportBase) |
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
698 |
self.assertEqual(t2.base[:-1], t.abspath('foo/bar')) |
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
699 |
|
1553.5.68
by Martin Pool
Add new TestCaseWithTransport.assertIsDirectory() and tests |
700 |
def test_is_directory(self): |
701 |
"""Test assertIsDirectory assertion"""
|
|
702 |
t = self.get_transport() |
|
703 |
self.build_tree(['a_dir/', 'a_file'], transport=t) |
|
704 |
self.assertIsDirectory('a_dir', t) |
|
705 |
self.assertRaises(AssertionError, self.assertIsDirectory, 'a_file', t) |
|
706 |
self.assertRaises(AssertionError, self.assertIsDirectory, 'not_here', t) |
|
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
707 |
|
3567.4.13
by John Arbash Meinel
Test that make_branch_builder works on a real filesystem. |
708 |
def test_make_branch_builder(self): |
709 |
builder = self.make_branch_builder('dir') |
|
710 |
rev_id = builder.build_commit() |
|
5784.1.3
by Martin Pool
Switch away from using failUnlessExists and failIfExists |
711 |
self.assertPathExists('dir') |
6472.2.1
by Jelmer Vernooij
Use bzrdir.controldir for generic access to control directories. |
712 |
a_dir = controldir.ControlDir.open('dir') |
3567.4.13
by John Arbash Meinel
Test that make_branch_builder works on a real filesystem. |
713 |
self.assertRaises(errors.NoWorkingTree, a_dir.open_workingtree) |
714 |
a_branch = a_dir.open_branch() |
|
715 |
builder_branch = builder.get_branch() |
|
716 |
self.assertEqual(a_branch.base, builder_branch.base) |
|
717 |
self.assertEqual((1, rev_id), builder_branch.last_revision_info()) |
|
718 |
self.assertEqual((1, rev_id), a_branch.last_revision_info()) |
|
719 |
||
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
720 |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
721 |
class TestTestCaseTransports(tests.TestCaseWithTransport): |
1910.13.1
by Andrew Bennetts
Make make_bzrdir preserve the transport. |
722 |
|
723 |
def setUp(self): |
|
724 |
super(TestTestCaseTransports, self).setUp() |
|
5017.3.45
by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry. |
725 |
self.vfs_transport_factory = memory.MemoryServer |
1910.13.1
by Andrew Bennetts
Make make_bzrdir preserve the transport. |
726 |
|
727 |
def test_make_bzrdir_preserves_transport(self): |
|
728 |
t = self.get_transport() |
|
729 |
result_bzrdir = self.make_bzrdir('subdir') |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
730 |
self.assertIsInstance(result_bzrdir.transport, |
5017.3.24
by Vincent Ladeuil
selftest -s bt.test_selftest passing |
731 |
memory.MemoryTransport) |
1910.13.1
by Andrew Bennetts
Make make_bzrdir preserve the transport. |
732 |
# should not be on disk, should only be in memory
|
5784.1.3
by Martin Pool
Switch away from using failUnlessExists and failIfExists |
733 |
self.assertPathDoesNotExist('subdir') |
1910.13.1
by Andrew Bennetts
Make make_bzrdir preserve the transport. |
734 |
|
735 |
||
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
736 |
class TestChrootedTest(tests.ChrootedTestCase): |
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
737 |
|
738 |
def test_root_is_root(self): |
|
6083.1.1
by Jelmer Vernooij
Use get_transport_from_{url,path} in more places. |
739 |
t = transport.get_transport_from_url(self.get_readonly_url()) |
1534.4.31
by Robert Collins
cleanedup test_outside_wt |
740 |
url = t.base |
741 |
self.assertEqual(url, t.clone('..').base) |
|
1540.3.22
by Martin Pool
[patch] Add TestCase.assertIsInstance |
742 |
|
743 |
||
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
744 |
class TestProfileResult(tests.TestCase): |
745 |
||
746 |
def test_profiles_tests(self): |
|
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
747 |
self.requireFeature(features.lsprof_feature) |
5340.15.1
by John Arbash Meinel
supersede exc-info branch |
748 |
terminal = testtools.testresult.doubles.ExtendedTestResult() |
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
749 |
result = tests.ProfileResult(terminal) |
750 |
class Sample(tests.TestCase): |
|
751 |
def a(self): |
|
752 |
self.sample_function() |
|
753 |
def sample_function(self): |
|
754 |
pass
|
|
755 |
test = Sample("a") |
|
756 |
test.run(result) |
|
4794.1.2
by Robert Collins
First cut at testtools support: rename, remove TestCase.run() and change testcase tests to not assume the same instance runs (for cleaner testing at this point). |
757 |
case = terminal._events[0][1] |
758 |
self.assertLength(1, case._benchcalls) |
|
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
759 |
# We must be able to unpack it as the test reporting code wants
|
4794.1.2
by Robert Collins
First cut at testtools support: rename, remove TestCase.run() and change testcase tests to not assume the same instance runs (for cleaner testing at this point). |
760 |
(_, _, _), stats = case._benchcalls[0] |
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
761 |
self.assertTrue(callable(stats.pprint)) |
762 |
||
763 |
||
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
764 |
class TestTestResult(tests.TestCase): |
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
765 |
|
2695.1.3
by Martin Pool
Fix up selftest tests for new extractBenchmarkTime behaviour; remove many unneeded calls to it |
766 |
def check_timing(self, test_case, expected_re): |
2095.4.1
by Martin Pool
Better progress bars during tests |
767 |
result = bzrlib.tests.TextTestResult(self._log_file, |
2695.1.3
by Martin Pool
Fix up selftest tests for new extractBenchmarkTime behaviour; remove many unneeded calls to it |
768 |
descriptions=0, |
769 |
verbosity=1, |
|
770 |
)
|
|
5340.15.1
by John Arbash Meinel
supersede exc-info branch |
771 |
capture = testtools.testresult.doubles.ExtendedTestResult() |
4794.1.2
by Robert Collins
First cut at testtools support: rename, remove TestCase.run() and change testcase tests to not assume the same instance runs (for cleaner testing at this point). |
772 |
test_case.run(MultiTestResult(result, capture)) |
773 |
run_case = capture._events[0][1] |
|
774 |
timed_string = result._testTimeString(run_case) |
|
2695.1.3
by Martin Pool
Fix up selftest tests for new extractBenchmarkTime behaviour; remove many unneeded calls to it |
775 |
self.assertContainsRe(timed_string, expected_re) |
776 |
||
777 |
def test_test_reporting(self): |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
778 |
class ShortDelayTestCase(tests.TestCase): |
2695.1.3
by Martin Pool
Fix up selftest tests for new extractBenchmarkTime behaviour; remove many unneeded calls to it |
779 |
def test_short_delay(self): |
780 |
time.sleep(0.003) |
|
781 |
def test_short_benchmark(self): |
|
782 |
self.time(time.sleep, 0.003) |
|
783 |
self.check_timing(ShortDelayTestCase('test_short_delay'), |
|
784 |
r"^ +[0-9]+ms$") |
|
4536.5.3
by Martin Pool
Correction to selftest test for benchmark time display |
785 |
# if a benchmark time is given, we now show just that time followed by
|
786 |
# a star
|
|
2695.1.3
by Martin Pool
Fix up selftest tests for new extractBenchmarkTime behaviour; remove many unneeded calls to it |
787 |
self.check_timing(ShortDelayTestCase('test_short_benchmark'), |
4536.5.3
by Martin Pool
Correction to selftest test for benchmark time display |
788 |
r"^ +[0-9]+ms\*$") |
1707.2.3
by Robert Collins
Add a setBenchmarkTime method to the bzrlib test result allowing introduction of granular benchmarking. (Robert Collins, Martin Pool). |
789 |
|
2695.1.3
by Martin Pool
Fix up selftest tests for new extractBenchmarkTime behaviour; remove many unneeded calls to it |
790 |
def test_unittest_reporting_unittest_class(self): |
791 |
# getting the time from a non-bzrlib test works ok
|
|
792 |
class ShortDelayTestCase(unittest.TestCase): |
|
793 |
def test_short_delay(self): |
|
794 |
time.sleep(0.003) |
|
795 |
self.check_timing(ShortDelayTestCase('test_short_delay'), |
|
796 |
r"^ +[0-9]+ms$") |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
797 |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
798 |
def _time_hello_world_encoding(self): |
799 |
"""Profile two sleep calls
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
800 |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
801 |
This is used to exercise the test framework.
|
802 |
"""
|
|
803 |
self.time(unicode, 'hello', errors='replace') |
|
804 |
self.time(unicode, 'world', errors='replace') |
|
805 |
||
806 |
def test_lsprofiling(self): |
|
807 |
"""Verbose test result prints lsprof statistics from test cases."""
|
|
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
808 |
self.requireFeature(features.lsprof_feature) |
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
809 |
result_stream = StringIO() |
2095.4.1
by Martin Pool
Better progress bars during tests |
810 |
result = bzrlib.tests.VerboseTestResult( |
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
811 |
result_stream, |
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
812 |
descriptions=0, |
813 |
verbosity=2, |
|
814 |
)
|
|
815 |
# we want profile a call of some sort and check it is output by
|
|
816 |
# addSuccess. We dont care about addError or addFailure as they
|
|
817 |
# are not that interesting for performance tuning.
|
|
818 |
# make a new test instance that when run will generate a profile
|
|
819 |
example_test_case = TestTestResult("_time_hello_world_encoding") |
|
820 |
example_test_case._gather_lsprof_in_benchmarks = True |
|
821 |
# execute the test, which should succeed and record profiles
|
|
822 |
example_test_case.run(result) |
|
823 |
# lsprofile_something()
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
824 |
# if this worked we want
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
825 |
# LSProf output for <built in function unicode> (['hello'], {'errors': 'replace'})
|
826 |
# CallCount Recursive Total(ms) Inline(ms) module:lineno(function)
|
|
827 |
# (the lsprof header)
|
|
828 |
# ... an arbitrary number of lines
|
|
829 |
# and the function call which is time.sleep.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
830 |
# 1 0 ??? ??? ???(sleep)
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
831 |
# and then repeated but with 'world', rather than 'hello'.
|
832 |
# this should appear in the output stream of our test result.
|
|
1831.2.1
by Martin Pool
[trivial] Simplify & fix up lsprof blackbox test |
833 |
output = result_stream.getvalue() |
834 |
self.assertContainsRe(output, |
|
835 |
r"LSProf output for <type 'unicode'>\(\('hello',\), {'errors': 'replace'}\)") |
|
836 |
self.assertContainsRe(output, |
|
837 |
r" *CallCount *Recursive *Total\(ms\) *Inline\(ms\) *module:lineno\(function\)\n") |
|
838 |
self.assertContainsRe(output, |
|
839 |
r"( +1 +0 +0\.\d+ +0\.\d+ +<method 'disable' of '_lsprof\.Profiler' objects>\n)?") |
|
840 |
self.assertContainsRe(output, |
|
841 |
r"LSProf output for <type 'unicode'>\(\('world',\), {'errors': 'replace'}\)\n") |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
842 |
|
5445.1.1
by Martin
Use times from testtools for individual test case timings |
843 |
def test_uses_time_from_testtools(self): |
844 |
"""Test case timings in verbose results should use testtools times"""
|
|
845 |
import datetime |
|
846 |
class TimeAddedVerboseTestResult(tests.VerboseTestResult): |
|
847 |
def startTest(self, test): |
|
848 |
self.time(datetime.datetime.utcfromtimestamp(1.145)) |
|
849 |
super(TimeAddedVerboseTestResult, self).startTest(test) |
|
850 |
def addSuccess(self, test): |
|
851 |
self.time(datetime.datetime.utcfromtimestamp(51.147)) |
|
852 |
super(TimeAddedVerboseTestResult, self).addSuccess(test) |
|
853 |
def report_tests_starting(self): pass |
|
854 |
sio = StringIO() |
|
855 |
self.get_passing_test().run(TimeAddedVerboseTestResult(sio, 0, 2)) |
|
856 |
self.assertEndsWith(sio.getvalue(), "OK 50002ms\n") |
|
857 |
||
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
858 |
def test_known_failure(self): |
6048.1.1
by Martin
Adapt TestCase.knownFailure method to the testtools style so unittest changes don't break it |
859 |
"""Using knownFailure should trigger several result actions."""
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
860 |
class InstrumentedTestResult(tests.ExtendedTestResult): |
4650.1.6
by Robert Collins
Fix interface skew between bzr selftest and python unittest - use stopTestRun not done to end test runs. |
861 |
def stopTestRun(self): pass |
5412.1.4
by Martin
Fix errors on three selftest tests by splitting report_tests_starting out of startTests |
862 |
def report_tests_starting(self): pass |
4794.1.15
by Robert Collins
Review feedback. |
863 |
def report_known_failure(self, test, err=None, details=None): |
864 |
self._call = test, 'known failure' |
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
865 |
result = InstrumentedTestResult(None, None, None, None) |
4780.1.4
by Robert Collins
Switch reporting of KnownFailure to be Python2.7 compatible. |
866 |
class Test(tests.TestCase): |
867 |
def test_function(self): |
|
6048.1.1
by Martin
Adapt TestCase.knownFailure method to the testtools style so unittest changes don't break it |
868 |
self.knownFailure('failed!') |
4780.1.4
by Robert Collins
Switch reporting of KnownFailure to be Python2.7 compatible. |
869 |
test = Test("test_function") |
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
870 |
test.run(result) |
871 |
# it should invoke 'report_known_failure'.
|
|
872 |
self.assertEqual(2, len(result._call)) |
|
4794.1.2
by Robert Collins
First cut at testtools support: rename, remove TestCase.run() and change testcase tests to not assume the same instance runs (for cleaner testing at this point). |
873 |
self.assertEqual(test.id(), result._call[0].id()) |
4794.1.15
by Robert Collins
Review feedback. |
874 |
self.assertEqual('known failure', result._call[1]) |
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
875 |
# we dont introspec the traceback, if the rest is ok, it would be
|
876 |
# exceptional for it not to be.
|
|
877 |
# it should update the known_failure_count on the object.
|
|
878 |
self.assertEqual(1, result.known_failure_count) |
|
879 |
# the result should be successful.
|
|
880 |
self.assertTrue(result.wasSuccessful()) |
|
881 |
||
882 |
def test_verbose_report_known_failure(self): |
|
883 |
# verbose test output formatting
|
|
884 |
result_stream = StringIO() |
|
885 |
result = bzrlib.tests.VerboseTestResult( |
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
886 |
result_stream, |
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
887 |
descriptions=0, |
888 |
verbosity=2, |
|
889 |
)
|
|
6048.1.1
by Martin
Adapt TestCase.knownFailure method to the testtools style so unittest changes don't break it |
890 |
_get_test("test_xfail").run(result) |
891 |
self.assertContainsRe(result_stream.getvalue(), |
|
6048.1.2
by Martin
Minor wording nits and add release notes |
892 |
"\n\\S+\\.test_xfail\\s+XFAIL\\s+\\d+ms\n" |
6048.1.1
by Martin
Adapt TestCase.knownFailure method to the testtools style so unittest changes don't break it |
893 |
"\\s*(?:Text attachment: )?reason" |
894 |
"(?:\n-+\n|: {{{)" |
|
895 |
"this_fails"
|
|
896 |
"(?:\n-+\n|}}}\n)") |
|
2418.3.1
by John Arbash Meinel
Remove timing dependencies from the selftest tests. |
897 |
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
898 |
def get_passing_test(self): |
899 |
"""Return a test object that can't be run usefully."""
|
|
900 |
def passing_test(): |
|
901 |
pass
|
|
902 |
return unittest.FunctionTestCase(passing_test) |
|
903 |
||
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
904 |
def test_add_not_supported(self): |
905 |
"""Test the behaviour of invoking addNotSupported."""
|
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
906 |
class InstrumentedTestResult(tests.ExtendedTestResult): |
4650.1.6
by Robert Collins
Fix interface skew between bzr selftest and python unittest - use stopTestRun not done to end test runs. |
907 |
def stopTestRun(self): pass |
5412.1.4
by Martin
Fix errors on three selftest tests by splitting report_tests_starting out of startTests |
908 |
def report_tests_starting(self): pass |
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
909 |
def report_unsupported(self, test, feature): |
910 |
self._call = test, feature |
|
911 |
result = InstrumentedTestResult(None, None, None, None) |
|
912 |
test = SampleTestCase('_test_pass') |
|
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
913 |
feature = features.Feature() |
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
914 |
result.startTest(test) |
915 |
result.addNotSupported(test, feature) |
|
916 |
# it should invoke 'report_unsupported'.
|
|
917 |
self.assertEqual(2, len(result._call)) |
|
918 |
self.assertEqual(test, result._call[0]) |
|
919 |
self.assertEqual(feature, result._call[1]) |
|
920 |
# the result should be successful.
|
|
921 |
self.assertTrue(result.wasSuccessful()) |
|
922 |
# it should record the test against a count of tests not run due to
|
|
923 |
# this feature.
|
|
924 |
self.assertEqual(1, result.unsupported['Feature']) |
|
925 |
# and invoking it again should increment that counter
|
|
926 |
result.addNotSupported(test, feature) |
|
927 |
self.assertEqual(2, result.unsupported['Feature']) |
|
928 |
||
929 |
def test_verbose_report_unsupported(self): |
|
930 |
# verbose test output formatting
|
|
931 |
result_stream = StringIO() |
|
932 |
result = bzrlib.tests.VerboseTestResult( |
|
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
933 |
result_stream, |
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
934 |
descriptions=0, |
935 |
verbosity=2, |
|
936 |
)
|
|
937 |
test = self.get_passing_test() |
|
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
938 |
feature = features.Feature() |
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
939 |
result.startTest(test) |
940 |
prefix = len(result_stream.getvalue()) |
|
941 |
result.report_unsupported(test, feature) |
|
942 |
output = result_stream.getvalue()[prefix:] |
|
943 |
lines = output.splitlines() |
|
4861.1.1
by Vincent Ladeuil
Fix a test timing-dependency issue. |
944 |
# We don't check for the final '0ms' since it may fail on slow hosts
|
945 |
self.assertStartsWith(lines[0], 'NODEP') |
|
946 |
self.assertEqual(lines[1], |
|
947 |
" The feature 'Feature' is not available.") |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
948 |
|
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
949 |
def test_unavailable_exception(self): |
950 |
"""An UnavailableFeature being raised should invoke addNotSupported."""
|
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
951 |
class InstrumentedTestResult(tests.ExtendedTestResult): |
4650.1.6
by Robert Collins
Fix interface skew between bzr selftest and python unittest - use stopTestRun not done to end test runs. |
952 |
def stopTestRun(self): pass |
5412.1.4
by Martin
Fix errors on three selftest tests by splitting report_tests_starting out of startTests |
953 |
def report_tests_starting(self): pass |
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
954 |
def addNotSupported(self, test, feature): |
955 |
self._call = test, feature |
|
956 |
result = InstrumentedTestResult(None, None, None, None) |
|
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
957 |
feature = features.Feature() |
4780.1.1
by Robert Collins
Make addUnsupported more compatible with other TestResults. |
958 |
class Test(tests.TestCase): |
959 |
def test_function(self): |
|
960 |
raise tests.UnavailableFeature(feature) |
|
961 |
test = Test("test_function") |
|
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
962 |
test.run(result) |
963 |
# it should invoke 'addNotSupported'.
|
|
964 |
self.assertEqual(2, len(result._call)) |
|
4794.1.2
by Robert Collins
First cut at testtools support: rename, remove TestCase.run() and change testcase tests to not assume the same instance runs (for cleaner testing at this point). |
965 |
self.assertEqual(test.id(), result._call[0].id()) |
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
966 |
self.assertEqual(feature, result._call[1]) |
967 |
# and not count as an error
|
|
968 |
self.assertEqual(0, result.error_count) |
|
969 |
||
2658.3.2
by Daniel Watkins
Added tests for ExtendedTestResult.wasStrictlySuccessful. |
970 |
def test_strict_with_unsupported_feature(self): |
971 |
result = bzrlib.tests.TextTestResult(self._log_file, descriptions=0, |
|
2695.1.3
by Martin Pool
Fix up selftest tests for new extractBenchmarkTime behaviour; remove many unneeded calls to it |
972 |
verbosity=1) |
2658.3.2
by Daniel Watkins
Added tests for ExtendedTestResult.wasStrictlySuccessful. |
973 |
test = self.get_passing_test() |
974 |
feature = "Unsupported Feature" |
|
975 |
result.addNotSupported(test, feature) |
|
976 |
self.assertFalse(result.wasStrictlySuccessful()) |
|
2695.1.3
by Martin Pool
Fix up selftest tests for new extractBenchmarkTime behaviour; remove many unneeded calls to it |
977 |
self.assertEqual(None, result._extractBenchmarkTime(test)) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
978 |
|
2658.3.2
by Daniel Watkins
Added tests for ExtendedTestResult.wasStrictlySuccessful. |
979 |
def test_strict_with_known_failure(self): |
980 |
result = bzrlib.tests.TextTestResult(self._log_file, descriptions=0, |
|
2695.1.3
by Martin Pool
Fix up selftest tests for new extractBenchmarkTime behaviour; remove many unneeded calls to it |
981 |
verbosity=1) |
6048.1.1
by Martin
Adapt TestCase.knownFailure method to the testtools style so unittest changes don't break it |
982 |
test = _get_test("test_xfail") |
983 |
test.run(result) |
|
2658.3.2
by Daniel Watkins
Added tests for ExtendedTestResult.wasStrictlySuccessful. |
984 |
self.assertFalse(result.wasStrictlySuccessful()) |
2695.1.3
by Martin Pool
Fix up selftest tests for new extractBenchmarkTime behaviour; remove many unneeded calls to it |
985 |
self.assertEqual(None, result._extractBenchmarkTime(test)) |
2658.3.2
by Daniel Watkins
Added tests for ExtendedTestResult.wasStrictlySuccessful. |
986 |
|
987 |
def test_strict_with_success(self): |
|
988 |
result = bzrlib.tests.TextTestResult(self._log_file, descriptions=0, |
|
2695.1.3
by Martin Pool
Fix up selftest tests for new extractBenchmarkTime behaviour; remove many unneeded calls to it |
989 |
verbosity=1) |
2658.3.2
by Daniel Watkins
Added tests for ExtendedTestResult.wasStrictlySuccessful. |
990 |
test = self.get_passing_test() |
991 |
result.addSuccess(test) |
|
992 |
self.assertTrue(result.wasStrictlySuccessful()) |
|
2695.1.3
by Martin Pool
Fix up selftest tests for new extractBenchmarkTime behaviour; remove many unneeded calls to it |
993 |
self.assertEqual(None, result._extractBenchmarkTime(test)) |
2658.3.2
by Daniel Watkins
Added tests for ExtendedTestResult.wasStrictlySuccessful. |
994 |
|
4271.2.3
by Vincent Ladeuil
Fix failure, add tests. |
995 |
def test_startTests(self): |
996 |
"""Starting the first test should trigger startTests."""
|
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
997 |
class InstrumentedTestResult(tests.ExtendedTestResult): |
4271.2.3
by Vincent Ladeuil
Fix failure, add tests. |
998 |
calls = 0 |
999 |
def startTests(self): self.calls += 1 |
|
1000 |
result = InstrumentedTestResult(None, None, None, None) |
|
1001 |
def test_function(): |
|
1002 |
pass
|
|
1003 |
test = unittest.FunctionTestCase(test_function) |
|
1004 |
test.run(result) |
|
1005 |
self.assertEquals(1, result.calls) |
|
1006 |
||
5412.1.5
by Martin
Move test count addition into startTest from report methods in subclasses |
1007 |
def test_startTests_only_once(self): |
1008 |
"""With multiple tests startTests should still only be called once"""
|
|
1009 |
class InstrumentedTestResult(tests.ExtendedTestResult): |
|
1010 |
calls = 0 |
|
1011 |
def startTests(self): self.calls += 1 |
|
1012 |
result = InstrumentedTestResult(None, None, None, None) |
|
1013 |
suite = unittest.TestSuite([ |
|
1014 |
unittest.FunctionTestCase(lambda: None), |
|
1015 |
unittest.FunctionTestCase(lambda: None)]) |
|
1016 |
suite.run(result) |
|
1017 |
self.assertEquals(1, result.calls) |
|
1018 |
self.assertEquals(2, result.count) |
|
1019 |
||
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
1020 |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1021 |
class TestRunner(tests.TestCase): |
1534.11.1
by Robert Collins
Teach bzr selftest to use a progress bar in non verbose mode. |
1022 |
|
1023 |
def dummy_test(self): |
|
1024 |
pass
|
|
1025 |
||
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
1026 |
def run_test_runner(self, testrunner, test): |
1027 |
"""Run suite in testrunner, saving global state and restoring it.
|
|
1028 |
||
1029 |
This current saves and restores:
|
|
1030 |
TestCaseInTempDir.TEST_ROOT
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1031 |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1032 |
There should be no tests in this file that use
|
1033 |
bzrlib.tests.TextTestRunner without using this convenience method,
|
|
1034 |
because of our use of global state.
|
|
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
1035 |
"""
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1036 |
old_root = tests.TestCaseInTempDir.TEST_ROOT |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
1037 |
try: |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1038 |
tests.TestCaseInTempDir.TEST_ROOT = None |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
1039 |
return testrunner.run(test) |
1040 |
finally: |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1041 |
tests.TestCaseInTempDir.TEST_ROOT = old_root |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
1042 |
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
1043 |
def test_known_failure_failed_run(self): |
1044 |
# run a test that generates a known failure which should be printed in
|
|
1045 |
# the final output when real failures occur.
|
|
4780.1.4
by Robert Collins
Switch reporting of KnownFailure to be Python2.7 compatible. |
1046 |
class Test(tests.TestCase): |
1047 |
def known_failure_test(self): |
|
4794.1.15
by Robert Collins
Review feedback. |
1048 |
self.expectFailure('failed', self.assertTrue, False) |
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
1049 |
test = unittest.TestSuite() |
4780.1.4
by Robert Collins
Switch reporting of KnownFailure to be Python2.7 compatible. |
1050 |
test.addTest(Test("known_failure_test")) |
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
1051 |
def failing_test(): |
5340.15.1
by John Arbash Meinel
supersede exc-info branch |
1052 |
raise AssertionError('foo') |
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
1053 |
test.addTest(unittest.FunctionTestCase(failing_test)) |
1054 |
stream = StringIO() |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1055 |
runner = tests.TextTestRunner(stream=stream) |
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
1056 |
result = self.run_test_runner(runner, test) |
1057 |
lines = stream.getvalue().splitlines() |
|
4595.7.4
by Martin Pool
Change overly-tight selftest test to use a re |
1058 |
self.assertContainsRe(stream.getvalue(), |
4794.1.13
by Robert Collins
Stop regular test output looking quite so much like subunit. |
1059 |
'(?sm)^bzr selftest.*$'
|
4595.7.4
by Martin Pool
Change overly-tight selftest test to use a re |
1060 |
'.*'
|
1061 |
'^======================================================================\n' |
|
4789.29.3
by Robert Collins
And fix the one failing test. |
1062 |
'^FAIL: failing_test\n' |
4595.7.4
by Martin Pool
Change overly-tight selftest test to use a re |
1063 |
'^----------------------------------------------------------------------\n' |
1064 |
'Traceback \\(most recent call last\\):\n' |
|
1065 |
' .*' # File .*, line .*, in failing_test' - but maybe not from .pyc |
|
5340.15.1
by John Arbash Meinel
supersede exc-info branch |
1066 |
' raise AssertionError\\(\'foo\'\\)\n' |
4595.7.4
by Martin Pool
Change overly-tight selftest test to use a re |
1067 |
'.*'
|
1068 |
'^----------------------------------------------------------------------\n' |
|
1069 |
'.*'
|
|
1070 |
'FAILED \\(failures=1, known_failure_count=1\\)' |
|
1071 |
)
|
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
1072 |
|
1073 |
def test_known_failure_ok_run(self): |
|
4780.1.4
by Robert Collins
Switch reporting of KnownFailure to be Python2.7 compatible. |
1074 |
# run a test that generates a known failure which should be printed in
|
1075 |
# the final output.
|
|
1076 |
class Test(tests.TestCase): |
|
1077 |
def known_failure_test(self): |
|
5340.15.1
by John Arbash Meinel
supersede exc-info branch |
1078 |
self.knownFailure("Never works...") |
4780.1.4
by Robert Collins
Switch reporting of KnownFailure to be Python2.7 compatible. |
1079 |
test = Test("known_failure_test") |
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
1080 |
stream = StringIO() |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1081 |
runner = tests.TextTestRunner(stream=stream) |
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
1082 |
result = self.run_test_runner(runner, test) |
2418.3.1
by John Arbash Meinel
Remove timing dependencies from the selftest tests. |
1083 |
self.assertContainsRe(stream.getvalue(), |
1084 |
'\n' |
|
1085 |
'-*\n' |
|
1086 |
'Ran 1 test in .*\n' |
|
1087 |
'\n' |
|
1088 |
'OK \\(known_failures=1\\)\n') |
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
1089 |
|
5868.1.2
by Martin
Treat unexpected successes as failures in bzrlib test code |
1090 |
def test_unexpected_success_bad(self): |
1091 |
class Test(tests.TestCase): |
|
1092 |
def test_truth(self): |
|
1093 |
self.expectFailure("No absolute truth", self.assertTrue, True) |
|
1094 |
runner = tests.TextTestRunner(stream=StringIO()) |
|
1095 |
result = self.run_test_runner(runner, Test("test_truth")) |
|
1096 |
self.assertContainsRe(runner.stream.getvalue(), |
|
1097 |
"=+\n" |
|
1098 |
"FAIL: \\S+\.test_truth\n" |
|
1099 |
"-+\n" |
|
1100 |
"(?:.*\n)*" |
|
6015.33.14
by Martin Packman
Adapt test_selftest output regexps to accept both old and new testtools output |
1101 |
"\\s*(?:Text attachment: )?reason" |
1102 |
"(?:\n-+\n|: {{{)" |
|
1103 |
"No absolute truth"
|
|
1104 |
"(?:\n-+\n|}}}\n)" |
|
5868.1.2
by Martin
Treat unexpected successes as failures in bzrlib test code |
1105 |
"(?:.*\n)*" |
1106 |
"-+\n" |
|
1107 |
"Ran 1 test in .*\n" |
|
1108 |
"\n" |
|
1109 |
"FAILED \\(failures=1\\)\n\\Z") |
|
1110 |
||
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
1111 |
def test_result_decorator(self): |
1112 |
# decorate results
|
|
1113 |
calls = [] |
|
5495.1.1
by Andrew Bennetts
Remove unused definition of ForwardingResult, and switch all code to use the testtools name for it. Also remove a few unused imports. |
1114 |
class LoggingDecorator(ExtendedToOriginalDecorator): |
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
1115 |
def startTest(self, test): |
5495.1.1
by Andrew Bennetts
Remove unused definition of ForwardingResult, and switch all code to use the testtools name for it. Also remove a few unused imports. |
1116 |
ExtendedToOriginalDecorator.startTest(self, test) |
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
1117 |
calls.append('start') |
1118 |
test = unittest.FunctionTestCase(lambda:None) |
|
1119 |
stream = StringIO() |
|
1120 |
runner = tests.TextTestRunner(stream=stream, |
|
1121 |
result_decorators=[LoggingDecorator]) |
|
1122 |
result = self.run_test_runner(runner, test) |
|
1123 |
self.assertLength(1, calls) |
|
1124 |
||
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
1125 |
def test_skipped_test(self): |
1126 |
# run a test that is skipped, and check the suite as a whole still
|
|
1127 |
# succeeds.
|
|
1128 |
# skipping_test must be hidden in here so it's not run as a real test
|
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1129 |
class SkippingTest(tests.TestCase): |
4063.1.1
by Robert Collins
Move skipped test detection to TestCase, and make reporting use an addSkip method as per testtools. |
1130 |
def skipping_test(self): |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1131 |
raise tests.TestSkipped('test intentionally skipped') |
1132 |
runner = tests.TextTestRunner(stream=self._log_file) |
|
4063.1.1
by Robert Collins
Move skipped test detection to TestCase, and make reporting use an addSkip method as per testtools. |
1133 |
test = SkippingTest("skipping_test") |
2338.4.10
by Marien Zwart
Make a test skipped from setUp run tearDown again. Make calling _runCleanups twice safe. Clean up tests. |
1134 |
result = self.run_test_runner(runner, test) |
1135 |
self.assertTrue(result.wasSuccessful()) |
|
1136 |
||
1137 |
def test_skipped_from_setup(self): |
|
3224.4.1
by Andrew Bennetts
Prune __dict__ of TestCases after they have run to save memory. |
1138 |
calls = [] |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1139 |
class SkippedSetupTest(tests.TestCase): |
2338.4.8
by Marien Zwart
Fix a bug in selftest causing tearDown to run twice for skipped tests. |
1140 |
|
1141 |
def setUp(self): |
|
3224.4.1
by Andrew Bennetts
Prune __dict__ of TestCases after they have run to save memory. |
1142 |
calls.append('setUp') |
2338.4.10
by Marien Zwart
Make a test skipped from setUp run tearDown again. Make calling _runCleanups twice safe. Clean up tests. |
1143 |
self.addCleanup(self.cleanup) |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1144 |
raise tests.TestSkipped('skipped setup') |
2338.4.8
by Marien Zwart
Fix a bug in selftest causing tearDown to run twice for skipped tests. |
1145 |
|
1146 |
def test_skip(self): |
|
1147 |
self.fail('test reached') |
|
1148 |
||
2338.4.10
by Marien Zwart
Make a test skipped from setUp run tearDown again. Make calling _runCleanups twice safe. Clean up tests. |
1149 |
def cleanup(self): |
3224.4.1
by Andrew Bennetts
Prune __dict__ of TestCases after they have run to save memory. |
1150 |
calls.append('cleanup') |
2338.4.10
by Marien Zwart
Make a test skipped from setUp run tearDown again. Make calling _runCleanups twice safe. Clean up tests. |
1151 |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1152 |
runner = tests.TextTestRunner(stream=self._log_file) |
2338.4.10
by Marien Zwart
Make a test skipped from setUp run tearDown again. Make calling _runCleanups twice safe. Clean up tests. |
1153 |
test = SkippedSetupTest('test_skip') |
1154 |
result = self.run_test_runner(runner, test) |
|
1155 |
self.assertTrue(result.wasSuccessful()) |
|
1156 |
# Check if cleanup was called the right number of times.
|
|
3224.4.1
by Andrew Bennetts
Prune __dict__ of TestCases after they have run to save memory. |
1157 |
self.assertEqual(['setUp', 'cleanup'], calls) |
2338.4.10
by Marien Zwart
Make a test skipped from setUp run tearDown again. Make calling _runCleanups twice safe. Clean up tests. |
1158 |
|
1159 |
def test_skipped_from_test(self): |
|
3224.4.1
by Andrew Bennetts
Prune __dict__ of TestCases after they have run to save memory. |
1160 |
calls = [] |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1161 |
class SkippedTest(tests.TestCase): |
2338.4.8
by Marien Zwart
Fix a bug in selftest causing tearDown to run twice for skipped tests. |
1162 |
|
1163 |
def setUp(self): |
|
6552.1.3
by Vincent Ladeuil
Use super() instead of calling <base>.setup(self), as the original fix illustrated a too-easy-to-fall-into trap. |
1164 |
super(SkippedTest, self).setUp() |
3224.4.1
by Andrew Bennetts
Prune __dict__ of TestCases after they have run to save memory. |
1165 |
calls.append('setUp') |
2338.4.10
by Marien Zwart
Make a test skipped from setUp run tearDown again. Make calling _runCleanups twice safe. Clean up tests. |
1166 |
self.addCleanup(self.cleanup) |
2338.4.8
by Marien Zwart
Fix a bug in selftest causing tearDown to run twice for skipped tests. |
1167 |
|
1168 |
def test_skip(self): |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1169 |
raise tests.TestSkipped('skipped test') |
2338.4.8
by Marien Zwart
Fix a bug in selftest causing tearDown to run twice for skipped tests. |
1170 |
|
2338.4.10
by Marien Zwart
Make a test skipped from setUp run tearDown again. Make calling _runCleanups twice safe. Clean up tests. |
1171 |
def cleanup(self): |
3224.4.1
by Andrew Bennetts
Prune __dict__ of TestCases after they have run to save memory. |
1172 |
calls.append('cleanup') |
2338.4.8
by Marien Zwart
Fix a bug in selftest causing tearDown to run twice for skipped tests. |
1173 |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1174 |
runner = tests.TextTestRunner(stream=self._log_file) |
2338.4.8
by Marien Zwart
Fix a bug in selftest causing tearDown to run twice for skipped tests. |
1175 |
test = SkippedTest('test_skip') |
1176 |
result = self.run_test_runner(runner, test) |
|
1177 |
self.assertTrue(result.wasSuccessful()) |
|
2338.4.10
by Marien Zwart
Make a test skipped from setUp run tearDown again. Make calling _runCleanups twice safe. Clean up tests. |
1178 |
# Check if cleanup was called the right number of times.
|
3224.4.1
by Andrew Bennetts
Prune __dict__ of TestCases after they have run to save memory. |
1179 |
self.assertEqual(['setUp', 'cleanup'], calls) |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
1180 |
|
2729.1.1
by Martin Pool
Add TestNotApplicable exception and handling of it; document test parameterization |
1181 |
def test_not_applicable(self): |
1182 |
# run a test that is skipped because it's not applicable
|
|
4780.1.3
by Robert Collins
TestNotApplicable handling improved for compatibility with stdlib TestResult objects. |
1183 |
class Test(tests.TestCase): |
1184 |
def not_applicable_test(self): |
|
1185 |
raise tests.TestNotApplicable('this test never runs') |
|
2729.1.1
by Martin Pool
Add TestNotApplicable exception and handling of it; document test parameterization |
1186 |
out = StringIO() |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1187 |
runner = tests.TextTestRunner(stream=out, verbosity=2) |
4780.1.3
by Robert Collins
TestNotApplicable handling improved for compatibility with stdlib TestResult objects. |
1188 |
test = Test("not_applicable_test") |
2729.1.1
by Martin Pool
Add TestNotApplicable exception and handling of it; document test parameterization |
1189 |
result = self.run_test_runner(runner, test) |
1190 |
self._log_file.write(out.getvalue()) |
|
1191 |
self.assertTrue(result.wasSuccessful()) |
|
1192 |
self.assertTrue(result.wasStrictlySuccessful()) |
|
1193 |
self.assertContainsRe(out.getvalue(), |
|
1194 |
r'(?m)not_applicable_test * N/A') |
|
1195 |
self.assertContainsRe(out.getvalue(), |
|
1196 |
r'(?m)^ this test never runs') |
|
1197 |
||
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
1198 |
def test_unsupported_features_listed(self): |
1199 |
"""When unsupported features are encountered they are detailed."""
|
|
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
1200 |
class Feature1(features.Feature): |
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
1201 |
def _probe(self): return False |
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
1202 |
class Feature2(features.Feature): |
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
1203 |
def _probe(self): return False |
1204 |
# create sample tests
|
|
1205 |
test1 = SampleTestCase('_test_pass') |
|
1206 |
test1._test_needs_features = [Feature1()] |
|
1207 |
test2 = SampleTestCase('_test_pass') |
|
1208 |
test2._test_needs_features = [Feature2()] |
|
1209 |
test = unittest.TestSuite() |
|
1210 |
test.addTest(test1) |
|
1211 |
test.addTest(test2) |
|
1212 |
stream = StringIO() |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1213 |
runner = tests.TextTestRunner(stream=stream) |
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
1214 |
result = self.run_test_runner(runner, test) |
1215 |
lines = stream.getvalue().splitlines() |
|
1216 |
self.assertEqual([ |
|
1217 |
'OK', |
|
1218 |
"Missing feature 'Feature1' skipped 1 tests.", |
|
1219 |
"Missing feature 'Feature2' skipped 1 tests.", |
|
1220 |
],
|
|
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
1221 |
lines[-3:]) |
2367.1.5
by Robert Collins
Implement reporting of Unsupported tests in the bzr test result and runner |
1222 |
|
5425.3.1
by Martin
Add failing test for test count reported at start of verbose test run |
1223 |
def test_verbose_test_count(self): |
1224 |
"""A verbose test run reports the right test count at the start"""
|
|
1225 |
suite = TestUtil.TestSuite([ |
|
1226 |
unittest.FunctionTestCase(lambda:None), |
|
1227 |
unittest.FunctionTestCase(lambda:None)]) |
|
1228 |
self.assertEqual(suite.countTestCases(), 2) |
|
1229 |
stream = StringIO() |
|
1230 |
runner = tests.TextTestRunner(stream=stream, verbosity=2) |
|
1231 |
# Need to use the CountingDecorator as that's what sets num_tests
|
|
1232 |
result = self.run_test_runner(runner, tests.CountingDecorator(suite)) |
|
1233 |
self.assertStartsWith(stream.getvalue(), "running 2 tests") |
|
1234 |
||
4650.1.8
by Robert Collins
Push all starting up reporting down into startTestRun. |
1235 |
def test_startTestRun(self): |
1236 |
"""run should call result.startTestRun()"""
|
|
1237 |
calls = [] |
|
5495.1.1
by Andrew Bennetts
Remove unused definition of ForwardingResult, and switch all code to use the testtools name for it. Also remove a few unused imports. |
1238 |
class LoggingDecorator(ExtendedToOriginalDecorator): |
4650.1.8
by Robert Collins
Push all starting up reporting down into startTestRun. |
1239 |
def startTestRun(self): |
5495.1.1
by Andrew Bennetts
Remove unused definition of ForwardingResult, and switch all code to use the testtools name for it. Also remove a few unused imports. |
1240 |
ExtendedToOriginalDecorator.startTestRun(self) |
4650.1.8
by Robert Collins
Push all starting up reporting down into startTestRun. |
1241 |
calls.append('startTestRun') |
1242 |
test = unittest.FunctionTestCase(lambda:None) |
|
1243 |
stream = StringIO() |
|
1244 |
runner = tests.TextTestRunner(stream=stream, |
|
1245 |
result_decorators=[LoggingDecorator]) |
|
1246 |
result = self.run_test_runner(runner, test) |
|
1247 |
self.assertLength(1, calls) |
|
1248 |
||
4650.1.7
by Robert Collins
Push result reporting thoroughly into TestResult. |
1249 |
def test_stopTestRun(self): |
1250 |
"""run should call result.stopTestRun()"""
|
|
1251 |
calls = [] |
|
5495.1.1
by Andrew Bennetts
Remove unused definition of ForwardingResult, and switch all code to use the testtools name for it. Also remove a few unused imports. |
1252 |
class LoggingDecorator(ExtendedToOriginalDecorator): |
4650.1.7
by Robert Collins
Push result reporting thoroughly into TestResult. |
1253 |
def stopTestRun(self): |
5495.1.1
by Andrew Bennetts
Remove unused definition of ForwardingResult, and switch all code to use the testtools name for it. Also remove a few unused imports. |
1254 |
ExtendedToOriginalDecorator.stopTestRun(self) |
4650.1.7
by Robert Collins
Push result reporting thoroughly into TestResult. |
1255 |
calls.append('stopTestRun') |
1256 |
test = unittest.FunctionTestCase(lambda:None) |
|
1257 |
stream = StringIO() |
|
1258 |
runner = tests.TextTestRunner(stream=stream, |
|
1259 |
result_decorators=[LoggingDecorator]) |
|
1260 |
result = self.run_test_runner(runner, test) |
|
1261 |
self.assertLength(1, calls) |
|
1262 |
||
5410.2.1
by Martin
Escape unprintable test result output rather than aborting selftest |
1263 |
def test_unicode_test_output_on_ascii_stream(self): |
1264 |
"""Showing results should always succeed even on an ascii console"""
|
|
1265 |
class FailureWithUnicode(tests.TestCase): |
|
1266 |
def test_log_unicode(self): |
|
1267 |
self.log(u"\u2606") |
|
1268 |
self.fail("Now print that log!") |
|
1269 |
out = StringIO() |
|
1270 |
self.overrideAttr(osutils, "get_terminal_encoding", |
|
1271 |
lambda trace=False: "ascii") |
|
1272 |
result = self.run_test_runner(tests.TextTestRunner(stream=out), |
|
1273 |
FailureWithUnicode("test_log_unicode")) |
|
1274 |
self.assertContainsRe(out.getvalue(), |
|
6015.33.14
by Martin Packman
Adapt test_selftest output regexps to accept both old and new testtools output |
1275 |
"(?:Text attachment: )?log"
|
1276 |
"(?:\n-+\n|: {{{)" |
|
1277 |
"\d+\.\d+ \\\\u2606" |
|
1278 |
"(?:\n-+\n|}}}\n)") |
|
5410.2.1
by Martin
Escape unprintable test result output rather than aborting selftest |
1279 |
|
2036.1.2
by John Arbash Meinel
whitespace fix |
1280 |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1281 |
class SampleTestCase(tests.TestCase): |
2367.1.3
by Robert Collins
Add support for calling addNotSupported on TestResults to bzr TestCase's |
1282 |
|
1283 |
def _test_pass(self): |
|
1284 |
pass
|
|
1285 |
||
3287.20.1
by John Arbash Meinel
Update assertListRaises so that it returns the exception. |
1286 |
class _TestException(Exception): |
1287 |
pass
|
|
2367.1.3
by Robert Collins
Add support for calling addNotSupported on TestResults to bzr TestCase's |
1288 |
|
4523.4.11
by John Arbash Meinel
Update the tests, adding a test for -Edisable_lock_checks. |
1289 |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1290 |
class TestTestCase(tests.TestCase): |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
1291 |
"""Tests that test the core bzrlib TestCase."""
|
1292 |
||
4144.1.1
by Robert Collins
New assertLength method based on one Martin has squirreled away somewhere. |
1293 |
def test_assertLength_matches_empty(self): |
1294 |
a_list = [] |
|
1295 |
self.assertLength(0, a_list) |
|
1296 |
||
1297 |
def test_assertLength_matches_nonempty(self): |
|
1298 |
a_list = [1, 2, 3] |
|
1299 |
self.assertLength(3, a_list) |
|
1300 |
||
1301 |
def test_assertLength_fails_different(self): |
|
1302 |
a_list = [] |
|
1303 |
self.assertRaises(AssertionError, self.assertLength, 1, a_list) |
|
1304 |
||
1305 |
def test_assertLength_shows_sequence_in_failure(self): |
|
1306 |
a_list = [1, 2, 3] |
|
1307 |
exception = self.assertRaises(AssertionError, self.assertLength, 2, |
|
1308 |
a_list) |
|
1309 |
self.assertEqual('Incorrect length: wanted 2, got 3 for [1, 2, 3]', |
|
1310 |
exception.args[0]) |
|
1311 |
||
4153.1.1
by Andrew Bennetts
Check that TestCase.setUp was called in TestCase.run. If not, fail the test. |
1312 |
def test_base_setUp_not_called_causes_failure(self): |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1313 |
class TestCaseWithBrokenSetUp(tests.TestCase): |
4153.1.1
by Andrew Bennetts
Check that TestCase.setUp was called in TestCase.run. If not, fail the test. |
1314 |
def setUp(self): |
1315 |
pass # does not call TestCase.setUp |
|
1316 |
def test_foo(self): |
|
1317 |
pass
|
|
1318 |
test = TestCaseWithBrokenSetUp('test_foo') |
|
1319 |
result = unittest.TestResult() |
|
1320 |
test.run(result) |
|
1321 |
self.assertFalse(result.wasSuccessful()) |
|
4153.1.5
by Andrew Bennetts
Tweak assertions based on Robert's review. |
1322 |
self.assertEqual(1, result.testsRun) |
4153.1.1
by Andrew Bennetts
Check that TestCase.setUp was called in TestCase.run. If not, fail the test. |
1323 |
|
4153.1.3
by Andrew Bennetts
Check that bzrlib.tests.TestCase.tearDown is called too. |
1324 |
def test_base_tearDown_not_called_causes_failure(self): |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1325 |
class TestCaseWithBrokenTearDown(tests.TestCase): |
4153.1.3
by Andrew Bennetts
Check that bzrlib.tests.TestCase.tearDown is called too. |
1326 |
def tearDown(self): |
1327 |
pass # does not call TestCase.tearDown |
|
1328 |
def test_foo(self): |
|
1329 |
pass
|
|
1330 |
test = TestCaseWithBrokenTearDown('test_foo') |
|
1331 |
result = unittest.TestResult() |
|
1332 |
test.run(result) |
|
1333 |
self.assertFalse(result.wasSuccessful()) |
|
4153.1.5
by Andrew Bennetts
Tweak assertions based on Robert's review. |
1334 |
self.assertEqual(1, result.testsRun) |
4153.1.3
by Andrew Bennetts
Check that bzrlib.tests.TestCase.tearDown is called too. |
1335 |
|
2560.1.1
by Robert Collins
Make debug.debug_flags be isolated for all tests. |
1336 |
def test_debug_flags_sanitised(self): |
1337 |
"""The bzrlib debug flags should be sanitised by setUp."""
|
|
3731.3.1
by Andrew Bennetts
Make the test suite pass when -Eallow_debug is used. |
1338 |
if 'allow_debug' in tests.selftest_debug_flags: |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1339 |
raise tests.TestNotApplicable( |
3731.3.2
by Andrew Bennetts
Fix typo. |
1340 |
'-Eallow_debug option prevents debug flag sanitisation') |
2560.1.1
by Robert Collins
Make debug.debug_flags be isolated for all tests. |
1341 |
# we could set something and run a test that will check
|
1342 |
# it gets santised, but this is probably sufficient for now:
|
|
1343 |
# if someone runs the test with -Dsomething it will error.
|
|
4523.4.12
by John Arbash Meinel
Update the test_selftest tests so that they pass again. |
1344 |
flags = set() |
1345 |
if self._lock_check_thorough: |
|
1346 |
flags.add('strict_locks') |
|
1347 |
self.assertEqual(flags, bzrlib.debug.debug_flags) |
|
2560.1.1
by Robert Collins
Make debug.debug_flags be isolated for all tests. |
1348 |
|
3731.3.3
by Andrew Bennetts
Add tests suggested by Vincent. |
1349 |
def change_selftest_debug_flags(self, new_flags): |
4985.1.5
by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity |
1350 |
self.overrideAttr(tests, 'selftest_debug_flags', set(new_flags)) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1351 |
|
3731.3.3
by Andrew Bennetts
Add tests suggested by Vincent. |
1352 |
def test_allow_debug_flag(self): |
1353 |
"""The -Eallow_debug flag prevents bzrlib.debug.debug_flags from being
|
|
1354 |
sanitised (i.e. cleared) before running a test.
|
|
1355 |
"""
|
|
1356 |
self.change_selftest_debug_flags(set(['allow_debug'])) |
|
1357 |
bzrlib.debug.debug_flags = set(['a-flag']) |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1358 |
class TestThatRecordsFlags(tests.TestCase): |
3731.3.3
by Andrew Bennetts
Add tests suggested by Vincent. |
1359 |
def test_foo(nested_self): |
1360 |
self.flags = set(bzrlib.debug.debug_flags) |
|
1361 |
test = TestThatRecordsFlags('test_foo') |
|
1362 |
test.run(self.make_test_result()) |
|
4523.4.12
by John Arbash Meinel
Update the test_selftest tests so that they pass again. |
1363 |
flags = set(['a-flag']) |
1364 |
if 'disable_lock_checks' not in tests.selftest_debug_flags: |
|
1365 |
flags.add('strict_locks') |
|
1366 |
self.assertEqual(flags, self.flags) |
|
3731.3.3
by Andrew Bennetts
Add tests suggested by Vincent. |
1367 |
|
4523.4.11
by John Arbash Meinel
Update the tests, adding a test for -Edisable_lock_checks. |
1368 |
def test_disable_lock_checks(self): |
1369 |
"""The -Edisable_lock_checks flag disables thorough checks."""
|
|
1370 |
class TestThatRecordsFlags(tests.TestCase): |
|
1371 |
def test_foo(nested_self): |
|
1372 |
self.flags = set(bzrlib.debug.debug_flags) |
|
1373 |
self.test_lock_check_thorough = nested_self._lock_check_thorough |
|
4523.4.12
by John Arbash Meinel
Update the test_selftest tests so that they pass again. |
1374 |
self.change_selftest_debug_flags(set()) |
4523.4.11
by John Arbash Meinel
Update the tests, adding a test for -Edisable_lock_checks. |
1375 |
test = TestThatRecordsFlags('test_foo') |
1376 |
test.run(self.make_test_result()) |
|
4523.4.12
by John Arbash Meinel
Update the test_selftest tests so that they pass again. |
1377 |
# By default we do strict lock checking and thorough lock/unlock
|
1378 |
# tracking.
|
|
4523.4.11
by John Arbash Meinel
Update the tests, adding a test for -Edisable_lock_checks. |
1379 |
self.assertTrue(self.test_lock_check_thorough) |
4523.4.12
by John Arbash Meinel
Update the test_selftest tests so that they pass again. |
1380 |
self.assertEqual(set(['strict_locks']), self.flags) |
1381 |
# Now set the disable_lock_checks flag, and show that this changed.
|
|
4523.4.11
by John Arbash Meinel
Update the tests, adding a test for -Edisable_lock_checks. |
1382 |
self.change_selftest_debug_flags(set(['disable_lock_checks'])) |
1383 |
test = TestThatRecordsFlags('test_foo') |
|
1384 |
test.run(self.make_test_result()) |
|
1385 |
self.assertFalse(self.test_lock_check_thorough) |
|
1386 |
self.assertEqual(set(), self.flags) |
|
1387 |
||
4523.4.13
by John Arbash Meinel
Add a test that thisFailsStrictLockCheck() does the right thing. |
1388 |
def test_this_fails_strict_lock_check(self): |
1389 |
class TestThatRecordsFlags(tests.TestCase): |
|
1390 |
def test_foo(nested_self): |
|
1391 |
self.flags1 = set(bzrlib.debug.debug_flags) |
|
1392 |
self.thisFailsStrictLockCheck() |
|
1393 |
self.flags2 = set(bzrlib.debug.debug_flags) |
|
1394 |
# Make sure lock checking is active
|
|
1395 |
self.change_selftest_debug_flags(set()) |
|
1396 |
test = TestThatRecordsFlags('test_foo') |
|
1397 |
test.run(self.make_test_result()) |
|
1398 |
self.assertEqual(set(['strict_locks']), self.flags1) |
|
1399 |
self.assertEqual(set(), self.flags2) |
|
1400 |
||
3731.3.3
by Andrew Bennetts
Add tests suggested by Vincent. |
1401 |
def test_debug_flags_restored(self): |
1402 |
"""The bzrlib debug flags should be restored to their original state
|
|
1403 |
after the test was run, even if allow_debug is set.
|
|
1404 |
"""
|
|
1405 |
self.change_selftest_debug_flags(set(['allow_debug'])) |
|
1406 |
# Now run a test that modifies debug.debug_flags.
|
|
1407 |
bzrlib.debug.debug_flags = set(['original-state']) |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1408 |
class TestThatModifiesFlags(tests.TestCase): |
3731.3.3
by Andrew Bennetts
Add tests suggested by Vincent. |
1409 |
def test_foo(self): |
1410 |
bzrlib.debug.debug_flags = set(['modified']) |
|
1411 |
test = TestThatModifiesFlags('test_foo') |
|
1412 |
test.run(self.make_test_result()) |
|
1413 |
self.assertEqual(set(['original-state']), bzrlib.debug.debug_flags) |
|
1414 |
||
1415 |
def make_test_result(self): |
|
4794.1.7
by Robert Collins
Remove references to _get_log from test_selftest. |
1416 |
"""Get a test result that writes to the test log file."""
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1417 |
return tests.TextTestResult(self._log_file, descriptions=0, verbosity=1) |
3731.3.3
by Andrew Bennetts
Add tests suggested by Vincent. |
1418 |
|
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
1419 |
def inner_test(self): |
1420 |
# the inner child test
|
|
1421 |
note("inner_test") |
|
1422 |
||
1423 |
def outer_child(self): |
|
1424 |
# the outer child test
|
|
1425 |
note("outer_start") |
|
1426 |
self.inner_test = TestTestCase("inner_child") |
|
3731.3.3
by Andrew Bennetts
Add tests suggested by Vincent. |
1427 |
result = self.make_test_result() |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
1428 |
self.inner_test.run(result) |
1429 |
note("outer finish") |
|
4794.1.2
by Robert Collins
First cut at testtools support: rename, remove TestCase.run() and change testcase tests to not assume the same instance runs (for cleaner testing at this point). |
1430 |
self.addCleanup(osutils.delete_any, self._log_file_name) |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
1431 |
|
1432 |
def test_trace_nesting(self): |
|
1433 |
# this tests that each test case nests its trace facility correctly.
|
|
1434 |
# we do this by running a test case manually. That test case (A)
|
|
1435 |
# should setup a new log, log content to it, setup a child case (B),
|
|
1436 |
# which should log independently, then case (A) should log a trailer
|
|
1437 |
# and return.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1438 |
# we do two nested children so that we can verify the state of the
|
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
1439 |
# logs after the outer child finishes is correct, which a bad clean
|
1440 |
# up routine in tearDown might trigger a fault in our test with only
|
|
1441 |
# one child, we should instead see the bad result inside our test with
|
|
1442 |
# the two children.
|
|
1443 |
# the outer child test
|
|
1444 |
original_trace = bzrlib.trace._trace_file |
|
1445 |
outer_test = TestTestCase("outer_child") |
|
3731.3.3
by Andrew Bennetts
Add tests suggested by Vincent. |
1446 |
result = self.make_test_result() |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
1447 |
outer_test.run(result) |
1448 |
self.assertEqual(original_trace, bzrlib.trace._trace_file) |
|
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) |
1449 |
|
1450 |
def method_that_times_a_bit_twice(self): |
|
1451 |
# call self.time twice to ensure it aggregates
|
|
1713.1.4
by Robert Collins
Make the test test_time_creates_benchmark_in_result more robust to timing variation. |
1452 |
self.time(time.sleep, 0.007) |
1453 |
self.time(time.sleep, 0.007) |
|
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) |
1454 |
|
1455 |
def test_time_creates_benchmark_in_result(self): |
|
1456 |
"""Test that the TestCase.time() method accumulates a benchmark time."""
|
|
1457 |
sample_test = TestTestCase("method_that_times_a_bit_twice") |
|
1458 |
output_stream = StringIO() |
|
2095.4.1
by Martin Pool
Better progress bars during tests |
1459 |
result = bzrlib.tests.VerboseTestResult( |
5340.6.1
by Martin
Avoid Python 2.7 unittest incompatibilites |
1460 |
output_stream, |
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) |
1461 |
descriptions=0, |
4573.2.2
by Robert Collins
Fix selftest for TestResult progress changes. |
1462 |
verbosity=2) |
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) |
1463 |
sample_test.run(result) |
1464 |
self.assertContainsRe( |
|
1465 |
output_stream.getvalue(), |
|
4536.5.5
by Martin Pool
More selftest display test tweaks |
1466 |
r"\d+ms\*\n$") |
2245.1.1
by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers |
1467 |
|
1468 |
def test_hooks_sanitised(self): |
|
1469 |
"""The bzrlib hooks should be sanitised by setUp."""
|
|
4000.1.1
by Robert Collins
Add a new hook Commands['extend_command'] for plugins that want to alter commands without overriding the entire command. |
1470 |
# Note this test won't fail with hooks that the core library doesn't
|
1471 |
# use - but it trigger with a plugin that adds hooks, so its still a
|
|
1472 |
# useful warning in that case.
|
|
5622.3.10
by Jelmer Vernooij
Don't require arguments to hooks. |
1473 |
self.assertEqual(bzrlib.branch.BranchHooks(), bzrlib.branch.Branch.hooks) |
1474 |
self.assertEqual( |
|
1475 |
bzrlib.smart.server.SmartServerHooks(), |
|
2400.1.7
by Andrew Bennetts
Merge from bzr.dev. |
1476 |
bzrlib.smart.server.SmartTCPServer.hooks) |
5622.3.7
by Jelmer Vernooij
Fix tests. |
1477 |
self.assertEqual( |
5622.3.10
by Jelmer Vernooij
Don't require arguments to hooks. |
1478 |
bzrlib.commands.CommandHooks(), bzrlib.commands.Command.hooks) |
2245.1.1
by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers |
1479 |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
1480 |
def test__gather_lsprof_in_benchmarks(self): |
1481 |
"""When _gather_lsprof_in_benchmarks is on, accumulate profile data.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1482 |
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
1483 |
Each self.time() call is individually and separately profiled.
|
1484 |
"""
|
|
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
1485 |
self.requireFeature(features.lsprof_feature) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1486 |
# overrides the class member with an instance member so no cleanup
|
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
1487 |
# needed.
|
1488 |
self._gather_lsprof_in_benchmarks = True |
|
1489 |
self.time(time.sleep, 0.000) |
|
1490 |
self.time(time.sleep, 0.003) |
|
1491 |
self.assertEqual(2, len(self._benchcalls)) |
|
1492 |
self.assertEqual((time.sleep, (0.000,), {}), self._benchcalls[0][0]) |
|
1493 |
self.assertEqual((time.sleep, (0.003,), {}), self._benchcalls[1][0]) |
|
1494 |
self.assertIsInstance(self._benchcalls[0][1], bzrlib.lsprof.Stats) |
|
1495 |
self.assertIsInstance(self._benchcalls[1][1], bzrlib.lsprof.Stats) |
|
4641.3.1
by Robert Collins
Squelch test noise on test__gather_lsprof_in_benchmarks verbose mode. |
1496 |
del self._benchcalls[:] |
1725.1.1
by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate |
1497 |
|
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
1498 |
def test_knownFailure(self): |
1499 |
"""Self.knownFailure() should raise a KnownFailure exception."""
|
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1500 |
self.assertRaises(tests.KnownFailure, self.knownFailure, "A Failure") |
2367.1.2
by Robert Collins
Some minor cleanups of test code, and implement KnownFailure support as |
1501 |
|
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
1502 |
def test_open_bzrdir_safe_roots(self): |
1503 |
# even a memory transport should fail to open when its url isn't
|
|
1504 |
# permitted.
|
|
1505 |
# Manually set one up (TestCase doesn't and shouldn't provide magic
|
|
1506 |
# machinery)
|
|
5017.3.45
by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry. |
1507 |
transport_server = memory.MemoryServer() |
4934.3.3
by Martin Pool
Rename Server.setUp to Server.start_server |
1508 |
transport_server.start_server() |
4934.3.1
by Martin Pool
Rename Server.tearDown to .stop_server |
1509 |
self.addCleanup(transport_server.stop_server) |
6083.1.1
by Jelmer Vernooij
Use get_transport_from_{url,path} in more places. |
1510 |
t = transport.get_transport_from_url(transport_server.get_url()) |
6472.2.1
by Jelmer Vernooij
Use bzrdir.controldir for generic access to control directories. |
1511 |
controldir.ControlDir.create(t.base) |
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
1512 |
self.assertRaises(errors.BzrError, |
6472.2.1
by Jelmer Vernooij
Use bzrdir.controldir for generic access to control directories. |
1513 |
controldir.ControlDir.open_from_transport, t) |
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
1514 |
# But if we declare this as safe, we can open the bzrdir.
|
1515 |
self.permit_url(t.base) |
|
1516 |
self._bzr_selftest_roots.append(t.base) |
|
6472.2.1
by Jelmer Vernooij
Use bzrdir.controldir for generic access to control directories. |
1517 |
controldir.ControlDir.open_from_transport(t) |
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
1518 |
|
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
1519 |
def test_requireFeature_available(self): |
1520 |
"""self.requireFeature(available) is a no-op."""
|
|
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
1521 |
class Available(features.Feature): |
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
1522 |
def _probe(self):return True |
1523 |
feature = Available() |
|
1524 |
self.requireFeature(feature) |
|
1525 |
||
1526 |
def test_requireFeature_unavailable(self): |
|
1527 |
"""self.requireFeature(unavailable) raises UnavailableFeature."""
|
|
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
1528 |
class Unavailable(features.Feature): |
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
1529 |
def _probe(self):return False |
1530 |
feature = Unavailable() |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1531 |
self.assertRaises(tests.UnavailableFeature, |
1532 |
self.requireFeature, feature) |
|
2367.1.6
by Robert Collins
Allow per-test-fixture feature requirements via 'requireFeature'.(Robert Collins) |
1533 |
|
2367.1.3
by Robert Collins
Add support for calling addNotSupported on TestResults to bzr TestCase's |
1534 |
def test_run_no_parameters(self): |
1535 |
test = SampleTestCase('_test_pass') |
|
1536 |
test.run() |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1537 |
|
2367.1.3
by Robert Collins
Add support for calling addNotSupported on TestResults to bzr TestCase's |
1538 |
def test_run_enabled_unittest_result(self): |
5050.33.3
by Andrew Bennetts
Restore accidentally deleted test docstring. |
1539 |
"""Test we revert to regular behaviour when the test is enabled."""
|
2367.1.3
by Robert Collins
Add support for calling addNotSupported on TestResults to bzr TestCase's |
1540 |
test = SampleTestCase('_test_pass') |
1541 |
class EnabledFeature(object): |
|
1542 |
def available(self): |
|
1543 |
return True |
|
1544 |
test._test_needs_features = [EnabledFeature()] |
|
1545 |
result = unittest.TestResult() |
|
1546 |
test.run(result) |
|
1547 |
self.assertEqual(1, result.testsRun) |
|
1548 |
self.assertEqual([], result.errors) |
|
1549 |
self.assertEqual([], result.failures) |
|
1550 |
||
1551 |
def test_run_disabled_unittest_result(self): |
|
1552 |
"""Test our compatability for disabled tests with unittest results."""
|
|
1553 |
test = SampleTestCase('_test_pass') |
|
1554 |
class DisabledFeature(object): |
|
1555 |
def available(self): |
|
1556 |
return False |
|
1557 |
test._test_needs_features = [DisabledFeature()] |
|
1558 |
result = unittest.TestResult() |
|
1559 |
test.run(result) |
|
1560 |
self.assertEqual(1, result.testsRun) |
|
1561 |
self.assertEqual([], result.errors) |
|
1562 |
self.assertEqual([], result.failures) |
|
1563 |
||
1564 |
def test_run_disabled_supporting_result(self): |
|
1565 |
"""Test disabled tests behaviour with support aware results."""
|
|
1566 |
test = SampleTestCase('_test_pass') |
|
1567 |
class DisabledFeature(object): |
|
4794.1.2
by Robert Collins
First cut at testtools support: rename, remove TestCase.run() and change testcase tests to not assume the same instance runs (for cleaner testing at this point). |
1568 |
def __eq__(self, other): |
1569 |
return isinstance(other, DisabledFeature) |
|
2367.1.3
by Robert Collins
Add support for calling addNotSupported on TestResults to bzr TestCase's |
1570 |
def available(self): |
1571 |
return False |
|
1572 |
the_feature = DisabledFeature() |
|
1573 |
test._test_needs_features = [the_feature] |
|
1574 |
class InstrumentedTestResult(unittest.TestResult): |
|
1575 |
def __init__(self): |
|
1576 |
unittest.TestResult.__init__(self) |
|
1577 |
self.calls = [] |
|
1578 |
def startTest(self, test): |
|
1579 |
self.calls.append(('startTest', test)) |
|
1580 |
def stopTest(self, test): |
|
1581 |
self.calls.append(('stopTest', test)) |
|
1582 |
def addNotSupported(self, test, feature): |
|
1583 |
self.calls.append(('addNotSupported', test, feature)) |
|
1584 |
result = InstrumentedTestResult() |
|
1585 |
test.run(result) |
|
4794.1.2
by Robert Collins
First cut at testtools support: rename, remove TestCase.run() and change testcase tests to not assume the same instance runs (for cleaner testing at this point). |
1586 |
case = result.calls[0][1] |
2367.1.3
by Robert Collins
Add support for calling addNotSupported on TestResults to bzr TestCase's |
1587 |
self.assertEqual([ |
4794.1.2
by Robert Collins
First cut at testtools support: rename, remove TestCase.run() and change testcase tests to not assume the same instance runs (for cleaner testing at this point). |
1588 |
('startTest', case), |
1589 |
('addNotSupported', case, the_feature), |
|
1590 |
('stopTest', case), |
|
2367.1.3
by Robert Collins
Add support for calling addNotSupported on TestResults to bzr TestCase's |
1591 |
],
|
1592 |
result.calls) |
|
1593 |
||
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
1594 |
def test_start_server_registers_url(self): |
5017.3.45
by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry. |
1595 |
transport_server = memory.MemoryServer() |
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
1596 |
# A little strict, but unlikely to be changed soon.
|
1597 |
self.assertEqual([], self._bzr_selftest_roots) |
|
1598 |
self.start_server(transport_server) |
|
1599 |
self.assertSubset([transport_server.get_url()], |
|
1600 |
self._bzr_selftest_roots) |
|
1601 |
||
3287.20.1
by John Arbash Meinel
Update assertListRaises so that it returns the exception. |
1602 |
def test_assert_list_raises_on_generator(self): |
1603 |
def generator_which_will_raise(): |
|
1604 |
# This will not raise until after the first yield
|
|
1605 |
yield 1 |
|
1606 |
raise _TestException() |
|
1607 |
||
1608 |
e = self.assertListRaises(_TestException, generator_which_will_raise) |
|
1609 |
self.assertIsInstance(e, _TestException) |
|
1610 |
||
1611 |
e = self.assertListRaises(Exception, generator_which_will_raise) |
|
1612 |
self.assertIsInstance(e, _TestException) |
|
1613 |
||
1614 |
def test_assert_list_raises_on_plain(self): |
|
1615 |
def plain_exception(): |
|
1616 |
raise _TestException() |
|
1617 |
return [] |
|
1618 |
||
1619 |
e = self.assertListRaises(_TestException, plain_exception) |
|
1620 |
self.assertIsInstance(e, _TestException) |
|
1621 |
||
1622 |
e = self.assertListRaises(Exception, plain_exception) |
|
1623 |
self.assertIsInstance(e, _TestException) |
|
1624 |
||
1625 |
def test_assert_list_raises_assert_wrong_exception(self): |
|
1626 |
class _NotTestException(Exception): |
|
1627 |
pass
|
|
1628 |
||
1629 |
def wrong_exception(): |
|
1630 |
raise _NotTestException() |
|
1631 |
||
1632 |
def wrong_exception_generator(): |
|
1633 |
yield 1 |
|
1634 |
yield 2 |
|
1635 |
raise _NotTestException() |
|
1636 |
||
1637 |
# Wrong exceptions are not intercepted
|
|
1638 |
self.assertRaises(_NotTestException, |
|
1639 |
self.assertListRaises, _TestException, wrong_exception) |
|
1640 |
self.assertRaises(_NotTestException, |
|
1641 |
self.assertListRaises, _TestException, wrong_exception_generator) |
|
1642 |
||
1643 |
def test_assert_list_raises_no_exception(self): |
|
1644 |
def success(): |
|
1645 |
return [] |
|
1646 |
||
1647 |
def success_generator(): |
|
1648 |
yield 1 |
|
1649 |
yield 2 |
|
1650 |
||
1651 |
self.assertRaises(AssertionError, |
|
1652 |
self.assertListRaises, _TestException, success) |
|
1653 |
||
1654 |
self.assertRaises(AssertionError, |
|
1655 |
self.assertListRaises, _TestException, success_generator) |
|
1656 |
||
6015.60.1
by John Arbash Meinel
Teach TestCase.overrideAttr how to handle attributes that don't exist yet. |
1657 |
def _run_successful_test(self, test): |
1658 |
result = testtools.TestResult() |
|
1659 |
test.run(result) |
|
1660 |
self.assertTrue(result.wasSuccessful()) |
|
1661 |
return result |
|
1662 |
||
4985.1.3
by Vincent Ladeuil
Change it to a more usable form. |
1663 |
def test_overrideAttr_without_value(self): |
4985.1.2
by Vincent Ladeuil
We're testing TestCase not TestRunner. |
1664 |
self.test_attr = 'original' # Define a test attribute |
1665 |
obj = self # Make 'obj' visible to the embedded test |
|
1666 |
class Test(tests.TestCase): |
|
1667 |
||
1668 |
def setUp(self): |
|
6552.1.3
by Vincent Ladeuil
Use super() instead of calling <base>.setup(self), as the original fix illustrated a too-easy-to-fall-into trap. |
1669 |
super(Test, self).setUp() |
4985.1.3
by Vincent Ladeuil
Change it to a more usable form. |
1670 |
self.orig = self.overrideAttr(obj, 'test_attr') |
1671 |
||
1672 |
def test_value(self): |
|
1673 |
self.assertEqual('original', self.orig) |
|
1674 |
self.assertEqual('original', obj.test_attr) |
|
4985.1.2
by Vincent Ladeuil
We're testing TestCase not TestRunner. |
1675 |
obj.test_attr = 'modified' |
4985.1.3
by Vincent Ladeuil
Change it to a more usable form. |
1676 |
self.assertEqual('modified', obj.test_attr) |
1677 |
||
6015.60.1
by John Arbash Meinel
Teach TestCase.overrideAttr how to handle attributes that don't exist yet. |
1678 |
self._run_successful_test(Test('test_value')) |
4985.1.3
by Vincent Ladeuil
Change it to a more usable form. |
1679 |
self.assertEqual('original', obj.test_attr) |
1680 |
||
1681 |
def test_overrideAttr_with_value(self): |
|
1682 |
self.test_attr = 'original' # Define a test attribute |
|
1683 |
obj = self # Make 'obj' visible to the embedded test |
|
1684 |
class Test(tests.TestCase): |
|
1685 |
||
1686 |
def setUp(self): |
|
6552.1.3
by Vincent Ladeuil
Use super() instead of calling <base>.setup(self), as the original fix illustrated a too-easy-to-fall-into trap. |
1687 |
super(Test, self).setUp() |
4985.1.3
by Vincent Ladeuil
Change it to a more usable form. |
1688 |
self.orig = self.overrideAttr(obj, 'test_attr', new='modified') |
4985.1.2
by Vincent Ladeuil
We're testing TestCase not TestRunner. |
1689 |
|
1690 |
def test_value(self): |
|
1691 |
self.assertEqual('original', self.orig) |
|
1692 |
self.assertEqual('modified', obj.test_attr) |
|
1693 |
||
6015.60.1
by John Arbash Meinel
Teach TestCase.overrideAttr how to handle attributes that don't exist yet. |
1694 |
self._run_successful_test(Test('test_value')) |
4985.1.2
by Vincent Ladeuil
We're testing TestCase not TestRunner. |
1695 |
self.assertEqual('original', obj.test_attr) |
1696 |
||
6015.60.1
by John Arbash Meinel
Teach TestCase.overrideAttr how to handle attributes that don't exist yet. |
1697 |
def test_overrideAttr_with_no_existing_value_and_value(self): |
1698 |
# Do not define the test_attribute
|
|
1699 |
obj = self # Make 'obj' visible to the embedded test |
|
1700 |
class Test(tests.TestCase): |
|
1701 |
||
1702 |
def setUp(self): |
|
1703 |
tests.TestCase.setUp(self) |
|
1704 |
self.orig = self.overrideAttr(obj, 'test_attr', new='modified') |
|
1705 |
||
1706 |
def test_value(self): |
|
1707 |
self.assertEqual(tests._unitialized_attr, self.orig) |
|
1708 |
self.assertEqual('modified', obj.test_attr) |
|
1709 |
||
1710 |
self._run_successful_test(Test('test_value')) |
|
1711 |
self.assertRaises(AttributeError, getattr, obj, 'test_attr') |
|
1712 |
||
1713 |
def test_overrideAttr_with_no_existing_value_and_no_value(self): |
|
1714 |
# Do not define the test_attribute
|
|
1715 |
obj = self # Make 'obj' visible to the embedded test |
|
1716 |
class Test(tests.TestCase): |
|
1717 |
||
1718 |
def setUp(self): |
|
1719 |
tests.TestCase.setUp(self) |
|
1720 |
self.orig = self.overrideAttr(obj, 'test_attr') |
|
1721 |
||
1722 |
def test_value(self): |
|
1723 |
self.assertEqual(tests._unitialized_attr, self.orig) |
|
1724 |
self.assertRaises(AttributeError, getattr, obj, 'test_attr') |
|
1725 |
||
1726 |
self._run_successful_test(Test('test_value')) |
|
1727 |
self.assertRaises(AttributeError, getattr, obj, 'test_attr') |
|
1728 |
||
6006.4.1
by Martin Pool
Add recordCalls test helper |
1729 |
def test_recordCalls(self): |
1730 |
from bzrlib.tests import test_selftest |
|
1731 |
calls = self.recordCalls( |
|
1732 |
test_selftest, '_add_numbers') |
|
1733 |
self.assertEqual(test_selftest._add_numbers(2, 10), |
|
1734 |
12) |
|
6006.4.13
by Martin Pool
typo |
1735 |
self.assertEquals(calls, [((2, 10), {})]) |
6006.4.1
by Martin Pool
Add recordCalls test helper |
1736 |
|
1737 |
||
1738 |
def _add_numbers(a, b): |
|
1739 |
return a + b |
|
1740 |
||
1534.11.4
by Robert Collins
Merge from mainline. |
1741 |
|
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
1742 |
class _MissingFeature(features.Feature): |
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
1743 |
def _probe(self): |
1744 |
return False |
|
1745 |
missing_feature = _MissingFeature() |
|
1746 |
||
1747 |
||
1748 |
def _get_test(name): |
|
1749 |
"""Get an instance of a specific example test.
|
|
1750 |
||
1751 |
We protect this in a function so that they don't auto-run in the test
|
|
1752 |
suite.
|
|
1753 |
"""
|
|
1754 |
||
1755 |
class ExampleTests(tests.TestCase): |
|
1756 |
||
1757 |
def test_fail(self): |
|
1758 |
mutter('this was a failing test') |
|
1759 |
self.fail('this test will fail') |
|
1760 |
||
1761 |
def test_error(self): |
|
1762 |
mutter('this test errored') |
|
1763 |
raise RuntimeError('gotcha') |
|
1764 |
||
1765 |
def test_missing_feature(self): |
|
1766 |
mutter('missing the feature') |
|
1767 |
self.requireFeature(missing_feature) |
|
1768 |
||
1769 |
def test_skip(self): |
|
1770 |
mutter('this test will be skipped') |
|
1771 |
raise tests.TestSkipped('reason') |
|
1772 |
||
1773 |
def test_success(self): |
|
1774 |
mutter('this test succeeds') |
|
1775 |
||
1776 |
def test_xfail(self): |
|
1777 |
mutter('test with expected failure') |
|
1778 |
self.knownFailure('this_fails') |
|
1779 |
||
1780 |
def test_unexpected_success(self): |
|
1781 |
mutter('test with unexpected success') |
|
1782 |
self.expectFailure('should_fail', lambda: None) |
|
1783 |
||
1784 |
return ExampleTests(name) |
|
1785 |
||
1786 |
||
5387.2.4
by John Arbash Meinel
Add tests for when we should and shouldn't get a 'log' in the details. |
1787 |
class TestTestCaseLogDetails(tests.TestCase): |
1788 |
||
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
1789 |
def _run_test(self, test_name): |
1790 |
test = _get_test(test_name) |
|
5387.2.4
by John Arbash Meinel
Add tests for when we should and shouldn't get a 'log' in the details. |
1791 |
result = testtools.TestResult() |
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
1792 |
test.run(result) |
5387.2.4
by John Arbash Meinel
Add tests for when we should and shouldn't get a 'log' in the details. |
1793 |
return result |
1794 |
||
1795 |
def test_fail_has_log(self): |
|
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
1796 |
result = self._run_test('test_fail') |
5387.2.4
by John Arbash Meinel
Add tests for when we should and shouldn't get a 'log' in the details. |
1797 |
self.assertEqual(1, len(result.failures)) |
1798 |
result_content = result.failures[0][1] |
|
6015.33.14
by Martin Packman
Adapt test_selftest output regexps to accept both old and new testtools output |
1799 |
self.assertContainsRe(result_content, |
1800 |
'(?m)^(?:Text attachment: )?log(?:$|: )') |
|
5387.2.4
by John Arbash Meinel
Add tests for when we should and shouldn't get a 'log' in the details. |
1801 |
self.assertContainsRe(result_content, 'this was a failing test') |
1802 |
||
1803 |
def test_error_has_log(self): |
|
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
1804 |
result = self._run_test('test_error') |
5387.2.4
by John Arbash Meinel
Add tests for when we should and shouldn't get a 'log' in the details. |
1805 |
self.assertEqual(1, len(result.errors)) |
1806 |
result_content = result.errors[0][1] |
|
6015.33.14
by Martin Packman
Adapt test_selftest output regexps to accept both old and new testtools output |
1807 |
self.assertContainsRe(result_content, |
1808 |
'(?m)^(?:Text attachment: )?log(?:$|: )') |
|
5387.2.4
by John Arbash Meinel
Add tests for when we should and shouldn't get a 'log' in the details. |
1809 |
self.assertContainsRe(result_content, 'this test errored') |
1810 |
||
1811 |
def test_skip_has_no_log(self): |
|
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
1812 |
result = self._run_test('test_skip') |
5387.2.4
by John Arbash Meinel
Add tests for when we should and shouldn't get a 'log' in the details. |
1813 |
self.assertEqual(['reason'], result.skip_reasons.keys()) |
1814 |
skips = result.skip_reasons['reason'] |
|
1815 |
self.assertEqual(1, len(skips)) |
|
1816 |
test = skips[0] |
|
1817 |
self.assertFalse('log' in test.getDetails()) |
|
1818 |
||
1819 |
def test_missing_feature_has_no_log(self): |
|
1820 |
# testtools doesn't know about addNotSupported, so it just gets
|
|
1821 |
# considered as a skip
|
|
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
1822 |
result = self._run_test('test_missing_feature') |
1823 |
self.assertEqual([missing_feature], result.skip_reasons.keys()) |
|
1824 |
skips = result.skip_reasons[missing_feature] |
|
5387.2.4
by John Arbash Meinel
Add tests for when we should and shouldn't get a 'log' in the details. |
1825 |
self.assertEqual(1, len(skips)) |
1826 |
test = skips[0] |
|
1827 |
self.assertFalse('log' in test.getDetails()) |
|
1828 |
||
1829 |
def test_xfail_has_no_log(self): |
|
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
1830 |
result = self._run_test('test_xfail') |
5387.2.4
by John Arbash Meinel
Add tests for when we should and shouldn't get a 'log' in the details. |
1831 |
self.assertEqual(1, len(result.expectedFailures)) |
1832 |
result_content = result.expectedFailures[0][1] |
|
6015.33.14
by Martin Packman
Adapt test_selftest output regexps to accept both old and new testtools output |
1833 |
self.assertNotContainsRe(result_content, |
1834 |
'(?m)^(?:Text attachment: )?log(?:$|: )') |
|
5387.2.4
by John Arbash Meinel
Add tests for when we should and shouldn't get a 'log' in the details. |
1835 |
self.assertNotContainsRe(result_content, 'test with expected failure') |
1836 |
||
1837 |
def test_unexpected_success_has_log(self): |
|
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
1838 |
result = self._run_test('test_unexpected_success') |
5387.2.4
by John Arbash Meinel
Add tests for when we should and shouldn't get a 'log' in the details. |
1839 |
self.assertEqual(1, len(result.unexpectedSuccesses)) |
1840 |
# Inconsistency, unexpectedSuccesses is a list of tests,
|
|
1841 |
# expectedFailures is a list of reasons?
|
|
1842 |
test = result.unexpectedSuccesses[0] |
|
1843 |
details = test.getDetails() |
|
1844 |
self.assertTrue('log' in details) |
|
1845 |
||
1846 |
||
5050.33.2
by Andrew Bennetts
More robust fix for TestCase cloning, this time with tests. |
1847 |
class TestTestCloning(tests.TestCase): |
1848 |
"""Tests that test cloning of TestCases (as used by multiply_tests)."""
|
|
1849 |
||
1850 |
def test_cloned_testcase_does_not_share_details(self): |
|
1851 |
"""A TestCase cloned with clone_test does not share mutable attributes
|
|
1852 |
such as details or cleanups.
|
|
1853 |
"""
|
|
1854 |
class Test(tests.TestCase): |
|
1855 |
def test_foo(self): |
|
1856 |
self.addDetail('foo', Content('text/plain', lambda: 'foo')) |
|
1857 |
orig_test = Test('test_foo') |
|
1858 |
cloned_test = tests.clone_test(orig_test, orig_test.id() + '(cloned)') |
|
1859 |
orig_test.run(unittest.TestResult()) |
|
1860 |
self.assertEqual('foo', orig_test.getDetails()['foo'].iter_bytes()) |
|
1861 |
self.assertEqual(None, cloned_test.getDetails().get('foo')) |
|
1862 |
||
1863 |
def test_double_apply_scenario_preserves_first_scenario(self): |
|
1864 |
"""Applying two levels of scenarios to a test preserves the attributes
|
|
1865 |
added by both scenarios.
|
|
1866 |
"""
|
|
1867 |
class Test(tests.TestCase): |
|
1868 |
def test_foo(self): |
|
1869 |
pass
|
|
1870 |
test = Test('test_foo') |
|
1871 |
scenarios_x = [('x=1', {'x': 1}), ('x=2', {'x': 2})] |
|
1872 |
scenarios_y = [('y=1', {'y': 1}), ('y=2', {'y': 2})] |
|
1873 |
suite = tests.multiply_tests(test, scenarios_x, unittest.TestSuite()) |
|
1874 |
suite = tests.multiply_tests(suite, scenarios_y, unittest.TestSuite()) |
|
1875 |
all_tests = list(tests.iter_suite_tests(suite)) |
|
1876 |
self.assertLength(4, all_tests) |
|
1877 |
all_xys = sorted((t.x, t.y) for t in all_tests) |
|
1878 |
self.assertEqual([(1, 1), (1, 2), (2, 1), (2, 2)], all_xys) |
|
1879 |
||
1880 |
||
3948.3.1
by Martin Pool
Remove old static deprecation template strings, and update style of their tests |
1881 |
# NB: Don't delete this; it's not actually from 0.11!
|
1882 |
@deprecated_function(deprecated_in((0, 11, 0))) |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1883 |
def sample_deprecated_function(): |
1884 |
"""A deprecated function to test applyDeprecated with."""
|
|
1885 |
return 2 |
|
1886 |
||
1887 |
||
1888 |
def sample_undeprecated_function(a_param): |
|
1889 |
"""A undeprecated function to test applyDeprecated with."""
|
|
1890 |
||
1891 |
||
1892 |
class ApplyDeprecatedHelper(object): |
|
1893 |
"""A helper class for ApplyDeprecated tests."""
|
|
1894 |
||
3948.3.1
by Martin Pool
Remove old static deprecation template strings, and update style of their tests |
1895 |
@deprecated_method(deprecated_in((0, 11, 0))) |
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1896 |
def sample_deprecated_method(self, param_one): |
1897 |
"""A deprecated method for testing with."""
|
|
1898 |
return param_one |
|
1899 |
||
1900 |
def sample_normal_method(self): |
|
1901 |
"""A undeprecated method."""
|
|
1902 |
||
3948.3.1
by Martin Pool
Remove old static deprecation template strings, and update style of their tests |
1903 |
@deprecated_method(deprecated_in((0, 10, 0))) |
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1904 |
def sample_nested_deprecation(self): |
1905 |
return sample_deprecated_function() |
|
1906 |
||
1907 |
||
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1908 |
class TestExtraAssertions(tests.TestCase): |
1540.3.22
by Martin Pool
[patch] Add TestCase.assertIsInstance |
1909 |
"""Tests for new test assertions in bzrlib test suite"""
|
1910 |
||
1911 |
def test_assert_isinstance(self): |
|
1912 |
self.assertIsInstance(2, int) |
|
1913 |
self.assertIsInstance(u'', basestring) |
|
4449.3.43
by Martin Pool
More tests for assertIsInstance |
1914 |
e = self.assertRaises(AssertionError, self.assertIsInstance, None, int) |
1915 |
self.assertEquals(str(e), |
|
1916 |
"None is an instance of <type 'NoneType'> rather than <type 'int'>") |
|
1540.3.22
by Martin Pool
[patch] Add TestCase.assertIsInstance |
1917 |
self.assertRaises(AssertionError, self.assertIsInstance, 23.3, int) |
4449.3.43
by Martin Pool
More tests for assertIsInstance |
1918 |
e = self.assertRaises(AssertionError, |
1919 |
self.assertIsInstance, None, int, "it's just not") |
|
1920 |
self.assertEquals(str(e), |
|
1921 |
"None is an instance of <type 'NoneType'> rather than <type 'int'>"
|
|
1922 |
": it's just not") |
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
1923 |
|
1692.3.1
by Robert Collins
Fix push to work with just a branch, no need for a working tree. |
1924 |
def test_assertEndsWith(self): |
1925 |
self.assertEndsWith('foo', 'oo') |
|
1926 |
self.assertRaises(AssertionError, self.assertEndsWith, 'o', 'oo') |
|
1927 |
||
4680.1.1
by Vincent Ladeuil
Surprisingly, assertEqualDiff was wrong. |
1928 |
def test_assertEqualDiff(self): |
1929 |
e = self.assertRaises(AssertionError, |
|
1930 |
self.assertEqualDiff, '', '\n') |
|
1931 |
self.assertEquals(str(e), |
|
1932 |
# Don't blink ! The '+' applies to the second string
|
|
1933 |
'first string is missing a final newline.\n+ \n') |
|
1934 |
e = self.assertRaises(AssertionError, |
|
1935 |
self.assertEqualDiff, '\n', '') |
|
1936 |
self.assertEquals(str(e), |
|
1937 |
# Don't blink ! The '-' applies to the second string
|
|
1938 |
'second string is missing a final newline.\n- \n') |
|
1939 |
||
1940 |
||
1941 |
class TestDeprecations(tests.TestCase): |
|
1942 |
||
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1943 |
def test_applyDeprecated_not_deprecated(self): |
1944 |
sample_object = ApplyDeprecatedHelper() |
|
1945 |
# calling an undeprecated callable raises an assertion
|
|
3948.3.1
by Martin Pool
Remove old static deprecation template strings, and update style of their tests |
1946 |
self.assertRaises(AssertionError, self.applyDeprecated, |
1947 |
deprecated_in((0, 11, 0)), |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1948 |
sample_object.sample_normal_method) |
3948.3.1
by Martin Pool
Remove old static deprecation template strings, and update style of their tests |
1949 |
self.assertRaises(AssertionError, self.applyDeprecated, |
1950 |
deprecated_in((0, 11, 0)), |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1951 |
sample_undeprecated_function, "a param value") |
1952 |
# calling a deprecated callable (function or method) with the wrong
|
|
1953 |
# expected deprecation fails.
|
|
3948.3.1
by Martin Pool
Remove old static deprecation template strings, and update style of their tests |
1954 |
self.assertRaises(AssertionError, self.applyDeprecated, |
1955 |
deprecated_in((0, 10, 0)), |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1956 |
sample_object.sample_deprecated_method, "a param value") |
3948.3.1
by Martin Pool
Remove old static deprecation template strings, and update style of their tests |
1957 |
self.assertRaises(AssertionError, self.applyDeprecated, |
1958 |
deprecated_in((0, 10, 0)), |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1959 |
sample_deprecated_function) |
1960 |
# calling a deprecated callable (function or method) with the right
|
|
1961 |
# expected deprecation returns the functions result.
|
|
3948.3.1
by Martin Pool
Remove old static deprecation template strings, and update style of their tests |
1962 |
self.assertEqual("a param value", |
1963 |
self.applyDeprecated(deprecated_in((0, 11, 0)), |
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1964 |
sample_object.sample_deprecated_method, "a param value")) |
3948.3.1
by Martin Pool
Remove old static deprecation template strings, and update style of their tests |
1965 |
self.assertEqual(2, self.applyDeprecated(deprecated_in((0, 11, 0)), |
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1966 |
sample_deprecated_function)) |
1967 |
# calling a nested deprecation with the wrong deprecation version
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1968 |
# fails even if a deeper nested function was deprecated with the
|
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1969 |
# supplied version.
|
1970 |
self.assertRaises(AssertionError, self.applyDeprecated, |
|
3948.3.1
by Martin Pool
Remove old static deprecation template strings, and update style of their tests |
1971 |
deprecated_in((0, 11, 0)), sample_object.sample_nested_deprecation) |
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1972 |
# calling a nested deprecation with the right deprecation value
|
1973 |
# returns the calls result.
|
|
3948.3.1
by Martin Pool
Remove old static deprecation template strings, and update style of their tests |
1974 |
self.assertEqual(2, self.applyDeprecated(deprecated_in((0, 10, 0)), |
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1975 |
sample_object.sample_nested_deprecation)) |
1976 |
||
1551.8.9
by Aaron Bentley
Rename assertDeprecated to callDeprecated |
1977 |
def test_callDeprecated(self): |
1551.8.8
by Aaron Bentley
Made assertDeprecated return the callable's result |
1978 |
def testfunc(be_deprecated, result=None): |
1910.2.10
by Aaron Bentley
Add tests for assertDeprecated |
1979 |
if be_deprecated is True: |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1980 |
symbol_versioning.warn('i am deprecated', DeprecationWarning, |
1910.2.10
by Aaron Bentley
Add tests for assertDeprecated |
1981 |
stacklevel=1) |
1551.8.8
by Aaron Bentley
Made assertDeprecated return the callable's result |
1982 |
return result |
1551.8.9
by Aaron Bentley
Rename assertDeprecated to callDeprecated |
1983 |
result = self.callDeprecated(['i am deprecated'], testfunc, True) |
1551.8.8
by Aaron Bentley
Made assertDeprecated return the callable's result |
1984 |
self.assertIs(None, result) |
1551.8.9
by Aaron Bentley
Rename assertDeprecated to callDeprecated |
1985 |
result = self.callDeprecated([], testfunc, False, 'result') |
1551.8.8
by Aaron Bentley
Made assertDeprecated return the callable's result |
1986 |
self.assertEqual('result', result) |
1982.3.2
by Robert Collins
New TestCase helper applyDeprecated. This allows you to call a callable |
1987 |
self.callDeprecated(['i am deprecated'], testfunc, be_deprecated=True) |
1551.8.9
by Aaron Bentley
Rename assertDeprecated to callDeprecated |
1988 |
self.callDeprecated([], testfunc, be_deprecated=False) |
1910.2.10
by Aaron Bentley
Add tests for assertDeprecated |
1989 |
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
1990 |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
1991 |
class TestWarningTests(tests.TestCase): |
2592.3.242
by Martin Pool
New method TestCase.call_catch_warnings |
1992 |
"""Tests for calling methods that raise warnings."""
|
1993 |
||
1994 |
def test_callCatchWarnings(self): |
|
1995 |
def meth(a, b): |
|
1996 |
warnings.warn("this is your last warning") |
|
1997 |
return a + b |
|
1998 |
wlist, result = self.callCatchWarnings(meth, 1, 2) |
|
1999 |
self.assertEquals(3, result) |
|
2000 |
# would like just to compare them, but UserWarning doesn't implement
|
|
2001 |
# eq well
|
|
2002 |
w0, = wlist |
|
2003 |
self.assertIsInstance(w0, UserWarning) |
|
2592.3.247
by Andrew Bennetts
Fix test_callCatchWarnings to pass when run with Python 2.4. |
2004 |
self.assertEquals("this is your last warning", str(w0)) |
2592.3.242
by Martin Pool
New method TestCase.call_catch_warnings |
2005 |
|
2006 |
||
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2007 |
class TestConvenienceMakers(tests.TestCaseWithTransport): |
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
2008 |
"""Test for the make_* convenience functions."""
|
2009 |
||
2010 |
def test_make_branch_and_tree_with_format(self): |
|
2011 |
# we should be able to supply a format to make_branch_and_tree
|
|
2012 |
self.make_branch_and_tree('a', format=bzrlib.bzrdir.BzrDirMetaFormat1()) |
|
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
2013 |
self.assertIsInstance(bzrlib.controldir.ControlDir.open('a')._format, |
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
2014 |
bzrlib.bzrdir.BzrDirMetaFormat1) |
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
2015 |
|
1986.2.1
by Robert Collins
Bugfix - the name of the test for make_branch_and_memory_tree was wrong. |
2016 |
def test_make_branch_and_memory_tree(self): |
1986.1.2
by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely |
2017 |
# we should be able to get a new branch and a mutable tree from
|
2018 |
# TestCaseWithTransport
|
|
2019 |
tree = self.make_branch_and_memory_tree('a') |
|
2020 |
self.assertIsInstance(tree, bzrlib.memorytree.MemoryTree) |
|
2021 |
||
4650.1.2
by Robert Collins
Remove unnecessary use of an SFTP server connection to test the behaviour of TestCase.make_branch_and_tree. |
2022 |
def test_make_tree_for_local_vfs_backed_transport(self): |
2023 |
# make_branch_and_tree has to use local branch and repositories
|
|
2024 |
# when the vfs transport and local disk are colocated, even if
|
|
2025 |
# a different transport is in use for url generation.
|
|
5017.3.24
by Vincent Ladeuil
selftest -s bt.test_selftest passing |
2026 |
self.transport_server = test_server.FakeVFATServer |
4650.1.2
by Robert Collins
Remove unnecessary use of an SFTP server connection to test the behaviour of TestCase.make_branch_and_tree. |
2027 |
self.assertFalse(self.get_url('t1').startswith('file://')) |
1910.14.1
by Andrew Bennetts
Fix to make_branch_and_tree's behavior when used with an sftp transport. |
2028 |
tree = self.make_branch_and_tree('t1') |
2029 |
base = tree.bzrdir.root_transport.base |
|
4650.1.2
by Robert Collins
Remove unnecessary use of an SFTP server connection to test the behaviour of TestCase.make_branch_and_tree. |
2030 |
self.assertStartsWith(base, 'file://') |
1910.14.1
by Andrew Bennetts
Fix to make_branch_and_tree's behavior when used with an sftp transport. |
2031 |
self.assertEquals(tree.bzrdir.root_transport, |
2032 |
tree.branch.bzrdir.root_transport) |
|
2033 |
self.assertEquals(tree.bzrdir.root_transport, |
|
2034 |
tree.branch.repository.bzrdir.root_transport) |
|
2035 |
||
2036 |
||
5387.2.5
by John Arbash Meinel
add a failing test that the subunit stream doesn't contain the log info. |
2037 |
class SelfTestHelper(object): |
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2038 |
|
2039 |
def run_selftest(self, **kwargs): |
|
2040 |
"""Run selftest returning its output."""
|
|
2041 |
output = StringIO() |
|
2042 |
old_transport = bzrlib.tests.default_transport |
|
2043 |
old_root = tests.TestCaseWithMemoryTransport.TEST_ROOT |
|
2044 |
tests.TestCaseWithMemoryTransport.TEST_ROOT = None |
|
2045 |
try: |
|
2046 |
self.assertEqual(True, tests.selftest(stream=output, **kwargs)) |
|
2047 |
finally: |
|
2048 |
bzrlib.tests.default_transport = old_transport |
|
2049 |
tests.TestCaseWithMemoryTransport.TEST_ROOT = old_root |
|
2050 |
output.seek(0) |
|
2051 |
return output |
|
2052 |
||
2053 |
||
2054 |
class TestSelftest(tests.TestCase, SelfTestHelper): |
|
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
2055 |
"""Tests of bzrlib.tests.selftest."""
|
2056 |
||
2057 |
def test_selftest_benchmark_parameter_invokes_test_suite__benchmark__(self): |
|
2058 |
factory_called = [] |
|
2059 |
def factory(): |
|
2060 |
factory_called.append(True) |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2061 |
return TestUtil.TestSuite() |
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
2062 |
out = StringIO() |
2063 |
err = StringIO() |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2064 |
self.apply_redirected(out, err, None, bzrlib.tests.selftest, |
1707.2.1
by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest. |
2065 |
test_suite_factory=factory) |
2066 |
self.assertEqual([True], factory_called) |
|
2172.4.3
by Alexander Belchenko
Change name of option to '--clean-output' and provide tests |
2067 |
|
4636.2.1
by Robert Collins
Test selftest --list-only and --randomize options using more precisely layers. |
2068 |
def factory(self): |
2069 |
"""A test suite factory."""
|
|
2070 |
class Test(tests.TestCase): |
|
2071 |
def a(self): |
|
2072 |
pass
|
|
2073 |
def b(self): |
|
2074 |
pass
|
|
2075 |
def c(self): |
|
2076 |
pass
|
|
2077 |
return TestUtil.TestSuite([Test("a"), Test("b"), Test("c")]) |
|
2078 |
||
2079 |
def test_list_only(self): |
|
2080 |
output = self.run_selftest(test_suite_factory=self.factory, |
|
2081 |
list_only=True) |
|
2082 |
self.assertEqual(3, len(output.readlines())) |
|
2083 |
||
2084 |
def test_list_only_filtered(self): |
|
2085 |
output = self.run_selftest(test_suite_factory=self.factory, |
|
2086 |
list_only=True, pattern="Test.b") |
|
2087 |
self.assertEndsWith(output.getvalue(), "Test.b\n") |
|
2088 |
self.assertLength(1, output.readlines()) |
|
2089 |
||
2090 |
def test_list_only_excludes(self): |
|
2091 |
output = self.run_selftest(test_suite_factory=self.factory, |
|
2092 |
list_only=True, exclude_pattern="Test.b") |
|
2093 |
self.assertNotContainsRe("Test.b", output.getvalue()) |
|
2094 |
self.assertLength(2, output.readlines()) |
|
2095 |
||
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
2096 |
def test_lsprof_tests(self): |
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
2097 |
self.requireFeature(features.lsprof_feature) |
5340.15.1
by John Arbash Meinel
supersede exc-info branch |
2098 |
results = [] |
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
2099 |
class Test(object): |
2100 |
def __call__(test, result): |
|
2101 |
test.run(result) |
|
2102 |
def run(test, result): |
|
5340.15.1
by John Arbash Meinel
supersede exc-info branch |
2103 |
results.append(result) |
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
2104 |
def countTestCases(self): |
2105 |
return 1 |
|
2106 |
self.run_selftest(test_suite_factory=Test, lsprof_tests=True) |
|
5340.15.1
by John Arbash Meinel
supersede exc-info branch |
2107 |
self.assertLength(1, results) |
2108 |
self.assertIsInstance(results.pop(), ExtendedToOriginalDecorator) |
|
4641.3.3
by Robert Collins
Enable --lsprof-tests on bzr selftest. |
2109 |
|
4636.2.1
by Robert Collins
Test selftest --list-only and --randomize options using more precisely layers. |
2110 |
def test_random(self): |
2111 |
# test randomising by listing a number of tests.
|
|
2112 |
output_123 = self.run_selftest(test_suite_factory=self.factory, |
|
2113 |
list_only=True, random_seed="123") |
|
2114 |
output_234 = self.run_selftest(test_suite_factory=self.factory, |
|
2115 |
list_only=True, random_seed="234") |
|
2116 |
self.assertNotEqual(output_123, output_234) |
|
2117 |
# "Randominzing test order..\n\n
|
|
2118 |
self.assertLength(5, output_123.readlines()) |
|
2119 |
self.assertLength(5, output_234.readlines()) |
|
2120 |
||
2121 |
def test_random_reuse_is_same_order(self): |
|
2122 |
# test randomising by listing a number of tests.
|
|
2123 |
expected = self.run_selftest(test_suite_factory=self.factory, |
|
2124 |
list_only=True, random_seed="123") |
|
2125 |
repeated = self.run_selftest(test_suite_factory=self.factory, |
|
2126 |
list_only=True, random_seed="123") |
|
2127 |
self.assertEqual(expected.getvalue(), repeated.getvalue()) |
|
2128 |
||
4636.2.3
by Robert Collins
Layer tests for selftest --subunit better. |
2129 |
def test_runner_class(self): |
4913.2.18
by John Arbash Meinel
Add a _CompatibilityThunkFeature. |
2130 |
self.requireFeature(features.subunit) |
4636.2.3
by Robert Collins
Layer tests for selftest --subunit better. |
2131 |
from subunit import ProtocolTestCase |
2132 |
stream = self.run_selftest(runner_class=tests.SubUnitBzrRunner, |
|
2133 |
test_suite_factory=self.factory) |
|
2134 |
test = ProtocolTestCase(stream) |
|
2135 |
result = unittest.TestResult() |
|
2136 |
test.run(result) |
|
2137 |
self.assertEqual(3, result.testsRun) |
|
2138 |
||
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2139 |
def test_starting_with_single_argument(self): |
2140 |
output = self.run_selftest(test_suite_factory=self.factory, |
|
2141 |
starting_with=['bzrlib.tests.test_selftest.Test.a'], |
|
2142 |
list_only=True) |
|
2143 |
self.assertEqual('bzrlib.tests.test_selftest.Test.a\n', |
|
2144 |
output.getvalue()) |
|
2145 |
||
2146 |
def test_starting_with_multiple_argument(self): |
|
2147 |
output = self.run_selftest(test_suite_factory=self.factory, |
|
2148 |
starting_with=['bzrlib.tests.test_selftest.Test.a', |
|
2149 |
'bzrlib.tests.test_selftest.Test.b'], |
|
2150 |
list_only=True) |
|
2151 |
self.assertEqual('bzrlib.tests.test_selftest.Test.a\n' |
|
2152 |
'bzrlib.tests.test_selftest.Test.b\n', |
|
2153 |
output.getvalue()) |
|
2154 |
||
4636.2.2
by Robert Collins
Fix selftest tests for --transport to test each layer precisely. |
2155 |
def check_transport_set(self, transport_server): |
2156 |
captured_transport = [] |
|
2157 |
def seen_transport(a_transport): |
|
2158 |
captured_transport.append(a_transport) |
|
2159 |
class Capture(tests.TestCase): |
|
2160 |
def a(self): |
|
2161 |
seen_transport(bzrlib.tests.default_transport) |
|
2162 |
def factory(): |
|
2163 |
return TestUtil.TestSuite([Capture("a")]) |
|
2164 |
self.run_selftest(transport=transport_server, test_suite_factory=factory) |
|
2165 |
self.assertEqual(transport_server, captured_transport[0]) |
|
2166 |
||
2167 |
def test_transport_sftp(self): |
|
4913.2.17
by John Arbash Meinel
Found another paramiko dependent |
2168 |
self.requireFeature(features.paramiko) |
5158.3.2
by Martin
Fix moved stub_sftp imports |
2169 |
from bzrlib.tests import stub_sftp |
4797.11.2
by Vincent Ladeuil
Stop requiring testtools for sftp use. |
2170 |
self.check_transport_set(stub_sftp.SFTPAbsoluteServer) |
4636.2.2
by Robert Collins
Fix selftest tests for --transport to test each layer precisely. |
2171 |
|
2172 |
def test_transport_memory(self): |
|
5017.3.45
by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry. |
2173 |
self.check_transport_set(memory.MemoryServer) |
4636.2.2
by Robert Collins
Fix selftest tests for --transport to test each layer precisely. |
2174 |
|
2172.4.3
by Alexander Belchenko
Change name of option to '--clean-output' and provide tests |
2175 |
|
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2176 |
class TestSelftestWithIdList(tests.TestCaseInTempDir, SelfTestHelper): |
2177 |
# Does IO: reads test.list
|
|
2178 |
||
2179 |
def test_load_list(self): |
|
2180 |
# Provide a list with one test - this test.
|
|
2181 |
test_id_line = '%s\n' % self.id() |
|
2182 |
self.build_tree_contents([('test.list', test_id_line)]) |
|
2183 |
# And generate a list of the tests in the suite.
|
|
2184 |
stream = self.run_selftest(load_list='test.list', list_only=True) |
|
2185 |
self.assertEqual(test_id_line, stream.getvalue()) |
|
2186 |
||
2187 |
def test_load_unknown(self): |
|
2188 |
# Provide a list with one test - this test.
|
|
2189 |
# And generate a list of the tests in the suite.
|
|
2190 |
err = self.assertRaises(errors.NoSuchFile, self.run_selftest, |
|
2191 |
load_list='missing file name', list_only=True) |
|
2192 |
||
2193 |
||
5387.2.5
by John Arbash Meinel
add a failing test that the subunit stream doesn't contain the log info. |
2194 |
class TestSubunitLogDetails(tests.TestCase, SelfTestHelper): |
2195 |
||
2196 |
_test_needs_features = [features.subunit] |
|
2197 |
||
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
2198 |
def run_subunit_stream(self, test_name): |
5387.2.5
by John Arbash Meinel
add a failing test that the subunit stream doesn't contain the log info. |
2199 |
from subunit import ProtocolTestCase |
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
2200 |
def factory(): |
2201 |
return TestUtil.TestSuite([_get_test(test_name)]) |
|
5387.2.5
by John Arbash Meinel
add a failing test that the subunit stream doesn't contain the log info. |
2202 |
stream = self.run_selftest(runner_class=tests.SubUnitBzrRunner, |
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
2203 |
test_suite_factory=factory) |
5387.2.5
by John Arbash Meinel
add a failing test that the subunit stream doesn't contain the log info. |
2204 |
test = ProtocolTestCase(stream) |
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
2205 |
result = testtools.TestResult() |
5387.2.5
by John Arbash Meinel
add a failing test that the subunit stream doesn't contain the log info. |
2206 |
test.run(result) |
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
2207 |
content = stream.getvalue() |
2208 |
return content, result |
|
2209 |
||
2210 |
def test_fail_has_log(self): |
|
2211 |
content, result = self.run_subunit_stream('test_fail') |
|
2212 |
self.assertEqual(1, len(result.failures)) |
|
2213 |
self.assertContainsRe(content, '(?m)^log$') |
|
2214 |
self.assertContainsRe(content, 'this test will fail') |
|
2215 |
||
2216 |
def test_error_has_log(self): |
|
2217 |
content, result = self.run_subunit_stream('test_error') |
|
2218 |
self.assertContainsRe(content, '(?m)^log$') |
|
2219 |
self.assertContainsRe(content, 'this test errored') |
|
2220 |
||
2221 |
def test_skip_has_no_log(self): |
|
2222 |
content, result = self.run_subunit_stream('test_skip') |
|
2223 |
self.assertNotContainsRe(content, '(?m)^log$') |
|
2224 |
self.assertNotContainsRe(content, 'this test will be skipped') |
|
2225 |
self.assertEqual(['reason'], result.skip_reasons.keys()) |
|
2226 |
skips = result.skip_reasons['reason'] |
|
2227 |
self.assertEqual(1, len(skips)) |
|
2228 |
test = skips[0] |
|
2229 |
# RemotedTestCase doesn't preserve the "details"
|
|
2230 |
## self.assertFalse('log' in test.getDetails())
|
|
2231 |
||
2232 |
def test_missing_feature_has_no_log(self): |
|
2233 |
content, result = self.run_subunit_stream('test_missing_feature') |
|
2234 |
self.assertNotContainsRe(content, '(?m)^log$') |
|
2235 |
self.assertNotContainsRe(content, 'missing the feature') |
|
2236 |
self.assertEqual(['_MissingFeature\n'], result.skip_reasons.keys()) |
|
2237 |
skips = result.skip_reasons['_MissingFeature\n'] |
|
2238 |
self.assertEqual(1, len(skips)) |
|
2239 |
test = skips[0] |
|
2240 |
# RemotedTestCase doesn't preserve the "details"
|
|
2241 |
## self.assertFalse('log' in test.getDetails())
|
|
2242 |
||
2243 |
def test_xfail_has_no_log(self): |
|
2244 |
content, result = self.run_subunit_stream('test_xfail') |
|
2245 |
self.assertNotContainsRe(content, '(?m)^log$') |
|
2246 |
self.assertNotContainsRe(content, 'test with expected failure') |
|
2247 |
self.assertEqual(1, len(result.expectedFailures)) |
|
2248 |
result_content = result.expectedFailures[0][1] |
|
6015.33.14
by Martin Packman
Adapt test_selftest output regexps to accept both old and new testtools output |
2249 |
self.assertNotContainsRe(result_content, |
2250 |
'(?m)^(?:Text attachment: )?log(?:$|: )') |
|
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
2251 |
self.assertNotContainsRe(result_content, 'test with expected failure') |
2252 |
||
2253 |
def test_unexpected_success_has_log(self): |
|
2254 |
content, result = self.run_subunit_stream('test_unexpected_success') |
|
2255 |
self.assertContainsRe(content, '(?m)^log$') |
|
2256 |
self.assertContainsRe(content, 'test with unexpected success') |
|
5892.1.1
by Martin
Stop expecting subunit to get unexpected successes wrong if it has the recent fix |
2257 |
# GZ 2011-05-18: Old versions of subunit treat unexpected success as a
|
2258 |
# success, if a min version check is added remove this
|
|
2259 |
from subunit import TestProtocolClient as _Client |
|
2260 |
if _Client.addUnexpectedSuccess.im_func is _Client.addSuccess.im_func: |
|
2261 |
self.expectFailure('subunit treats "unexpectedSuccess"' |
|
2262 |
' as a plain success', |
|
2263 |
self.assertEqual, 1, len(result.unexpectedSuccesses)) |
|
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
2264 |
self.assertEqual(1, len(result.unexpectedSuccesses)) |
2265 |
test = result.unexpectedSuccesses[0] |
|
2266 |
# RemotedTestCase doesn't preserve the "details"
|
|
2267 |
## self.assertTrue('log' in test.getDetails())
|
|
5387.2.5
by John Arbash Meinel
add a failing test that the subunit stream doesn't contain the log info. |
2268 |
|
2269 |
def test_success_has_no_log(self): |
|
5387.2.6
by John Arbash Meinel
Do a full test suite against all the subunit permutations. |
2270 |
content, result = self.run_subunit_stream('test_success') |
5387.2.5
by John Arbash Meinel
add a failing test that the subunit stream doesn't contain the log info. |
2271 |
self.assertEqual(1, result.testsRun) |
2272 |
self.assertNotContainsRe(content, '(?m)^log$') |
|
2273 |
self.assertNotContainsRe(content, 'this test succeeds') |
|
2274 |
||
2275 |
||
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2276 |
class TestRunBzr(tests.TestCase): |
2277 |
||
2278 |
out = '' |
|
2279 |
err = '' |
|
2280 |
||
2281 |
def _run_bzr_core(self, argv, retcode=0, encoding=None, stdin=None, |
|
2282 |
working_dir=None): |
|
2283 |
"""Override _run_bzr_core to test how it is invoked by run_bzr.
|
|
2284 |
||
2285 |
Attempts to run bzr from inside this class don't actually run it.
|
|
2286 |
||
4665.5.15
by Vincent Ladeuil
Catch the retcode for all commands. |
2287 |
We test how run_bzr actually invokes bzr in another location. Here we
|
2288 |
only need to test that it passes the right parameters to run_bzr.
|
|
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2289 |
"""
|
2290 |
self.argv = list(argv) |
|
2291 |
self.retcode = retcode |
|
2292 |
self.encoding = encoding |
|
2293 |
self.stdin = stdin |
|
2294 |
self.working_dir = working_dir |
|
4665.5.15
by Vincent Ladeuil
Catch the retcode for all commands. |
2295 |
return self.retcode, self.out, self.err |
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2296 |
|
2297 |
def test_run_bzr_error(self): |
|
2298 |
self.out = "It sure does!\n" |
|
2299 |
out, err = self.run_bzr_error(['^$'], ['rocks'], retcode=34) |
|
2300 |
self.assertEqual(['rocks'], self.argv) |
|
2301 |
self.assertEqual(34, self.retcode) |
|
4665.5.15
by Vincent Ladeuil
Catch the retcode for all commands. |
2302 |
self.assertEqual('It sure does!\n', out) |
2303 |
self.assertEquals(out, self.out) |
|
2304 |
self.assertEqual('', err) |
|
2305 |
self.assertEquals(err, self.err) |
|
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2306 |
|
2307 |
def test_run_bzr_error_regexes(self): |
|
2308 |
self.out = '' |
|
2309 |
self.err = "bzr: ERROR: foobarbaz is not versioned" |
|
2310 |
out, err = self.run_bzr_error( |
|
4665.5.15
by Vincent Ladeuil
Catch the retcode for all commands. |
2311 |
["bzr: ERROR: foobarbaz is not versioned"], |
2312 |
['file-id', 'foobarbaz']) |
|
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2313 |
|
2314 |
def test_encoding(self): |
|
2315 |
"""Test that run_bzr passes encoding to _run_bzr_core"""
|
|
2316 |
self.run_bzr('foo bar') |
|
2317 |
self.assertEqual(None, self.encoding) |
|
2318 |
self.assertEqual(['foo', 'bar'], self.argv) |
|
2319 |
||
2320 |
self.run_bzr('foo bar', encoding='baz') |
|
2321 |
self.assertEqual('baz', self.encoding) |
|
2322 |
self.assertEqual(['foo', 'bar'], self.argv) |
|
2323 |
||
2324 |
def test_retcode(self): |
|
2325 |
"""Test that run_bzr passes retcode to _run_bzr_core"""
|
|
2326 |
# Default is retcode == 0
|
|
2327 |
self.run_bzr('foo bar') |
|
2328 |
self.assertEqual(0, self.retcode) |
|
2329 |
self.assertEqual(['foo', 'bar'], self.argv) |
|
2330 |
||
2331 |
self.run_bzr('foo bar', retcode=1) |
|
2332 |
self.assertEqual(1, self.retcode) |
|
2333 |
self.assertEqual(['foo', 'bar'], self.argv) |
|
2334 |
||
2335 |
self.run_bzr('foo bar', retcode=None) |
|
2336 |
self.assertEqual(None, self.retcode) |
|
2337 |
self.assertEqual(['foo', 'bar'], self.argv) |
|
2338 |
||
2339 |
self.run_bzr(['foo', 'bar'], retcode=3) |
|
2340 |
self.assertEqual(3, self.retcode) |
|
2341 |
self.assertEqual(['foo', 'bar'], self.argv) |
|
2342 |
||
2343 |
def test_stdin(self): |
|
2344 |
# test that the stdin keyword to run_bzr is passed through to
|
|
2345 |
# _run_bzr_core as-is. We do this by overriding
|
|
2346 |
# _run_bzr_core in this class, and then calling run_bzr,
|
|
2347 |
# which is a convenience function for _run_bzr_core, so
|
|
2348 |
# should invoke it.
|
|
2349 |
self.run_bzr('foo bar', stdin='gam') |
|
2350 |
self.assertEqual('gam', self.stdin) |
|
2351 |
self.assertEqual(['foo', 'bar'], self.argv) |
|
2352 |
||
2353 |
self.run_bzr('foo bar', stdin='zippy') |
|
2354 |
self.assertEqual('zippy', self.stdin) |
|
2355 |
self.assertEqual(['foo', 'bar'], self.argv) |
|
2356 |
||
2357 |
def test_working_dir(self): |
|
2358 |
"""Test that run_bzr passes working_dir to _run_bzr_core"""
|
|
2359 |
self.run_bzr('foo bar') |
|
2360 |
self.assertEqual(None, self.working_dir) |
|
2361 |
self.assertEqual(['foo', 'bar'], self.argv) |
|
2362 |
||
2363 |
self.run_bzr('foo bar', working_dir='baz') |
|
2364 |
self.assertEqual('baz', self.working_dir) |
|
2365 |
self.assertEqual(['foo', 'bar'], self.argv) |
|
2366 |
||
2367 |
def test_reject_extra_keyword_arguments(self): |
|
2368 |
self.assertRaises(TypeError, self.run_bzr, "foo bar", |
|
2369 |
error_regex=['error message']) |
|
2370 |
||
2371 |
||
2372 |
class TestRunBzrCaptured(tests.TestCaseWithTransport): |
|
2373 |
# Does IO when testing the working_dir parameter.
|
|
2374 |
||
2375 |
def apply_redirected(self, stdin=None, stdout=None, stderr=None, |
|
2376 |
a_callable=None, *args, **kwargs): |
|
2377 |
self.stdin = stdin |
|
2378 |
self.factory_stdin = getattr(bzrlib.ui.ui_factory, "stdin", None) |
|
2379 |
self.factory = bzrlib.ui.ui_factory |
|
2380 |
self.working_dir = osutils.getcwd() |
|
2381 |
stdout.write('foo\n') |
|
2382 |
stderr.write('bar\n') |
|
2383 |
return 0 |
|
2384 |
||
2385 |
def test_stdin(self): |
|
2386 |
# test that the stdin keyword to _run_bzr_core is passed through to
|
|
2387 |
# apply_redirected as a StringIO. We do this by overriding
|
|
2388 |
# apply_redirected in this class, and then calling _run_bzr_core,
|
|
2389 |
# which calls apply_redirected.
|
|
2390 |
self.run_bzr(['foo', 'bar'], stdin='gam') |
|
2391 |
self.assertEqual('gam', self.stdin.read()) |
|
2392 |
self.assertTrue(self.stdin is self.factory_stdin) |
|
2393 |
self.run_bzr(['foo', 'bar'], stdin='zippy') |
|
2394 |
self.assertEqual('zippy', self.stdin.read()) |
|
2395 |
self.assertTrue(self.stdin is self.factory_stdin) |
|
2396 |
||
2397 |
def test_ui_factory(self): |
|
2398 |
# each invocation of self.run_bzr should get its
|
|
2399 |
# own UI factory, which is an instance of TestUIFactory,
|
|
2400 |
# with stdin, stdout and stderr attached to the stdin,
|
|
2401 |
# stdout and stderr of the invoked run_bzr
|
|
2402 |
current_factory = bzrlib.ui.ui_factory |
|
2403 |
self.run_bzr(['foo']) |
|
5784.1.1
by Martin Pool
Stop using failIf, failUnless, etc |
2404 |
self.assertFalse(current_factory is self.factory) |
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2405 |
self.assertNotEqual(sys.stdout, self.factory.stdout) |
2406 |
self.assertNotEqual(sys.stderr, self.factory.stderr) |
|
2407 |
self.assertEqual('foo\n', self.factory.stdout.getvalue()) |
|
2408 |
self.assertEqual('bar\n', self.factory.stderr.getvalue()) |
|
2409 |
self.assertIsInstance(self.factory, tests.TestUIFactory) |
|
2410 |
||
2411 |
def test_working_dir(self): |
|
2412 |
self.build_tree(['one/', 'two/']) |
|
2413 |
cwd = osutils.getcwd() |
|
2414 |
||
2415 |
# Default is to work in the current directory
|
|
2416 |
self.run_bzr(['foo', 'bar']) |
|
2417 |
self.assertEqual(cwd, self.working_dir) |
|
2418 |
||
2419 |
self.run_bzr(['foo', 'bar'], working_dir=None) |
|
2420 |
self.assertEqual(cwd, self.working_dir) |
|
2421 |
||
2422 |
# The function should be run in the alternative directory
|
|
2423 |
# but afterwards the current working dir shouldn't be changed
|
|
2424 |
self.run_bzr(['foo', 'bar'], working_dir='one') |
|
2425 |
self.assertNotEqual(cwd, self.working_dir) |
|
2426 |
self.assertEndsWith(self.working_dir, 'one') |
|
2427 |
self.assertEqual(cwd, osutils.getcwd()) |
|
2428 |
||
2429 |
self.run_bzr(['foo', 'bar'], working_dir='two') |
|
2430 |
self.assertNotEqual(cwd, self.working_dir) |
|
2431 |
self.assertEndsWith(self.working_dir, 'two') |
|
2432 |
self.assertEqual(cwd, osutils.getcwd()) |
|
2433 |
||
2434 |
||
2435 |
class StubProcess(object): |
|
2436 |
"""A stub process for testing run_bzr_subprocess."""
|
|
2437 |
||
2438 |
def __init__(self, out="", err="", retcode=0): |
|
2439 |
self.out = out |
|
2440 |
self.err = err |
|
2441 |
self.returncode = retcode |
|
2442 |
||
2443 |
def communicate(self): |
|
2444 |
return self.out, self.err |
|
2445 |
||
2446 |
||
4650.1.4
by Robert Collins
Make tests for finish_bzr_subprocess that really only care about the interface use StubProcess. |
2447 |
class TestWithFakedStartBzrSubprocess(tests.TestCaseWithTransport): |
2448 |
"""Base class for tests testing how we might run bzr."""
|
|
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2449 |
|
2450 |
def setUp(self): |
|
6552.1.4
by Vincent Ladeuil
Remaining tests matching setup(self) that can be rewritten with super(). |
2451 |
super(TestWithFakedStartBzrSubprocess, self).setUp() |
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2452 |
self.subprocess_calls = [] |
2453 |
||
2454 |
def start_bzr_subprocess(self, process_args, env_changes=None, |
|
2455 |
skip_if_plan_to_signal=False, |
|
2456 |
working_dir=None, |
|
2457 |
allow_plugins=False): |
|
2458 |
"""capture what run_bzr_subprocess tries to do."""
|
|
2459 |
self.subprocess_calls.append({'process_args':process_args, |
|
2460 |
'env_changes':env_changes, |
|
2461 |
'skip_if_plan_to_signal':skip_if_plan_to_signal, |
|
2462 |
'working_dir':working_dir, 'allow_plugins':allow_plugins}) |
|
2463 |
return self.next_subprocess |
|
2464 |
||
4650.1.4
by Robert Collins
Make tests for finish_bzr_subprocess that really only care about the interface use StubProcess. |
2465 |
|
2466 |
class TestRunBzrSubprocess(TestWithFakedStartBzrSubprocess): |
|
2467 |
||
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2468 |
def assertRunBzrSubprocess(self, expected_args, process, *args, **kwargs): |
2469 |
"""Run run_bzr_subprocess with args and kwargs using a stubbed process.
|
|
2470 |
||
2471 |
Inside TestRunBzrSubprocessCommands we use a stub start_bzr_subprocess
|
|
2472 |
that will return static results. This assertion method populates those
|
|
2473 |
results and also checks the arguments run_bzr_subprocess generates.
|
|
2474 |
"""
|
|
2475 |
self.next_subprocess = process |
|
2476 |
try: |
|
2477 |
result = self.run_bzr_subprocess(*args, **kwargs) |
|
2478 |
except: |
|
2479 |
self.next_subprocess = None |
|
2480 |
for key, expected in expected_args.iteritems(): |
|
2481 |
self.assertEqual(expected, self.subprocess_calls[-1][key]) |
|
2482 |
raise
|
|
2483 |
else: |
|
2484 |
self.next_subprocess = None |
|
2485 |
for key, expected in expected_args.iteritems(): |
|
2486 |
self.assertEqual(expected, self.subprocess_calls[-1][key]) |
|
2487 |
return result |
|
2488 |
||
2489 |
def test_run_bzr_subprocess(self): |
|
2490 |
"""The run_bzr_helper_external command behaves nicely."""
|
|
2491 |
self.assertRunBzrSubprocess({'process_args':['--version']}, |
|
2492 |
StubProcess(), '--version') |
|
2493 |
self.assertRunBzrSubprocess({'process_args':['--version']}, |
|
2494 |
StubProcess(), ['--version']) |
|
2495 |
# retcode=None disables retcode checking
|
|
2496 |
result = self.assertRunBzrSubprocess({}, |
|
2497 |
StubProcess(retcode=3), '--version', retcode=None) |
|
2498 |
result = self.assertRunBzrSubprocess({}, |
|
2499 |
StubProcess(out="is free software"), '--version') |
|
2500 |
self.assertContainsRe(result[0], 'is free software') |
|
2501 |
# Running a subcommand that is missing errors
|
|
2502 |
self.assertRaises(AssertionError, self.assertRunBzrSubprocess, |
|
2503 |
{'process_args':['--versionn']}, StubProcess(retcode=3), |
|
2504 |
'--versionn') |
|
2505 |
# Unless it is told to expect the error from the subprocess
|
|
2506 |
result = self.assertRunBzrSubprocess({}, |
|
2507 |
StubProcess(retcode=3), '--versionn', retcode=3) |
|
2508 |
# Or to ignore retcode checking
|
|
2509 |
result = self.assertRunBzrSubprocess({}, |
|
2510 |
StubProcess(err="unknown command", retcode=3), '--versionn', |
|
2511 |
retcode=None) |
|
2512 |
self.assertContainsRe(result[1], 'unknown command') |
|
2513 |
||
2514 |
def test_env_change_passes_through(self): |
|
2515 |
self.assertRunBzrSubprocess( |
|
2516 |
{'env_changes':{'new':'value', 'changed':'newvalue', 'deleted':None}}, |
|
2517 |
StubProcess(), '', |
|
2518 |
env_changes={'new':'value', 'changed':'newvalue', 'deleted':None}) |
|
2519 |
||
2520 |
def test_no_working_dir_passed_as_None(self): |
|
2521 |
self.assertRunBzrSubprocess({'working_dir': None}, StubProcess(), '') |
|
2522 |
||
2523 |
def test_no_working_dir_passed_through(self): |
|
2524 |
self.assertRunBzrSubprocess({'working_dir': 'dir'}, StubProcess(), '', |
|
2525 |
working_dir='dir') |
|
2526 |
||
2527 |
def test_run_bzr_subprocess_no_plugins(self): |
|
2528 |
self.assertRunBzrSubprocess({'allow_plugins': False}, |
|
2529 |
StubProcess(), '') |
|
2530 |
||
2531 |
def test_allow_plugins(self): |
|
2532 |
self.assertRunBzrSubprocess({'allow_plugins': True}, |
|
2533 |
StubProcess(), '', allow_plugins=True) |
|
2534 |
||
2535 |
||
4650.1.4
by Robert Collins
Make tests for finish_bzr_subprocess that really only care about the interface use StubProcess. |
2536 |
class TestFinishBzrSubprocess(TestWithFakedStartBzrSubprocess): |
2537 |
||
2538 |
def test_finish_bzr_subprocess_with_error(self): |
|
2539 |
"""finish_bzr_subprocess allows specification of the desired exit code.
|
|
2540 |
"""
|
|
2541 |
process = StubProcess(err="unknown command", retcode=3) |
|
2542 |
result = self.finish_bzr_subprocess(process, retcode=3) |
|
2543 |
self.assertEqual('', result[0]) |
|
2544 |
self.assertContainsRe(result[1], 'unknown command') |
|
2545 |
||
2546 |
def test_finish_bzr_subprocess_ignoring_retcode(self): |
|
2547 |
"""finish_bzr_subprocess allows the exit code to be ignored."""
|
|
2548 |
process = StubProcess(err="unknown command", retcode=3) |
|
2549 |
result = self.finish_bzr_subprocess(process, retcode=None) |
|
2550 |
self.assertEqual('', result[0]) |
|
2551 |
self.assertContainsRe(result[1], 'unknown command') |
|
2552 |
||
2553 |
def test_finish_subprocess_with_unexpected_retcode(self): |
|
2554 |
"""finish_bzr_subprocess raises self.failureException if the retcode is
|
|
2555 |
not the expected one.
|
|
2556 |
"""
|
|
2557 |
process = StubProcess(err="unknown command", retcode=3) |
|
2558 |
self.assertRaises(self.failureException, self.finish_bzr_subprocess, |
|
2559 |
process) |
|
2560 |
||
2561 |
||
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2562 |
class _DontSpawnProcess(Exception): |
2563 |
"""A simple exception which just allows us to skip unnecessary steps"""
|
|
2564 |
||
2565 |
||
5984.1.3
by Vincent Ladeuil
We don't need TestCaseInTempDir as we shouldn't touch the disk anyway. |
2566 |
class TestStartBzrSubProcess(tests.TestCase): |
5984.1.1
by Vincent Ladeuil
Some cleanup and a first try at fixing bug #798698. |
2567 |
"""Stub test start_bzr_subprocess."""
|
2568 |
||
5984.1.2
by Vincent Ladeuil
Really fix it. |
2569 |
def _subprocess_log_cleanup(self): |
2570 |
"""Inhibits the base version as we don't produce a log file."""
|
|
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2571 |
|
2572 |
def _popen(self, *args, **kwargs): |
|
5984.1.1
by Vincent Ladeuil
Some cleanup and a first try at fixing bug #798698. |
2573 |
"""Override the base version to record the command that is run.
|
2574 |
||
2575 |
From there we can ensure it is correct without spawning a real process.
|
|
2576 |
"""
|
|
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2577 |
self.check_popen_state() |
2578 |
self._popen_args = args |
|
2579 |
self._popen_kwargs = kwargs |
|
2580 |
raise _DontSpawnProcess() |
|
2581 |
||
5984.1.2
by Vincent Ladeuil
Really fix it. |
2582 |
def check_popen_state(self): |
2583 |
"""Replace to make assertions when popen is called."""
|
|
2584 |
||
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2585 |
def test_run_bzr_subprocess_no_plugins(self): |
2586 |
self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, []) |
|
2587 |
command = self._popen_args[0] |
|
2588 |
self.assertEqual(sys.executable, command[0]) |
|
2589 |
self.assertEqual(self.get_bzr_path(), command[1]) |
|
2590 |
self.assertEqual(['--no-plugins'], command[2:]) |
|
2591 |
||
2592 |
def test_allow_plugins(self): |
|
2593 |
self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [], |
|
5984.1.1
by Vincent Ladeuil
Some cleanup and a first try at fixing bug #798698. |
2594 |
allow_plugins=True) |
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2595 |
command = self._popen_args[0] |
2596 |
self.assertEqual([], command[2:]) |
|
2597 |
||
2598 |
def test_set_env(self): |
|
5784.1.1
by Martin Pool
Stop using failIf, failUnless, etc |
2599 |
self.assertFalse('EXISTANT_ENV_VAR' in os.environ) |
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2600 |
# set in the child
|
2601 |
def check_environment(): |
|
2602 |
self.assertEqual('set variable', os.environ['EXISTANT_ENV_VAR']) |
|
2603 |
self.check_popen_state = check_environment |
|
2604 |
self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [], |
|
5984.1.1
by Vincent Ladeuil
Some cleanup and a first try at fixing bug #798698. |
2605 |
env_changes={'EXISTANT_ENV_VAR':'set variable'}) |
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2606 |
# not set in theparent
|
2607 |
self.assertFalse('EXISTANT_ENV_VAR' in os.environ) |
|
2608 |
||
2609 |
def test_run_bzr_subprocess_env_del(self): |
|
2610 |
"""run_bzr_subprocess can remove environment variables too."""
|
|
5784.1.1
by Martin Pool
Stop using failIf, failUnless, etc |
2611 |
self.assertFalse('EXISTANT_ENV_VAR' in os.environ) |
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2612 |
def check_environment(): |
2613 |
self.assertFalse('EXISTANT_ENV_VAR' in os.environ) |
|
2614 |
os.environ['EXISTANT_ENV_VAR'] = 'set variable' |
|
2615 |
self.check_popen_state = check_environment |
|
2616 |
self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [], |
|
5984.1.1
by Vincent Ladeuil
Some cleanup and a first try at fixing bug #798698. |
2617 |
env_changes={'EXISTANT_ENV_VAR':None}) |
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2618 |
# Still set in parent
|
2619 |
self.assertEqual('set variable', os.environ['EXISTANT_ENV_VAR']) |
|
2620 |
del os.environ['EXISTANT_ENV_VAR'] |
|
2621 |
||
2622 |
def test_env_del_missing(self): |
|
5784.1.1
by Martin Pool
Stop using failIf, failUnless, etc |
2623 |
self.assertFalse('NON_EXISTANT_ENV_VAR' in os.environ) |
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2624 |
def check_environment(): |
2625 |
self.assertFalse('NON_EXISTANT_ENV_VAR' in os.environ) |
|
2626 |
self.check_popen_state = check_environment |
|
2627 |
self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [], |
|
5984.1.1
by Vincent Ladeuil
Some cleanup and a first try at fixing bug #798698. |
2628 |
env_changes={'NON_EXISTANT_ENV_VAR':None}) |
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2629 |
|
2630 |
def test_working_dir(self): |
|
2631 |
"""Test that we can specify the working dir for the child"""
|
|
2632 |
orig_getcwd = osutils.getcwd |
|
2633 |
orig_chdir = os.chdir |
|
2634 |
chdirs = [] |
|
2635 |
def chdir(path): |
|
2636 |
chdirs.append(path) |
|
5984.1.1
by Vincent Ladeuil
Some cleanup and a first try at fixing bug #798698. |
2637 |
self.overrideAttr(os, 'chdir', chdir) |
2638 |
def getcwd(): |
|
2639 |
return 'current' |
|
2640 |
self.overrideAttr(osutils, 'getcwd', getcwd) |
|
2641 |
self.assertRaises(_DontSpawnProcess, self.start_bzr_subprocess, [], |
|
2642 |
working_dir='foo') |
|
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2643 |
self.assertEqual(['foo', 'current'], chdirs) |
2644 |
||
5340.3.1
by Martin
Add test for problem with TestCase.get_bzr_path method |
2645 |
def test_get_bzr_path_with_cwd_bzrlib(self): |
2646 |
self.get_source_path = lambda: "" |
|
2647 |
self.overrideAttr(os.path, "isfile", lambda path: True) |
|
2648 |
self.assertEqual(self.get_bzr_path(), "bzr") |
|
2649 |
||
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2650 |
|
4650.1.4
by Robert Collins
Make tests for finish_bzr_subprocess that really only care about the interface use StubProcess. |
2651 |
class TestActuallyStartBzrSubprocess(tests.TestCaseWithTransport): |
2652 |
"""Tests that really need to do things with an external bzr."""
|
|
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2653 |
|
2654 |
def test_start_and_stop_bzr_subprocess_send_signal(self): |
|
2655 |
"""finish_bzr_subprocess raises self.failureException if the retcode is
|
|
2656 |
not the expected one.
|
|
2657 |
"""
|
|
4695.3.2
by Vincent Ladeuil
Simplified and claried as per Robert's review. |
2658 |
self.disable_missing_extensions_warning() |
4636.2.4
by Robert Collins
Move selftest internals tests out of blackbox test space - they are not testing our selftest command line. |
2659 |
process = self.start_bzr_subprocess(['wait-until-signalled'], |
2660 |
skip_if_plan_to_signal=True) |
|
2661 |
self.assertEqual('running\n', process.stdout.readline()) |
|
2662 |
result = self.finish_bzr_subprocess(process, send_signal=signal.SIGINT, |
|
2663 |
retcode=3) |
|
2664 |
self.assertEqual('', result[0]) |
|
2665 |
self.assertEqual('bzr: interrupted\n', result[1]) |
|
2666 |
||
2667 |
||
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2668 |
class TestSelftestFiltering(tests.TestCase): |
2394.2.5
by Ian Clatworthy
list-only working, include test not |
2669 |
|
2394.2.7
by Ian Clatworthy
Added whitebox tests - filter_suite_by_re and sort_suite_by_re |
2670 |
def setUp(self): |
6552.1.3
by Vincent Ladeuil
Use super() instead of calling <base>.setup(self), as the original fix illustrated a too-easy-to-fall-into trap. |
2671 |
super(TestSelftestFiltering, self).setUp() |
2394.2.7
by Ian Clatworthy
Added whitebox tests - filter_suite_by_re and sort_suite_by_re |
2672 |
self.suite = TestUtil.TestSuite() |
2673 |
self.loader = TestUtil.TestLoader() |
|
4636.2.5
by Robert Collins
Minor tweaks to clarity in slower selftest tests. |
2674 |
self.suite.addTest(self.loader.loadTestsFromModule( |
2675 |
sys.modules['bzrlib.tests.test_selftest'])) |
|
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
2676 |
self.all_names = _test_ids(self.suite) |
2394.2.7
by Ian Clatworthy
Added whitebox tests - filter_suite_by_re and sort_suite_by_re |
2677 |
|
2921.6.9
by Robert Collins
* New helper function ``bzrlib.tests.condition_id_re`` which helps |
2678 |
def test_condition_id_re(self): |
2679 |
test_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.' |
|
2680 |
'test_condition_id_re') |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2681 |
filtered_suite = tests.filter_suite_by_condition( |
2682 |
self.suite, tests.condition_id_re('test_condition_id_re')) |
|
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
2683 |
self.assertEqual([test_name], _test_ids(filtered_suite)) |
2921.6.9
by Robert Collins
* New helper function ``bzrlib.tests.condition_id_re`` which helps |
2684 |
|
3193.1.2
by Vincent Ladeuil
Add condition_id_in_list and filter_suite_by_id_list capabilities. |
2685 |
def test_condition_id_in_list(self): |
2686 |
test_names = ['bzrlib.tests.test_selftest.TestSelftestFiltering.' |
|
2687 |
'test_condition_id_in_list'] |
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2688 |
id_list = tests.TestIdList(test_names) |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2689 |
filtered_suite = tests.filter_suite_by_condition( |
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2690 |
self.suite, tests.condition_id_in_list(id_list)) |
3193.1.2
by Vincent Ladeuil
Add condition_id_in_list and filter_suite_by_id_list capabilities. |
2691 |
my_pattern = 'TestSelftestFiltering.*test_condition_id_in_list' |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2692 |
re_filtered = tests.filter_suite_by_re(self.suite, my_pattern) |
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
2693 |
self.assertEqual(_test_ids(re_filtered), _test_ids(filtered_suite)) |
3193.1.2
by Vincent Ladeuil
Add condition_id_in_list and filter_suite_by_id_list capabilities. |
2694 |
|
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
2695 |
def test_condition_id_startswith(self): |
2696 |
klass = 'bzrlib.tests.test_selftest.TestSelftestFiltering.' |
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2697 |
start1 = klass + 'test_condition_id_starts' |
2698 |
start2 = klass + 'test_condition_id_in' |
|
2699 |
test_names = [ klass + 'test_condition_id_in_list', |
|
2700 |
klass + 'test_condition_id_startswith', |
|
2701 |
]
|
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2702 |
filtered_suite = tests.filter_suite_by_condition( |
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2703 |
self.suite, tests.condition_id_startswith([start1, start2])) |
2704 |
self.assertEqual(test_names, _test_ids(filtered_suite)) |
|
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
2705 |
|
2921.6.8
by Robert Collins
* New helper function ``bzrlib.tests.condition_isinstance`` which helps |
2706 |
def test_condition_isinstance(self): |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2707 |
filtered_suite = tests.filter_suite_by_condition( |
2708 |
self.suite, tests.condition_isinstance(self.__class__)) |
|
2921.6.8
by Robert Collins
* New helper function ``bzrlib.tests.condition_isinstance`` which helps |
2709 |
class_pattern = 'bzrlib.tests.test_selftest.TestSelftestFiltering.' |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2710 |
re_filtered = tests.filter_suite_by_re(self.suite, class_pattern) |
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
2711 |
self.assertEqual(_test_ids(re_filtered), _test_ids(filtered_suite)) |
2921.6.8
by Robert Collins
* New helper function ``bzrlib.tests.condition_isinstance`` which helps |
2712 |
|
2921.6.9
by Robert Collins
* New helper function ``bzrlib.tests.condition_id_re`` which helps |
2713 |
def test_exclude_tests_by_condition(self): |
2714 |
excluded_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.' |
|
2715 |
'test_exclude_tests_by_condition') |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2716 |
filtered_suite = tests.exclude_tests_by_condition(self.suite, |
2921.6.9
by Robert Collins
* New helper function ``bzrlib.tests.condition_id_re`` which helps |
2717 |
lambda x:x.id() == excluded_name) |
2718 |
self.assertEqual(len(self.all_names) - 1, |
|
2719 |
filtered_suite.countTestCases()) |
|
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
2720 |
self.assertFalse(excluded_name in _test_ids(filtered_suite)) |
2921.6.9
by Robert Collins
* New helper function ``bzrlib.tests.condition_id_re`` which helps |
2721 |
remaining_names = list(self.all_names) |
2722 |
remaining_names.remove(excluded_name) |
|
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
2723 |
self.assertEqual(remaining_names, _test_ids(filtered_suite)) |
2921.6.9
by Robert Collins
* New helper function ``bzrlib.tests.condition_id_re`` which helps |
2724 |
|
2921.6.2
by Robert Collins
* New helper method ``bzrlib.tests.exclude_tests_by_re`` which gives a new |
2725 |
def test_exclude_tests_by_re(self): |
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
2726 |
self.all_names = _test_ids(self.suite) |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2727 |
filtered_suite = tests.exclude_tests_by_re(self.suite, |
2728 |
'exclude_tests_by_re') |
|
2921.6.2
by Robert Collins
* New helper method ``bzrlib.tests.exclude_tests_by_re`` which gives a new |
2729 |
excluded_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.' |
2730 |
'test_exclude_tests_by_re') |
|
2731 |
self.assertEqual(len(self.all_names) - 1, |
|
2732 |
filtered_suite.countTestCases()) |
|
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
2733 |
self.assertFalse(excluded_name in _test_ids(filtered_suite)) |
2921.6.2
by Robert Collins
* New helper method ``bzrlib.tests.exclude_tests_by_re`` which gives a new |
2734 |
remaining_names = list(self.all_names) |
2735 |
remaining_names.remove(excluded_name) |
|
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
2736 |
self.assertEqual(remaining_names, _test_ids(filtered_suite)) |
2921.6.2
by Robert Collins
* New helper method ``bzrlib.tests.exclude_tests_by_re`` which gives a new |
2737 |
|
2921.6.7
by Robert Collins
* New helper function ``bzrlib.tests.filter_suite_by_condition`` which |
2738 |
def test_filter_suite_by_condition(self): |
2739 |
test_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.' |
|
2740 |
'test_filter_suite_by_condition') |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2741 |
filtered_suite = tests.filter_suite_by_condition(self.suite, |
2921.6.7
by Robert Collins
* New helper function ``bzrlib.tests.filter_suite_by_condition`` which |
2742 |
lambda x:x.id() == test_name) |
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
2743 |
self.assertEqual([test_name], _test_ids(filtered_suite)) |
2921.6.7
by Robert Collins
* New helper function ``bzrlib.tests.filter_suite_by_condition`` which |
2744 |
|
2394.2.5
by Ian Clatworthy
list-only working, include test not |
2745 |
def test_filter_suite_by_re(self): |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2746 |
filtered_suite = tests.filter_suite_by_re(self.suite, |
2747 |
'test_filter_suite_by_r') |
|
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
2748 |
filtered_names = _test_ids(filtered_suite) |
2394.2.7
by Ian Clatworthy
Added whitebox tests - filter_suite_by_re and sort_suite_by_re |
2749 |
self.assertEqual(filtered_names, ['bzrlib.tests.test_selftest.' |
2750 |
'TestSelftestFiltering.test_filter_suite_by_re']) |
|
2921.6.1
by Robert Collins
* New helper method ``bzrlib.tests.split_suite_by_re`` which splits a test |
2751 |
|
3193.1.2
by Vincent Ladeuil
Add condition_id_in_list and filter_suite_by_id_list capabilities. |
2752 |
def test_filter_suite_by_id_list(self): |
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2753 |
test_list = ['bzrlib.tests.test_selftest.' |
2754 |
'TestSelftestFiltering.test_filter_suite_by_id_list'] |
|
3193.1.2
by Vincent Ladeuil
Add condition_id_in_list and filter_suite_by_id_list capabilities. |
2755 |
filtered_suite = tests.filter_suite_by_id_list( |
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2756 |
self.suite, tests.TestIdList(test_list)) |
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
2757 |
filtered_names = _test_ids(filtered_suite) |
3193.1.2
by Vincent Ladeuil
Add condition_id_in_list and filter_suite_by_id_list capabilities. |
2758 |
self.assertEqual( |
2759 |
filtered_names, |
|
2760 |
['bzrlib.tests.test_selftest.' |
|
2761 |
'TestSelftestFiltering.test_filter_suite_by_id_list']) |
|
2762 |
||
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
2763 |
def test_filter_suite_by_id_startswith(self): |
3302.11.6
by Vincent Ladeuil
Fixed as per Martin and John reviews. Also fix a bug. |
2764 |
# By design this test may fail if another test is added whose name also
|
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2765 |
# begins with one of the start value used.
|
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
2766 |
klass = 'bzrlib.tests.test_selftest.TestSelftestFiltering.' |
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2767 |
start1 = klass + 'test_filter_suite_by_id_starts' |
2768 |
start2 = klass + 'test_filter_suite_by_id_li' |
|
2769 |
test_list = [klass + 'test_filter_suite_by_id_list', |
|
2770 |
klass + 'test_filter_suite_by_id_startswith', |
|
2771 |
]
|
|
2772 |
filtered_suite = tests.filter_suite_by_id_startswith( |
|
2773 |
self.suite, [start1, start2]) |
|
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
2774 |
self.assertEqual( |
3649.6.4
by Vincent Ladeuil
selftest --starting-with now accepts multiple values. |
2775 |
test_list, |
2776 |
_test_ids(filtered_suite), |
|
2777 |
)
|
|
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
2778 |
|
2921.6.6
by Robert Collins
* The ``exclude_pattern`` and ``random_order`` parameters to the function |
2779 |
def test_preserve_input(self): |
2780 |
# NB: Surely this is something in the stdlib to do this?
|
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2781 |
self.assertTrue(self.suite is tests.preserve_input(self.suite)) |
2782 |
self.assertTrue("@#$" is tests.preserve_input("@#$")) |
|
2921.6.6
by Robert Collins
* The ``exclude_pattern`` and ``random_order`` parameters to the function |
2783 |
|
3128.1.2
by Vincent Ladeuil
Tweak as per review feedback: s/randomise.*/randomize&/, 0.92 -> 1.0. |
2784 |
def test_randomize_suite(self): |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2785 |
randomized_suite = tests.randomize_suite(self.suite) |
3128.1.2
by Vincent Ladeuil
Tweak as per review feedback: s/randomise.*/randomize&/, 0.92 -> 1.0. |
2786 |
# randomizing should not add or remove test names.
|
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
2787 |
self.assertEqual(set(_test_ids(self.suite)), |
2788 |
set(_test_ids(randomized_suite))) |
|
2921.6.3
by Robert Collins
* New helper method ``bzrlib.tests.randomise_suite`` which returns a |
2789 |
# Technically, this *can* fail, because random.shuffle(list) can be
|
2790 |
# equal to list. Trying multiple times just pushes the frequency back.
|
|
2791 |
# As its len(self.all_names)!:1, the failure frequency should be low
|
|
2792 |
# enough to ignore. RBC 20071021.
|
|
2793 |
# It should change the order.
|
|
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
2794 |
self.assertNotEqual(self.all_names, _test_ids(randomized_suite)) |
2921.6.3
by Robert Collins
* New helper method ``bzrlib.tests.randomise_suite`` which returns a |
2795 |
# But not the length. (Possibly redundant with the set test, but not
|
2796 |
# necessarily.)
|
|
3302.7.4
by Vincent Ladeuil
Cosmetic change. |
2797 |
self.assertEqual(len(self.all_names), len(_test_ids(randomized_suite))) |
2921.6.3
by Robert Collins
* New helper method ``bzrlib.tests.randomise_suite`` which returns a |
2798 |
|
3350.5.1
by Robert Collins
* New helper function for splitting test suites ``split_suite_by_condition``. |
2799 |
def test_split_suit_by_condition(self): |
2800 |
self.all_names = _test_ids(self.suite) |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2801 |
condition = tests.condition_id_re('test_filter_suite_by_r') |
2802 |
split_suite = tests.split_suite_by_condition(self.suite, condition) |
|
3350.5.1
by Robert Collins
* New helper function for splitting test suites ``split_suite_by_condition``. |
2803 |
filtered_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.' |
2804 |
'test_filter_suite_by_re') |
|
2805 |
self.assertEqual([filtered_name], _test_ids(split_suite[0])) |
|
2806 |
self.assertFalse(filtered_name in _test_ids(split_suite[1])) |
|
2807 |
remaining_names = list(self.all_names) |
|
2808 |
remaining_names.remove(filtered_name) |
|
2809 |
self.assertEqual(remaining_names, _test_ids(split_suite[1])) |
|
2810 |
||
2921.6.1
by Robert Collins
* New helper method ``bzrlib.tests.split_suite_by_re`` which splits a test |
2811 |
def test_split_suit_by_re(self): |
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
2812 |
self.all_names = _test_ids(self.suite) |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2813 |
split_suite = tests.split_suite_by_re(self.suite, |
2814 |
'test_filter_suite_by_r') |
|
2921.6.1
by Robert Collins
* New helper method ``bzrlib.tests.split_suite_by_re`` which splits a test |
2815 |
filtered_name = ('bzrlib.tests.test_selftest.TestSelftestFiltering.' |
2816 |
'test_filter_suite_by_re') |
|
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
2817 |
self.assertEqual([filtered_name], _test_ids(split_suite[0])) |
2818 |
self.assertFalse(filtered_name in _test_ids(split_suite[1])) |
|
2921.6.1
by Robert Collins
* New helper method ``bzrlib.tests.split_suite_by_re`` which splits a test |
2819 |
remaining_names = list(self.all_names) |
2820 |
remaining_names.remove(filtered_name) |
|
3302.7.1
by Vincent Ladeuil
Extract _test_ids helper for reuse by other test classes. |
2821 |
self.assertEqual(remaining_names, _test_ids(split_suite[1])) |
2921.6.1
by Robert Collins
* New helper method ``bzrlib.tests.split_suite_by_re`` which splits a test |
2822 |
|
2545.3.2
by James Westby
Add a test for check_inventory_shape. |
2823 |
|
5807.1.5
by Jelmer Vernooij
Fix more things to use tree objects. |
2824 |
class TestCheckTreeShape(tests.TestCaseWithTransport): |
2545.3.2
by James Westby
Add a test for check_inventory_shape. |
2825 |
|
5807.1.5
by Jelmer Vernooij
Fix more things to use tree objects. |
2826 |
def test_check_tree_shape(self): |
2561.1.2
by Aaron Bentley
Fix indenting in TestCheckInventoryShape |
2827 |
files = ['a', 'b/', 'b/c'] |
2828 |
tree = self.make_branch_and_tree('.') |
|
2829 |
self.build_tree(files) |
|
2830 |
tree.add(files) |
|
2831 |
tree.lock_read() |
|
2832 |
try: |
|
5807.1.5
by Jelmer Vernooij
Fix more things to use tree objects. |
2833 |
self.check_tree_shape(tree, files) |
2561.1.2
by Aaron Bentley
Fix indenting in TestCheckInventoryShape |
2834 |
finally: |
2835 |
tree.unlock() |
|
2830.2.1
by Martin Pool
If TestCase.run_bzr hits an internal exception, don't catch it but rather propagate up into the test suite |
2836 |
|
2837 |
||
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2838 |
class TestBlackboxSupport(tests.TestCase): |
2830.2.1
by Martin Pool
If TestCase.run_bzr hits an internal exception, don't catch it but rather propagate up into the test suite |
2839 |
"""Tests for testsuite blackbox features."""
|
2840 |
||
2841 |
def test_run_bzr_failure_not_caught(self): |
|
2842 |
# When we run bzr in blackbox mode, we want any unexpected errors to
|
|
2843 |
# propagate up to the test suite so that it can show the error in the
|
|
2844 |
# usual way, and we won't get a double traceback.
|
|
2845 |
e = self.assertRaises( |
|
2846 |
AssertionError, |
|
2847 |
self.run_bzr, ['assert-fail']) |
|
2848 |
# make sure we got the real thing, not an error from somewhere else in
|
|
2849 |
# the test framework
|
|
2850 |
self.assertEquals('always fails', str(e)) |
|
2851 |
# check that there's no traceback in the test log
|
|
4794.1.15
by Robert Collins
Review feedback. |
2852 |
self.assertNotContainsRe(self.get_log(), r'Traceback') |
2830.2.1
by Martin Pool
If TestCase.run_bzr hits an internal exception, don't catch it but rather propagate up into the test suite |
2853 |
|
2854 |
def test_run_bzr_user_error_caught(self): |
|
2855 |
# Running bzr in blackbox mode, normal/expected/user errors should be
|
|
2856 |
# caught in the regular way and turned into an error message plus exit
|
|
2857 |
# code.
|
|
5017.3.45
by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry. |
2858 |
transport_server = memory.MemoryServer() |
4934.3.3
by Martin Pool
Rename Server.setUp to Server.start_server |
2859 |
transport_server.start_server() |
4934.3.1
by Martin Pool
Rename Server.tearDown to .stop_server |
2860 |
self.addCleanup(transport_server.stop_server) |
4691.2.1
by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite. |
2861 |
url = transport_server.get_url() |
2862 |
self.permit_url(url) |
|
2863 |
out, err = self.run_bzr(["log", "%s/nonexistantpath" % url], retcode=3) |
|
2830.2.1
by Martin Pool
If TestCase.run_bzr hits an internal exception, don't catch it but rather propagate up into the test suite |
2864 |
self.assertEqual(out, '') |
3146.4.7
by Aaron Bentley
Remove UNIX path assumption |
2865 |
self.assertContainsRe(err, |
2866 |
'bzr: ERROR: Not a branch: ".*nonexistantpath/".\n') |
|
2921.6.13
by Robert Collins
* Modules can now customise their tests by defining a ``load_tests`` |
2867 |
|
2868 |
||
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2869 |
class TestTestLoader(tests.TestCase): |
2921.6.13
by Robert Collins
* Modules can now customise their tests by defining a ``load_tests`` |
2870 |
"""Tests for the test loader."""
|
2871 |
||
2872 |
def _get_loader_and_module(self): |
|
2873 |
"""Gets a TestLoader and a module with one test in it."""
|
|
2874 |
loader = TestUtil.TestLoader() |
|
2875 |
module = {} |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2876 |
class Stub(tests.TestCase): |
2921.6.13
by Robert Collins
* Modules can now customise their tests by defining a ``load_tests`` |
2877 |
def test_foo(self): |
2878 |
pass
|
|
2879 |
class MyModule(object): |
|
2880 |
pass
|
|
2881 |
MyModule.a_class = Stub |
|
2882 |
module = MyModule() |
|
2883 |
return loader, module |
|
2884 |
||
2885 |
def test_module_no_load_tests_attribute_loads_classes(self): |
|
2886 |
loader, module = self._get_loader_and_module() |
|
2887 |
self.assertEqual(1, loader.loadTestsFromModule(module).countTestCases()) |
|
2888 |
||
2889 |
def test_module_load_tests_attribute_gets_called(self): |
|
2890 |
loader, module = self._get_loader_and_module() |
|
2891 |
# 'self' is here because we're faking the module with a class. Regular
|
|
2892 |
# load_tests do not need that :)
|
|
2893 |
def load_tests(self, standard_tests, module, loader): |
|
2894 |
result = loader.suiteClass() |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2895 |
for test in tests.iter_suite_tests(standard_tests): |
2921.6.13
by Robert Collins
* Modules can now customise their tests by defining a ``load_tests`` |
2896 |
result.addTests([test, test]) |
2897 |
return result |
|
2898 |
# add a load_tests() method which multiplies the tests from the module.
|
|
2899 |
module.__class__.load_tests = load_tests |
|
2900 |
self.assertEqual(2, loader.loadTestsFromModule(module).countTestCases()) |
|
2901 |
||
3302.7.3
by Vincent Ladeuil
Prepare TestLoader for specialization. |
2902 |
def test_load_tests_from_module_name_smoke_test(self): |
2903 |
loader = TestUtil.TestLoader() |
|
2904 |
suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler') |
|
2905 |
self.assertEquals(['bzrlib.tests.test_sampler.DemoTest.test_nothing'], |
|
2906 |
_test_ids(suite)) |
|
2907 |
||
3302.7.8
by Vincent Ladeuil
Fix typos. |
2908 |
def test_load_tests_from_module_name_with_bogus_module_name(self): |
3302.7.3
by Vincent Ladeuil
Prepare TestLoader for specialization. |
2909 |
loader = TestUtil.TestLoader() |
2910 |
self.assertRaises(ImportError, loader.loadTestsFromModuleName, 'bogus') |
|
2911 |
||
3193.1.1
by Vincent Ladeuil
Helper to filter test suite building by module when loading a list. |
2912 |
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2913 |
class TestTestIdList(tests.TestCase): |
2914 |
||
2915 |
def _create_id_list(self, test_list): |
|
2916 |
return tests.TestIdList(test_list) |
|
2917 |
||
2918 |
def _create_suite(self, test_id_list): |
|
3193.1.5
by Vincent Ladeuil
Add helper method to get only listed tests from a module test suite. |
2919 |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2920 |
class Stub(tests.TestCase): |
3193.1.5
by Vincent Ladeuil
Add helper method to get only listed tests from a module test suite. |
2921 |
def test_foo(self): |
2922 |
pass
|
|
2923 |
||
2924 |
def _create_test_id(id): |
|
2925 |
return lambda: id |
|
2926 |
||
2927 |
suite = TestUtil.TestSuite() |
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2928 |
for id in test_id_list: |
3193.1.5
by Vincent Ladeuil
Add helper method to get only listed tests from a module test suite. |
2929 |
t = Stub('test_foo') |
2930 |
t.id = _create_test_id(id) |
|
2931 |
suite.addTest(t) |
|
2932 |
return suite |
|
2933 |
||
2934 |
def _test_ids(self, test_suite): |
|
2935 |
"""Get the ids for the tests in a test suite."""
|
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2936 |
return [t.id() for t in tests.iter_suite_tests(test_suite)] |
3193.1.5
by Vincent Ladeuil
Add helper method to get only listed tests from a module test suite. |
2937 |
|
3193.1.1
by Vincent Ladeuil
Helper to filter test suite building by module when loading a list. |
2938 |
def test_empty_list(self): |
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2939 |
id_list = self._create_id_list([]) |
2940 |
self.assertEquals({}, id_list.tests) |
|
2941 |
self.assertEquals({}, id_list.modules) |
|
3193.1.1
by Vincent Ladeuil
Helper to filter test suite building by module when loading a list. |
2942 |
|
2943 |
def test_valid_list(self): |
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2944 |
id_list = self._create_id_list( |
3193.1.4
by Vincent Ladeuil
Make TestTestIdListFilter aware that a test exists for a module or one of |
2945 |
['mod1.cl1.meth1', 'mod1.cl1.meth2', |
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2946 |
'mod1.func1', 'mod1.cl2.meth2', |
2947 |
'mod1.submod1', |
|
3193.1.4
by Vincent Ladeuil
Make TestTestIdListFilter aware that a test exists for a module or one of |
2948 |
'mod1.submod2.cl1.meth1', 'mod1.submod2.cl2.meth2', |
2949 |
])
|
|
3302.8.3
by Vincent Ladeuil
Use better names for TestIdList methods. |
2950 |
self.assertTrue(id_list.refers_to('mod1')) |
2951 |
self.assertTrue(id_list.refers_to('mod1.submod1')) |
|
2952 |
self.assertTrue(id_list.refers_to('mod1.submod2')) |
|
2953 |
self.assertTrue(id_list.includes('mod1.cl1.meth1')) |
|
2954 |
self.assertTrue(id_list.includes('mod1.submod1')) |
|
2955 |
self.assertTrue(id_list.includes('mod1.func1')) |
|
3193.1.1
by Vincent Ladeuil
Helper to filter test suite building by module when loading a list. |
2956 |
|
2957 |
def test_bad_chars_in_params(self): |
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2958 |
id_list = self._create_id_list(['mod1.cl1.meth1(xx.yy)']) |
3302.8.3
by Vincent Ladeuil
Use better names for TestIdList methods. |
2959 |
self.assertTrue(id_list.refers_to('mod1')) |
2960 |
self.assertTrue(id_list.includes('mod1.cl1.meth1(xx.yy)')) |
|
3193.1.4
by Vincent Ladeuil
Make TestTestIdListFilter aware that a test exists for a module or one of |
2961 |
|
2962 |
def test_module_used(self): |
|
3193.1.11
by Vincent Ladeuil
Relax constraint on test ids, simplify implementation and update tests. |
2963 |
id_list = self._create_id_list(['mod.class.meth']) |
3302.8.3
by Vincent Ladeuil
Use better names for TestIdList methods. |
2964 |
self.assertTrue(id_list.refers_to('mod')) |
2965 |
self.assertTrue(id_list.refers_to('mod.class')) |
|
2966 |
self.assertTrue(id_list.refers_to('mod.class.meth')) |
|
3193.1.6
by Vincent Ladeuil
Filter the whole test suite. |
2967 |
|
3302.3.1
by Vincent Ladeuil
Help identify duplicates IDs in test suite and missing tests in id |
2968 |
def test_test_suite_matches_id_list_with_unknown(self): |
2969 |
loader = TestUtil.TestLoader() |
|
3302.7.6
by Vincent Ladeuil
Catch up with loadTestsFromModuleName use. |
2970 |
suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler') |
3302.3.1
by Vincent Ladeuil
Help identify duplicates IDs in test suite and missing tests in id |
2971 |
test_list = ['bzrlib.tests.test_sampler.DemoTest.test_nothing', |
2972 |
'bogus'] |
|
2973 |
not_found, duplicates = tests.suite_matches_id_list(suite, test_list) |
|
2974 |
self.assertEquals(['bogus'], not_found) |
|
2975 |
self.assertEquals([], duplicates) |
|
2976 |
||
2977 |
def test_suite_matches_id_list_with_duplicates(self): |
|
2978 |
loader = TestUtil.TestLoader() |
|
3302.7.6
by Vincent Ladeuil
Catch up with loadTestsFromModuleName use. |
2979 |
suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler') |
3302.3.1
by Vincent Ladeuil
Help identify duplicates IDs in test suite and missing tests in id |
2980 |
dupes = loader.suiteClass() |
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
2981 |
for test in tests.iter_suite_tests(suite): |
3302.3.1
by Vincent Ladeuil
Help identify duplicates IDs in test suite and missing tests in id |
2982 |
dupes.addTest(test) |
2983 |
dupes.addTest(test) # Add it again |
|
2984 |
||
2985 |
test_list = ['bzrlib.tests.test_sampler.DemoTest.test_nothing',] |
|
2986 |
not_found, duplicates = tests.suite_matches_id_list( |
|
2987 |
dupes, test_list) |
|
2988 |
self.assertEquals([], not_found) |
|
2989 |
self.assertEquals(['bzrlib.tests.test_sampler.DemoTest.test_nothing'], |
|
2990 |
duplicates) |
|
2991 |
||
3193.1.7
by Vincent Ladeuil
Load test id list from a text file. |
2992 |
|
4498.1.2
by Vincent Ladeuil
Fix selftest -s xxx --load yyy usage. |
2993 |
class TestTestSuite(tests.TestCase): |
2994 |
||
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
2995 |
def test__test_suite_testmod_names(self): |
2996 |
# Test that a plausible list of test module names are returned
|
|
2997 |
# by _test_suite_testmod_names.
|
|
2998 |
test_list = tests._test_suite_testmod_names() |
|
2999 |
self.assertSubset([ |
|
3000 |
'bzrlib.tests.blackbox', |
|
3001 |
'bzrlib.tests.per_transport', |
|
3002 |
'bzrlib.tests.test_selftest', |
|
3003 |
],
|
|
3004 |
test_list) |
|
3005 |
||
3006 |
def test__test_suite_modules_to_doctest(self): |
|
3007 |
# Test that a plausible list of modules to doctest is returned
|
|
3008 |
# by _test_suite_modules_to_doctest.
|
|
3009 |
test_list = tests._test_suite_modules_to_doctest() |
|
5131.2.6
by Martin
Fix more tests which were failing under -OO that had been missed earlier |
3010 |
if __doc__ is None: |
3011 |
# When docstrings are stripped, there are no modules to doctest
|
|
3012 |
self.assertEqual([], test_list) |
|
3013 |
return
|
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3014 |
self.assertSubset([ |
3015 |
'bzrlib.timestamp', |
|
3016 |
],
|
|
3017 |
test_list) |
|
3018 |
||
4498.1.2
by Vincent Ladeuil
Fix selftest -s xxx --load yyy usage. |
3019 |
def test_test_suite(self): |
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3020 |
# test_suite() loads the entire test suite to operate. To avoid this
|
3021 |
# overhead, and yet still be confident that things are happening,
|
|
3022 |
# we temporarily replace two functions used by test_suite with
|
|
3023 |
# test doubles that supply a few sample tests to load, and check they
|
|
3024 |
# are loaded.
|
|
3025 |
calls = [] |
|
4985.1.5
by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity |
3026 |
def testmod_names(): |
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3027 |
calls.append("testmod_names") |
3028 |
return [ |
|
3029 |
'bzrlib.tests.blackbox.test_branch', |
|
3030 |
'bzrlib.tests.per_transport', |
|
3031 |
'bzrlib.tests.test_selftest', |
|
3032 |
]
|
|
4985.1.5
by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity |
3033 |
self.overrideAttr(tests, '_test_suite_testmod_names', testmod_names) |
3034 |
def doctests(): |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3035 |
calls.append("modules_to_doctest") |
5131.2.6
by Martin
Fix more tests which were failing under -OO that had been missed earlier |
3036 |
if __doc__ is None: |
3037 |
return [] |
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3038 |
return ['bzrlib.timestamp'] |
4985.1.5
by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity |
3039 |
self.overrideAttr(tests, '_test_suite_modules_to_doctest', doctests) |
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3040 |
expected_test_list = [ |
4498.1.2
by Vincent Ladeuil
Fix selftest -s xxx --load yyy usage. |
3041 |
# testmod_names
|
3042 |
'bzrlib.tests.blackbox.test_branch.TestBranch.test_branch', |
|
4523.1.5
by Vincent Ladeuil
Fixed as asked in review. |
3043 |
('bzrlib.tests.per_transport.TransportTests' |
4725.1.1
by Vincent Ladeuil
Mention transport class name in test id. |
3044 |
'.test_abspath(LocalTransport,LocalURLServer)'), |
4498.1.2
by Vincent Ladeuil
Fix selftest -s xxx --load yyy usage. |
3045 |
'bzrlib.tests.test_selftest.TestTestSuite.test_test_suite', |
3046 |
# plugins can't be tested that way since selftest may be run with
|
|
3047 |
# --no-plugins
|
|
3048 |
]
|
|
5131.2.6
by Martin
Fix more tests which were failing under -OO that had been missed earlier |
3049 |
if __doc__ is not None: |
3050 |
expected_test_list.extend([ |
|
3051 |
# modules_to_doctest
|
|
3052 |
'bzrlib.timestamp.format_highres_date', |
|
3053 |
])
|
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3054 |
suite = tests.test_suite() |
3055 |
self.assertEqual(set(["testmod_names", "modules_to_doctest"]), |
|
3056 |
set(calls)) |
|
3057 |
self.assertSubset(expected_test_list, _test_ids(suite)) |
|
4498.1.2
by Vincent Ladeuil
Fix selftest -s xxx --load yyy usage. |
3058 |
|
3059 |
def test_test_suite_list_and_start(self): |
|
4636.2.5
by Robert Collins
Minor tweaks to clarity in slower selftest tests. |
3060 |
# We cannot test this at the same time as the main load, because we want
|
4650.1.1
by Robert Collins
Refactor test_suite to make stubbing out the list of tests to load possible without sacrificing coverage. |
3061 |
# to know that starting_with == None works. So a second load is
|
3062 |
# incurred - note that the starting_with parameter causes a partial load
|
|
3063 |
# rather than a full load so this test should be pretty quick.
|
|
4498.1.2
by Vincent Ladeuil
Fix selftest -s xxx --load yyy usage. |
3064 |
test_list = ['bzrlib.tests.test_selftest.TestTestSuite.test_test_suite'] |
3065 |
suite = tests.test_suite(test_list, |
|
3066 |
['bzrlib.tests.test_selftest.TestTestSuite']) |
|
3067 |
# test_test_suite_list_and_start is not included
|
|
3068 |
self.assertEquals(test_list, _test_ids(suite)) |
|
3069 |
||
3070 |
||
3193.1.7
by Vincent Ladeuil
Load test id list from a text file. |
3071 |
class TestLoadTestIdList(tests.TestCaseInTempDir): |
3072 |
||
3073 |
def _create_test_list_file(self, file_name, content): |
|
3074 |
fl = open(file_name, 'wt') |
|
3075 |
fl.write(content) |
|
3076 |
fl.close() |
|
3077 |
||
3078 |
def test_load_unknown(self): |
|
3079 |
self.assertRaises(errors.NoSuchFile, |
|
3080 |
tests.load_test_id_list, 'i_do_not_exist') |
|
3081 |
||
3082 |
def test_load_test_list(self): |
|
3083 |
test_list_fname = 'test.list' |
|
3084 |
self._create_test_list_file(test_list_fname, |
|
3085 |
'mod1.cl1.meth1\nmod2.cl2.meth2\n') |
|
3086 |
tlist = tests.load_test_id_list(test_list_fname) |
|
3087 |
self.assertEquals(2, len(tlist)) |
|
3088 |
self.assertEquals('mod1.cl1.meth1', tlist[0]) |
|
3089 |
self.assertEquals('mod2.cl2.meth2', tlist[1]) |
|
3090 |
||
3091 |
def test_load_dirty_file(self): |
|
3092 |
test_list_fname = 'test.list' |
|
3093 |
self._create_test_list_file(test_list_fname, |
|
3094 |
' mod1.cl1.meth1\n\nmod2.cl2.meth2 \n' |
|
3095 |
'bar baz\n') |
|
3096 |
tlist = tests.load_test_id_list(test_list_fname) |
|
3097 |
self.assertEquals(4, len(tlist)) |
|
3098 |
self.assertEquals('mod1.cl1.meth1', tlist[0]) |
|
3099 |
self.assertEquals('', tlist[1]) |
|
3100 |
self.assertEquals('mod2.cl2.meth2', tlist[2]) |
|
3101 |
self.assertEquals('bar baz', tlist[3]) |
|
3102 |
||
3103 |
||
3302.8.2
by Vincent Ladeuil
New test loader reducing modules imports and tests loaded. |
3104 |
class TestFilteredByModuleTestLoader(tests.TestCase): |
3105 |
||
3106 |
def _create_loader(self, test_list): |
|
3107 |
id_filter = tests.TestIdList(test_list) |
|
3302.8.4
by Vincent Ladeuil
Cosmetic changes. |
3108 |
loader = TestUtil.FilteredByModuleTestLoader(id_filter.refers_to) |
3302.8.2
by Vincent Ladeuil
New test loader reducing modules imports and tests loaded. |
3109 |
return loader |
3110 |
||
3111 |
def test_load_tests(self): |
|
3112 |
test_list = ['bzrlib.tests.test_sampler.DemoTest.test_nothing'] |
|
3113 |
loader = self._create_loader(test_list) |
|
3114 |
suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler') |
|
3115 |
self.assertEquals(test_list, _test_ids(suite)) |
|
3116 |
||
3117 |
def test_exclude_tests(self): |
|
3118 |
test_list = ['bogus'] |
|
3119 |
loader = self._create_loader(test_list) |
|
3120 |
suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler') |
|
3121 |
self.assertEquals([], _test_ids(suite)) |
|
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
3122 |
|
3123 |
||
3124 |
class TestFilteredByNameStartTestLoader(tests.TestCase): |
|
3125 |
||
3126 |
def _create_loader(self, name_start): |
|
3302.11.6
by Vincent Ladeuil
Fixed as per Martin and John reviews. Also fix a bug. |
3127 |
def needs_module(name): |
3128 |
return name.startswith(name_start) or name_start.startswith(name) |
|
3129 |
loader = TestUtil.FilteredByModuleTestLoader(needs_module) |
|
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
3130 |
return loader |
3131 |
||
3132 |
def test_load_tests(self): |
|
3133 |
test_list = ['bzrlib.tests.test_sampler.DemoTest.test_nothing'] |
|
3302.11.6
by Vincent Ladeuil
Fixed as per Martin and John reviews. Also fix a bug. |
3134 |
loader = self._create_loader('bzrlib.tests.test_samp') |
3135 |
||
3136 |
suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler') |
|
3137 |
self.assertEquals(test_list, _test_ids(suite)) |
|
3138 |
||
3139 |
def test_load_tests_inside_module(self): |
|
3140 |
test_list = ['bzrlib.tests.test_sampler.DemoTest.test_nothing'] |
|
3141 |
loader = self._create_loader('bzrlib.tests.test_sampler.Demo') |
|
3302.11.1
by Vincent Ladeuil
Create a new selftest filter allowing loading only one module/class/test. |
3142 |
|
3143 |
suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler') |
|
3144 |
self.assertEquals(test_list, _test_ids(suite)) |
|
3145 |
||
3146 |
def test_exclude_tests(self): |
|
3147 |
test_list = ['bogus'] |
|
3148 |
loader = self._create_loader('bogus') |
|
3149 |
||
3150 |
suite = loader.loadTestsFromModuleName('bzrlib.tests.test_sampler') |
|
3151 |
self.assertEquals([], _test_ids(suite)) |
|
3649.6.2
by Vincent Ladeuil
Replace aliases in selftest --starting-with option. |
3152 |
|
3153 |
||
3154 |
class TestTestPrefixRegistry(tests.TestCase): |
|
3155 |
||
3156 |
def _get_registry(self): |
|
3157 |
tp_registry = tests.TestPrefixAliasRegistry() |
|
3158 |
return tp_registry |
|
3159 |
||
3160 |
def test_register_new_prefix(self): |
|
3161 |
tpr = self._get_registry() |
|
3162 |
tpr.register('foo', 'fff.ooo.ooo') |
|
3163 |
self.assertEquals('fff.ooo.ooo', tpr.get('foo')) |
|
3164 |
||
3165 |
def test_register_existing_prefix(self): |
|
3166 |
tpr = self._get_registry() |
|
3167 |
tpr.register('bar', 'bbb.aaa.rrr') |
|
3168 |
tpr.register('bar', 'bBB.aAA.rRR') |
|
3169 |
self.assertEquals('bbb.aaa.rrr', tpr.get('bar')) |
|
4794.1.15
by Robert Collins
Review feedback. |
3170 |
self.assertThat(self.get_log(), |
5574.7.7
by Vincent Ladeuil
Fix test. |
3171 |
DocTestMatches("...bar...bbb.aaa.rrr...BB.aAA.rRR", |
3172 |
doctest.ELLIPSIS)) |
|
3649.6.2
by Vincent Ladeuil
Replace aliases in selftest --starting-with option. |
3173 |
|
3174 |
def test_get_unknown_prefix(self): |
|
3175 |
tpr = self._get_registry() |
|
3176 |
self.assertRaises(KeyError, tpr.get, 'I am not a prefix') |
|
3177 |
||
3178 |
def test_resolve_prefix(self): |
|
3179 |
tpr = self._get_registry() |
|
3180 |
tpr.register('bar', 'bb.aa.rr') |
|
3181 |
self.assertEquals('bb.aa.rr', tpr.resolve_alias('bar')) |
|
3182 |
||
3183 |
def test_resolve_unknown_alias(self): |
|
3184 |
tpr = self._get_registry() |
|
3185 |
self.assertRaises(errors.BzrCommandError, |
|
3186 |
tpr.resolve_alias, 'I am not a prefix') |
|
3187 |
||
3188 |
def test_predefined_prefixes(self): |
|
3189 |
tpr = tests.test_prefix_alias_registry |
|
3190 |
self.assertEquals('bzrlib', tpr.resolve_alias('bzrlib')) |
|
3191 |
self.assertEquals('bzrlib.doc', tpr.resolve_alias('bd')) |
|
3192 |
self.assertEquals('bzrlib.utils', tpr.resolve_alias('bu')) |
|
3193 |
self.assertEquals('bzrlib.tests', tpr.resolve_alias('bt')) |
|
3194 |
self.assertEquals('bzrlib.tests.blackbox', tpr.resolve_alias('bb')) |
|
3195 |
self.assertEquals('bzrlib.plugins', tpr.resolve_alias('bp')) |
|
4000.2.1
by Robert Collins
Add library level support for different test runners to bzrlib. |
3196 |
|
3197 |
||
5412.1.3
by Martin
Add tests for test case thread leak detection |
3198 |
class TestThreadLeakDetection(tests.TestCase): |
3199 |
"""Ensure when tests leak threads we detect and report it"""
|
|
3200 |
||
3201 |
class LeakRecordingResult(tests.ExtendedTestResult): |
|
3202 |
def __init__(self): |
|
3203 |
tests.ExtendedTestResult.__init__(self, StringIO(), 0, 1) |
|
3204 |
self.leaks = [] |
|
3205 |
def _report_thread_leak(self, test, leaks, alive): |
|
3206 |
self.leaks.append((test, leaks)) |
|
3207 |
||
3208 |
def test_testcase_without_addCleanups(self): |
|
5412.1.6
by Martin
Document the less obvious code and note future reporting plans, as requested in review by vila |
3209 |
"""Check old TestCase instances don't break with leak detection"""
|
5412.1.3
by Martin
Add tests for test case thread leak detection |
3210 |
class Test(unittest.TestCase): |
3211 |
def runTest(self): |
|
3212 |
pass
|
|
3213 |
result = self.LeakRecordingResult() |
|
3214 |
test = Test() |
|
3215 |
result.startTestRun() |
|
3216 |
test.run(result) |
|
3217 |
result.stopTestRun() |
|
3218 |
self.assertEqual(result._tests_leaking_threads_count, 0) |
|
3219 |
self.assertEqual(result.leaks, []) |
|
3220 |
||
3221 |
def test_thread_leak(self): |
|
5412.1.6
by Martin
Document the less obvious code and note future reporting plans, as requested in review by vila |
3222 |
"""Ensure a thread that outlives the running of a test is reported
|
3223 |
||
3224 |
Uses a thread that blocks on an event, and is started by the inner
|
|
3225 |
test case. As the thread outlives the inner case's run, it should be
|
|
3226 |
detected as a leak, but the event is then set so that the thread can
|
|
3227 |
be safely joined in cleanup so it's not leaked for real.
|
|
3228 |
"""
|
|
5412.1.3
by Martin
Add tests for test case thread leak detection |
3229 |
event = threading.Event() |
3230 |
thread = threading.Thread(name="Leaker", target=event.wait) |
|
3231 |
class Test(tests.TestCase): |
|
3232 |
def test_leak(self): |
|
3233 |
thread.start() |
|
3234 |
result = self.LeakRecordingResult() |
|
3235 |
test = Test("test_leak") |
|
3236 |
self.addCleanup(thread.join) |
|
3237 |
self.addCleanup(event.set) |
|
3238 |
result.startTestRun() |
|
3239 |
test.run(result) |
|
3240 |
result.stopTestRun() |
|
3241 |
self.assertEqual(result._tests_leaking_threads_count, 1) |
|
3242 |
self.assertEqual(result._first_thread_leaker_id, test.id()) |
|
3243 |
self.assertEqual(result.leaks, [(test, set([thread]))]) |
|
3244 |
self.assertContainsString(result.stream.getvalue(), "leaking threads") |
|
3245 |
||
3246 |
def test_multiple_leaks(self): |
|
5412.1.6
by Martin
Document the less obvious code and note future reporting plans, as requested in review by vila |
3247 |
"""Check multiple leaks are blamed on the test cases at fault
|
3248 |
||
3249 |
Same concept as the previous test, but has one inner test method that
|
|
3250 |
leaks two threads, and one that doesn't leak at all.
|
|
3251 |
"""
|
|
5412.1.3
by Martin
Add tests for test case thread leak detection |
3252 |
event = threading.Event() |
3253 |
thread_a = threading.Thread(name="LeakerA", target=event.wait) |
|
3254 |
thread_b = threading.Thread(name="LeakerB", target=event.wait) |
|
3255 |
thread_c = threading.Thread(name="LeakerC", target=event.wait) |
|
3256 |
class Test(tests.TestCase): |
|
3257 |
def test_first_leak(self): |
|
3258 |
thread_b.start() |
|
3259 |
def test_second_no_leak(self): |
|
3260 |
pass
|
|
3261 |
def test_third_leak(self): |
|
3262 |
thread_c.start() |
|
3263 |
thread_a.start() |
|
3264 |
result = self.LeakRecordingResult() |
|
3265 |
first_test = Test("test_first_leak") |
|
3266 |
third_test = Test("test_third_leak") |
|
3267 |
self.addCleanup(thread_a.join) |
|
3268 |
self.addCleanup(thread_b.join) |
|
3269 |
self.addCleanup(thread_c.join) |
|
3270 |
self.addCleanup(event.set) |
|
3271 |
result.startTestRun() |
|
3272 |
unittest.TestSuite( |
|
3273 |
[first_test, Test("test_second_no_leak"), third_test] |
|
3274 |
).run(result) |
|
3275 |
result.stopTestRun() |
|
3276 |
self.assertEqual(result._tests_leaking_threads_count, 2) |
|
3277 |
self.assertEqual(result._first_thread_leaker_id, first_test.id()) |
|
3278 |
self.assertEqual(result.leaks, [ |
|
3279 |
(first_test, set([thread_b])), |
|
3280 |
(third_test, set([thread_a, thread_c]))]) |
|
3281 |
self.assertContainsString(result.stream.getvalue(), "leaking threads") |
|
3282 |
||
3283 |
||
5459.5.1
by Martin
Add tests for location of stack when ExtendedTestResult.post_mortem is run |
3284 |
class TestPostMortemDebugging(tests.TestCase): |
3285 |
"""Check post mortem debugging works when tests fail or error"""
|
|
3286 |
||
3287 |
class TracebackRecordingResult(tests.ExtendedTestResult): |
|
3288 |
def __init__(self): |
|
3289 |
tests.ExtendedTestResult.__init__(self, StringIO(), 0, 1) |
|
3290 |
self.postcode = None |
|
5459.5.2
by Martin
Add handler to record the traceback from testtools cases to get BZR_TEST_PDB working again |
3291 |
def _post_mortem(self, tb=None): |
5459.5.1
by Martin
Add tests for location of stack when ExtendedTestResult.post_mortem is run |
3292 |
"""Record the code object at the end of the current traceback"""
|
5459.5.2
by Martin
Add handler to record the traceback from testtools cases to get BZR_TEST_PDB working again |
3293 |
tb = tb or sys.exc_info()[2] |
5459.5.1
by Martin
Add tests for location of stack when ExtendedTestResult.post_mortem is run |
3294 |
if tb is not None: |
3295 |
next = tb.tb_next |
|
3296 |
while next is not None: |
|
3297 |
tb = next |
|
3298 |
next = next.tb_next |
|
3299 |
self.postcode = tb.tb_frame.f_code |
|
3300 |
def report_error(self, test, err): |
|
3301 |
pass
|
|
3302 |
def report_failure(self, test, err): |
|
3303 |
pass
|
|
3304 |
||
3305 |
def test_location_unittest_error(self): |
|
3306 |
"""Needs right post mortem traceback with erroring unittest case"""
|
|
3307 |
class Test(unittest.TestCase): |
|
3308 |
def runTest(self): |
|
3309 |
raise RuntimeError |
|
3310 |
result = self.TracebackRecordingResult() |
|
3311 |
Test().run(result) |
|
3312 |
self.assertEqual(result.postcode, Test.runTest.func_code) |
|
3313 |
||
3314 |
def test_location_unittest_failure(self): |
|
3315 |
"""Needs right post mortem traceback with failing unittest case"""
|
|
3316 |
class Test(unittest.TestCase): |
|
3317 |
def runTest(self): |
|
3318 |
raise self.failureException |
|
3319 |
result = self.TracebackRecordingResult() |
|
3320 |
Test().run(result) |
|
3321 |
self.assertEqual(result.postcode, Test.runTest.func_code) |
|
3322 |
||
3323 |
def test_location_bt_error(self): |
|
3324 |
"""Needs right post mortem traceback with erroring bzrlib.tests case"""
|
|
3325 |
class Test(tests.TestCase): |
|
3326 |
def test_error(self): |
|
3327 |
raise RuntimeError |
|
3328 |
result = self.TracebackRecordingResult() |
|
3329 |
Test("test_error").run(result) |
|
3330 |
self.assertEqual(result.postcode, Test.test_error.func_code) |
|
3331 |
||
3332 |
def test_location_bt_failure(self): |
|
3333 |
"""Needs right post mortem traceback with failing bzrlib.tests case"""
|
|
3334 |
class Test(tests.TestCase): |
|
3335 |
def test_failure(self): |
|
3336 |
raise self.failureException |
|
3337 |
result = self.TracebackRecordingResult() |
|
3338 |
Test("test_failure").run(result) |
|
3339 |
self.assertEqual(result.postcode, Test.test_failure.func_code) |
|
3340 |
||
5459.5.3
by Martin
Add test for triggering of pdb.post_mortem with BZR_TEST_PDB |
3341 |
def test_env_var_triggers_post_mortem(self): |
3342 |
"""Check pdb.post_mortem is called iff BZR_TEST_PDB is set"""
|
|
3343 |
import pdb |
|
3344 |
result = tests.ExtendedTestResult(StringIO(), 0, 1) |
|
3345 |
post_mortem_calls = [] |
|
3346 |
self.overrideAttr(pdb, "post_mortem", post_mortem_calls.append) |
|
5570.3.9
by Vincent Ladeuil
More use cases for overrideEnv, _cleanEnvironment *may* contain too much variables now. |
3347 |
self.overrideEnv('BZR_TEST_PDB', None) |
5459.5.3
by Martin
Add test for triggering of pdb.post_mortem with BZR_TEST_PDB |
3348 |
result._post_mortem(1) |
5570.3.9
by Vincent Ladeuil
More use cases for overrideEnv, _cleanEnvironment *may* contain too much variables now. |
3349 |
self.overrideEnv('BZR_TEST_PDB', 'on') |
5459.5.3
by Martin
Add test for triggering of pdb.post_mortem with BZR_TEST_PDB |
3350 |
result._post_mortem(2) |
3351 |
self.assertEqual([2], post_mortem_calls) |
|
3352 |
||
5459.5.1
by Martin
Add tests for location of stack when ExtendedTestResult.post_mortem is run |
3353 |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
3354 |
class TestRunSuite(tests.TestCase): |
4000.2.1
by Robert Collins
Add library level support for different test runners to bzrlib. |
3355 |
|
3356 |
def test_runner_class(self): |
|
3357 |
"""run_suite accepts and uses a runner_class keyword argument."""
|
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
3358 |
class Stub(tests.TestCase): |
4000.2.1
by Robert Collins
Add library level support for different test runners to bzrlib. |
3359 |
def test_foo(self): |
3360 |
pass
|
|
3361 |
suite = Stub("test_foo") |
|
3362 |
calls = [] |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
3363 |
class MyRunner(tests.TextTestRunner): |
4000.2.1
by Robert Collins
Add library level support for different test runners to bzrlib. |
3364 |
def run(self, test): |
3365 |
calls.append(test) |
|
4498.1.1
by Vincent Ladeuil
Fix test_selftest.py imports. |
3366 |
return tests.ExtendedTestResult(self.stream, self.descriptions, |
3367 |
self.verbosity) |
|
3368 |
tests.run_suite(suite, runner_class=MyRunner, stream=StringIO()) |
|
4573.2.2
by Robert Collins
Fix selftest for TestResult progress changes. |
3369 |
self.assertLength(1, calls) |
5340.12.1
by Martin
Ensure that testcase attributes are deallocated after run |
3370 |
|
5340.12.13
by Martin
Gut TestDecorator classes, removing iter and instead doing all work on init, also test that decorators don't interfere with collection |
3371 |
|
6221.1.2
by Martin Packman
Extract parts of uncollected warnings tests for running selftest into seperate objects |
3372 |
class _Selftest(object): |
3373 |
"""Mixin for tests needing full selftest output"""
|
|
3374 |
||
3375 |
def _inject_stream_into_subunit(self, stream): |
|
3376 |
"""To be overridden by subclasses that run tests out of process"""
|
|
3377 |
||
3378 |
def _run_selftest(self, **kwargs): |
|
3379 |
sio = StringIO() |
|
3380 |
self._inject_stream_into_subunit(sio) |
|
3381 |
tests.selftest(stream=sio, stop_on_failure=False, **kwargs) |
|
3382 |
return sio.getvalue() |
|
3383 |
||
3384 |
||
3385 |
class _ForkedSelftest(_Selftest): |
|
3386 |
"""Mixin for tests needing full selftest output with forked children"""
|
|
3387 |
||
3388 |
_test_needs_features = [features.subunit] |
|
3389 |
||
3390 |
def _inject_stream_into_subunit(self, stream): |
|
3391 |
"""Monkey-patch subunit so the extra output goes to stream not stdout
|
|
3392 |
||
3393 |
Some APIs need rewriting so this kind of bogus hackery can be replaced
|
|
3394 |
by passing the stream param from run_tests down into ProtocolTestCase.
|
|
3395 |
"""
|
|
3396 |
from subunit import ProtocolTestCase |
|
3397 |
_original_init = ProtocolTestCase.__init__ |
|
3398 |
def _init_with_passthrough(self, *args, **kwargs): |
|
3399 |
_original_init(self, *args, **kwargs) |
|
3400 |
self._passthrough = stream |
|
3401 |
self.overrideAttr(ProtocolTestCase, "__init__", _init_with_passthrough) |
|
3402 |
||
3403 |
def _run_selftest(self, **kwargs): |
|
3404 |
# GZ 2011-05-26: Add a PosixSystem feature so this check can go away
|
|
3405 |
if getattr(os, "fork", None) is None: |
|
3406 |
raise tests.TestNotApplicable("Platform doesn't support forking") |
|
3407 |
# Make sure the fork code is actually invoked by claiming two cores
|
|
3408 |
self.overrideAttr(osutils, "local_concurrency", lambda: 2) |
|
3409 |
kwargs.setdefault("suite_decorators", []).append(tests.fork_decorator) |
|
3410 |
return super(_ForkedSelftest, self)._run_selftest(**kwargs) |
|
3411 |
||
3412 |
||
6221.1.3
by Martin Packman
Add failing test for error output from problems during forking children |
3413 |
class TestParallelFork(_ForkedSelftest, tests.TestCase): |
3414 |
"""Check operation of --parallel=fork selftest option"""
|
|
3415 |
||
3416 |
def test_error_in_child_during_fork(self): |
|
3417 |
"""Error in a forked child during test setup should get reported"""
|
|
3418 |
class Test(tests.TestCase): |
|
3419 |
def testMethod(self): |
|
3420 |
pass
|
|
3421 |
# We don't care what, just break something that a child will run
|
|
3422 |
self.overrideAttr(tests, "workaround_zealous_crypto_random", None) |
|
3423 |
out = self._run_selftest(test_suite_factory=Test) |
|
6245.1.1
by Martin Packman
Weaken test_error_in_child_during_fork to pass with intermingled tracebacks |
3424 |
# Lines from the tracebacks of the two child processes may be mixed
|
3425 |
# together due to the way subunit parses and forwards the streams,
|
|
3426 |
# so permit extra lines between each part of the error output.
|
|
6221.1.3
by Martin Packman
Add failing test for error output from problems during forking children |
3427 |
self.assertContainsRe(out, |
3428 |
"Traceback.*:\n" |
|
6245.1.2
by Martin Packman
Allow any number of intermingled lines rather than just zero or one |
3429 |
"(?:.*\n)*" |
6221.1.3
by Martin Packman
Add failing test for error output from problems during forking children |
3430 |
".+ in fork_for_tests\n" |
6245.1.2
by Martin Packman
Allow any number of intermingled lines rather than just zero or one |
3431 |
"(?:.*\n)*" |
6221.1.3
by Martin Packman
Add failing test for error output from problems during forking children |
3432 |
"\s*workaround_zealous_crypto_random\(\)\n" |
6245.1.2
by Martin Packman
Allow any number of intermingled lines rather than just zero or one |
3433 |
"(?:.*\n)*" |
6221.1.3
by Martin Packman
Add failing test for error output from problems during forking children |
3434 |
"TypeError:") |
3435 |
||
3436 |
||
6221.1.2
by Martin Packman
Extract parts of uncollected warnings tests for running selftest into seperate objects |
3437 |
class TestUncollectedWarnings(_Selftest, tests.TestCase): |
5340.15.1
by John Arbash Meinel
supersede exc-info branch |
3438 |
"""Check a test case still alive after being run emits a warning"""
|
3439 |
||
3440 |
class Test(tests.TestCase): |
|
3441 |
def test_pass(self): |
|
3442 |
pass
|
|
3443 |
def test_self_ref(self): |
|
3444 |
self.also_self = self.test_self_ref |
|
3445 |
def test_skip(self): |
|
3446 |
self.skip("Don't need") |
|
3447 |
||
3448 |
def _get_suite(self): |
|
3449 |
return TestUtil.TestSuite([ |
|
3450 |
self.Test("test_pass"), |
|
3451 |
self.Test("test_self_ref"), |
|
3452 |
self.Test("test_skip"), |
|
3453 |
])
|
|
3454 |
||
3455 |
def _run_selftest_with_suite(self, **kwargs): |
|
5340.16.4
by Martin
Fix tests to work regardless of flag state |
3456 |
old_flags = tests.selftest_debug_flags |
3457 |
tests.selftest_debug_flags = old_flags.union(["uncollected_cases"]) |
|
5340.15.1
by John Arbash Meinel
supersede exc-info branch |
3458 |
gc_on = gc.isenabled() |
3459 |
if gc_on: |
|
3460 |
gc.disable() |
|
3461 |
try: |
|
6221.1.2
by Martin Packman
Extract parts of uncollected warnings tests for running selftest into seperate objects |
3462 |
output = self._run_selftest(test_suite_factory=self._get_suite, |
3463 |
**kwargs) |
|
5340.15.1
by John Arbash Meinel
supersede exc-info branch |
3464 |
finally: |
3465 |
if gc_on: |
|
3466 |
gc.enable() |
|
5340.16.4
by Martin
Fix tests to work regardless of flag state |
3467 |
tests.selftest_debug_flags = old_flags |
5340.15.1
by John Arbash Meinel
supersede exc-info branch |
3468 |
self.assertNotContainsRe(output, "Uncollected test case.*test_pass") |
3469 |
self.assertContainsRe(output, "Uncollected test case.*test_self_ref") |
|
3470 |
return output |
|
3471 |
||
3472 |
def test_testsuite(self): |
|
3473 |
self._run_selftest_with_suite() |
|
3474 |
||
3475 |
def test_pattern(self): |
|
3476 |
out = self._run_selftest_with_suite(pattern="test_(?:pass|self_ref)$") |
|
3477 |
self.assertNotContainsRe(out, "test_skip") |
|
3478 |
||
3479 |
def test_exclude_pattern(self): |
|
3480 |
out = self._run_selftest_with_suite(exclude_pattern="test_skip$") |
|
3481 |
self.assertNotContainsRe(out, "test_skip") |
|
3482 |
||
3483 |
def test_random_seed(self): |
|
5340.16.20
by Martin Packman
Revert checking of test count in TestUncollectedCases.test_random_seed |
3484 |
self._run_selftest_with_suite(random_seed="now") |
5340.15.1
by John Arbash Meinel
supersede exc-info branch |
3485 |
|
3486 |
def test_matching_tests_first(self): |
|
3487 |
self._run_selftest_with_suite(matching_tests_first=True, |
|
3488 |
pattern="test_self_ref$") |
|
3489 |
||
3490 |
def test_starting_with_and_exclude(self): |
|
3491 |
out = self._run_selftest_with_suite(starting_with=["bt."], |
|
3492 |
exclude_pattern="test_skip$") |
|
3493 |
self.assertNotContainsRe(out, "test_skip") |
|
3494 |
||
3495 |
def test_additonal_decorator(self): |
|
3496 |
out = self._run_selftest_with_suite( |
|
3497 |
suite_decorators=[tests.TestDecorator]) |
|
3498 |
||
3499 |
||
3500 |
class TestUncollectedWarningsSubunit(TestUncollectedWarnings): |
|
3501 |
"""Check warnings from tests staying alive are emitted with subunit"""
|
|
3502 |
||
3503 |
_test_needs_features = [features.subunit] |
|
3504 |
||
3505 |
def _run_selftest_with_suite(self, **kwargs): |
|
3506 |
return TestUncollectedWarnings._run_selftest_with_suite(self, |
|
3507 |
runner_class=tests.SubUnitBzrRunner, **kwargs) |
|
3508 |
||
3509 |
||
6221.1.2
by Martin Packman
Extract parts of uncollected warnings tests for running selftest into seperate objects |
3510 |
class TestUncollectedWarningsForked(_ForkedSelftest, TestUncollectedWarnings): |
5340.16.5
by Martin
Add test subclass for collection of cases under --parallel=fork |
3511 |
"""Check warnings from tests staying alive are emitted when forking"""
|
3512 |
||
3513 |
||
5570.3.1
by Vincent Ladeuil
Demonstrate that test._captureVar() is dangerous. |
3514 |
class TestEnvironHandling(tests.TestCase): |
3515 |
||
5570.3.3
by Vincent Ladeuil
Introduce a more robust way to override environment variables (not deployed yet). |
3516 |
def test_overrideEnv_None_called_twice_doesnt_leak(self): |
5784.1.1
by Martin Pool
Stop using failIf, failUnless, etc |
3517 |
self.assertFalse('MYVAR' in os.environ) |
5570.3.3
by Vincent Ladeuil
Introduce a more robust way to override environment variables (not deployed yet). |
3518 |
self.overrideEnv('MYVAR', '42') |
3519 |
# We use an embedded test to make sure we fix the _captureVar bug
|
|
3520 |
class Test(tests.TestCase): |
|
3521 |
def test_me(self): |
|
3522 |
# The first call save the 42 value
|
|
3523 |
self.overrideEnv('MYVAR', None) |
|
3524 |
self.assertEquals(None, os.environ.get('MYVAR')) |
|
5570.3.4
by Vincent Ladeuil
Simplify overrideEnv, fix the related tests, make them more dev-friendly too. |
3525 |
# Make sure we can call it twice
|
5570.3.3
by Vincent Ladeuil
Introduce a more robust way to override environment variables (not deployed yet). |
3526 |
self.overrideEnv('MYVAR', None) |
3527 |
self.assertEquals(None, os.environ.get('MYVAR')) |
|
3528 |
output = StringIO() |
|
3529 |
result = tests.TextTestResult(output, 0, 1) |
|
3530 |
Test('test_me').run(result) |
|
5570.3.4
by Vincent Ladeuil
Simplify overrideEnv, fix the related tests, make them more dev-friendly too. |
3531 |
if not result.wasStrictlySuccessful(): |
3532 |
self.fail(output.getvalue()) |
|
5570.3.3
by Vincent Ladeuil
Introduce a more robust way to override environment variables (not deployed yet). |
3533 |
# We get our value back
|
3534 |
self.assertEquals('42', os.environ.get('MYVAR')) |
|
5574.7.1
by Vincent Ladeuil
Implement a fixture for isolating tests from ``os.environ``. |
3535 |
|
3536 |
||
3537 |
class TestIsolatedEnv(tests.TestCase): |
|
3538 |
"""Test isolating tests from os.environ.
|
|
3539 |
||
5574.6.8
by Vincent Ladeuil
Fix typo, rename BzrDocTestSuite to IsolatedDocTestSuite to dodge the name space controversy and make the intent clearer, add an indirection for setUp/tearDown to prepare more isolation for doctests. |
3540 |
Since we use tests that are already isolated from os.environ a bit of care
|
5574.7.1
by Vincent Ladeuil
Implement a fixture for isolating tests from ``os.environ``. |
3541 |
should be taken when designing the tests to avoid bootstrap side-effects.
|
3542 |
The tests start an already clean os.environ which allow doing valid
|
|
3543 |
assertions about which variables are present or not and design tests around
|
|
3544 |
these assertions.
|
|
3545 |
"""
|
|
3546 |
||
3547 |
class ScratchMonkey(tests.TestCase): |
|
3548 |
||
3549 |
def test_me(self): |
|
3550 |
pass
|
|
3551 |
||
3552 |
def test_basics(self): |
|
3553 |
# Make sure we know the definition of BZR_HOME: not part of os.environ
|
|
3554 |
# for tests.TestCase.
|
|
3555 |
self.assertTrue('BZR_HOME' in tests.isolated_environ) |
|
3556 |
self.assertEquals(None, tests.isolated_environ['BZR_HOME']) |
|
3557 |
# Being part of isolated_environ, BZR_HOME should not appear here
|
|
3558 |
self.assertFalse('BZR_HOME' in os.environ) |
|
3559 |
# Make sure we know the definition of LINES: part of os.environ for
|
|
3560 |
# tests.TestCase
|
|
3561 |
self.assertTrue('LINES' in tests.isolated_environ) |
|
3562 |
self.assertEquals('25', tests.isolated_environ['LINES']) |
|
3563 |
self.assertEquals('25', os.environ['LINES']) |
|
3564 |
||
3565 |
def test_injecting_unknown_variable(self): |
|
3566 |
# BZR_HOME is known to be absent from os.environ
|
|
3567 |
test = self.ScratchMonkey('test_me') |
|
3568 |
tests.override_os_environ(test, {'BZR_HOME': 'foo'}) |
|
3569 |
self.assertEquals('foo', os.environ['BZR_HOME']) |
|
3570 |
tests.restore_os_environ(test) |
|
3571 |
self.assertFalse('BZR_HOME' in os.environ) |
|
3572 |
||
3573 |
def test_injecting_known_variable(self): |
|
3574 |
test = self.ScratchMonkey('test_me') |
|
3575 |
# LINES is known to be present in os.environ
|
|
3576 |
tests.override_os_environ(test, {'LINES': '42'}) |
|
3577 |
self.assertEquals('42', os.environ['LINES']) |
|
3578 |
tests.restore_os_environ(test) |
|
3579 |
self.assertEquals('25', os.environ['LINES']) |
|
3580 |
||
3581 |
def test_deleting_variable(self): |
|
3582 |
test = self.ScratchMonkey('test_me') |
|
3583 |
# LINES is known to be present in os.environ
|
|
3584 |
tests.override_os_environ(test, {'LINES': None}) |
|
3585 |
self.assertTrue('LINES' not in os.environ) |
|
3586 |
tests.restore_os_environ(test) |
|
3587 |
self.assertEquals('25', os.environ['LINES']) |
|
5574.7.3
by Vincent Ladeuil
Some test infrastructure for tests.DocTestSuite. |
3588 |
|
3589 |
||
3590 |
class TestDocTestSuiteIsolation(tests.TestCase): |
|
5574.7.4
by Vincent Ladeuil
Test tests.DocTestSuite, using doctest.DocTestSuite as a reference point. |
3591 |
"""Test that `tests.DocTestSuite` isolates doc tests from os.environ.
|
3592 |
||
3593 |
Since tests.TestCase alreay provides an isolation from os.environ, we use
|
|
3594 |
the clean environment as a base for testing. To precisely capture the
|
|
3595 |
isolation provided by tests.DocTestSuite, we use doctest.DocTestSuite to
|
|
3596 |
compare against.
|
|
3597 |
||
3598 |
We want to make sure `tests.DocTestSuite` respect `tests.isolated_environ`,
|
|
3599 |
not `os.environ` so each test overrides it to suit its needs.
|
|
3600 |
||
3601 |
"""
|
|
3602 |
||
3603 |
def get_doctest_suite_for_string(self, klass, string): |
|
5574.7.3
by Vincent Ladeuil
Some test infrastructure for tests.DocTestSuite. |
3604 |
class Finder(doctest.DocTestFinder): |
3605 |
||
3606 |
def find(*args, **kwargs): |
|
3607 |
test = doctest.DocTestParser().get_doctest( |
|
3608 |
string, {}, 'foo', 'foo.py', 0) |
|
3609 |
return [test] |
|
3610 |
||
3611 |
suite = klass(test_finder=Finder()) |
|
3612 |
return suite |
|
3613 |
||
5574.7.4
by Vincent Ladeuil
Test tests.DocTestSuite, using doctest.DocTestSuite as a reference point. |
3614 |
def run_doctest_suite_for_string(self, klass, string): |
3615 |
suite = self.get_doctest_suite_for_string(klass, string) |
|
3616 |
output = StringIO() |
|
3617 |
result = tests.TextTestResult(output, 0, 1) |
|
3618 |
suite.run(result) |
|
3619 |
return result, output |
|
3620 |
||
5574.7.3
by Vincent Ladeuil
Some test infrastructure for tests.DocTestSuite. |
3621 |
def assertDocTestStringSucceds(self, klass, string): |
5574.7.4
by Vincent Ladeuil
Test tests.DocTestSuite, using doctest.DocTestSuite as a reference point. |
3622 |
result, output = self.run_doctest_suite_for_string(klass, string) |
5574.7.3
by Vincent Ladeuil
Some test infrastructure for tests.DocTestSuite. |
3623 |
if not result.wasStrictlySuccessful(): |
3624 |
self.fail(output.getvalue()) |
|
3625 |
||
5574.7.4
by Vincent Ladeuil
Test tests.DocTestSuite, using doctest.DocTestSuite as a reference point. |
3626 |
def assertDocTestStringFails(self, klass, string): |
3627 |
result, output = self.run_doctest_suite_for_string(klass, string) |
|
3628 |
if result.wasStrictlySuccessful(): |
|
3629 |
self.fail(output.getvalue()) |
|
3630 |
||
5574.7.3
by Vincent Ladeuil
Some test infrastructure for tests.DocTestSuite. |
3631 |
def test_injected_variable(self): |
5574.7.4
by Vincent Ladeuil
Test tests.DocTestSuite, using doctest.DocTestSuite as a reference point. |
3632 |
self.overrideAttr(tests, 'isolated_environ', {'LINES': '42'}) |
3633 |
test = """ |
|
5574.7.3
by Vincent Ladeuil
Some test infrastructure for tests.DocTestSuite. |
3634 |
>>> import os
|
3635 |
>>> os.environ['LINES']
|
|
5574.7.4
by Vincent Ladeuil
Test tests.DocTestSuite, using doctest.DocTestSuite as a reference point. |
3636 |
'42'
|
3637 |
"""
|
|
3638 |
# doctest.DocTestSuite fails as it sees '25'
|
|
3639 |
self.assertDocTestStringFails(doctest.DocTestSuite, test) |
|
3640 |
# tests.DocTestSuite sees '42'
|
|
5574.6.8
by Vincent Ladeuil
Fix typo, rename BzrDocTestSuite to IsolatedDocTestSuite to dodge the name space controversy and make the intent clearer, add an indirection for setUp/tearDown to prepare more isolation for doctests. |
3641 |
self.assertDocTestStringSucceds(tests.IsolatedDocTestSuite, test) |
5574.7.3
by Vincent Ladeuil
Some test infrastructure for tests.DocTestSuite. |
3642 |
|
3643 |
def test_deleted_variable(self): |
|
5574.7.4
by Vincent Ladeuil
Test tests.DocTestSuite, using doctest.DocTestSuite as a reference point. |
3644 |
self.overrideAttr(tests, 'isolated_environ', {'LINES': None}) |
3645 |
test = """ |
|
5574.7.3
by Vincent Ladeuil
Some test infrastructure for tests.DocTestSuite. |
3646 |
>>> import os
|
5574.7.4
by Vincent Ladeuil
Test tests.DocTestSuite, using doctest.DocTestSuite as a reference point. |
3647 |
>>> os.environ.get('LINES')
|
3648 |
"""
|
|
3649 |
# doctest.DocTestSuite fails as it sees '25'
|
|
3650 |
self.assertDocTestStringFails(doctest.DocTestSuite, test) |
|
3651 |
# tests.DocTestSuite sees None
|
|
5574.6.8
by Vincent Ladeuil
Fix typo, rename BzrDocTestSuite to IsolatedDocTestSuite to dodge the name space controversy and make the intent clearer, add an indirection for setUp/tearDown to prepare more isolation for doctests. |
3652 |
self.assertDocTestStringSucceds(tests.IsolatedDocTestSuite, test) |
5924.1.1
by Vincent Ladeuil
Add a failing test. |
3653 |
|
3654 |
||
3655 |
class TestSelftestExcludePatterns(tests.TestCase): |
|
3656 |
||
3657 |
def setUp(self): |
|
3658 |
super(TestSelftestExcludePatterns, self).setUp() |
|
3659 |
self.overrideAttr(tests, 'test_suite', self.suite_factory) |
|
3660 |
||
3661 |
def suite_factory(self, keep_only=None, starting_with=None): |
|
3662 |
"""A test suite factory with only a few tests."""
|
|
3663 |
class Test(tests.TestCase): |
|
3664 |
def id(self): |
|
3665 |
# We don't need the full class path
|
|
3666 |
return self._testMethodName |
|
3667 |
def a(self): |
|
3668 |
pass
|
|
3669 |
def b(self): |
|
3670 |
pass
|
|
3671 |
def c(self): |
|
3672 |
pass
|
|
3673 |
return TestUtil.TestSuite([Test("a"), Test("b"), Test("c")]) |
|
3674 |
||
3675 |
def assertTestList(self, expected, *selftest_args): |
|
3676 |
# We rely on setUp installing the right test suite factory so we can
|
|
3677 |
# test at the command level without loading the whole test suite
|
|
3678 |
out, err = self.run_bzr(('selftest', '--list') + selftest_args) |
|
3679 |
actual = out.splitlines() |
|
3680 |
self.assertEquals(expected, actual) |
|
3681 |
||
3682 |
def test_full_list(self): |
|
3683 |
self.assertTestList(['a', 'b', 'c']) |
|
3684 |
||
3685 |
def test_single_exclude(self): |
|
3686 |
self.assertTestList(['b', 'c'], '-x', 'a') |
|
3687 |
||
3688 |
def test_mutiple_excludes(self): |
|
3689 |
self.assertTestList(['c'], '-x', 'a', '-x', 'b') |
|
5743.14.13
by Vincent Ladeuil
Some more doc and tests. |
3690 |
|
3691 |
||
3692 |
class TestCounterHooks(tests.TestCase, SelfTestHelper): |
|
3693 |
||
3694 |
_test_needs_features = [features.subunit] |
|
3695 |
||
3696 |
def setUp(self): |
|
3697 |
super(TestCounterHooks, self).setUp() |
|
3698 |
class Test(tests.TestCase): |
|
3699 |
||
3700 |
def setUp(self): |
|
3701 |
super(Test, self).setUp() |
|
3702 |
self.hooks = hooks.Hooks() |
|
3703 |
self.hooks.add_hook('myhook', 'Foo bar blah', (2,4)) |
|
3704 |
self.install_counter_hook(self.hooks, 'myhook') |
|
3705 |
||
3706 |
def no_hook(self): |
|
3707 |
pass
|
|
3708 |
||
3709 |
def run_hook_once(self): |
|
3710 |
for hook in self.hooks['myhook']: |
|
3711 |
hook(self) |
|
5743.14.16
by Vincent Ladeuil
Missing blank line. |
3712 |
|
5743.14.13
by Vincent Ladeuil
Some more doc and tests. |
3713 |
self.test_class = Test |
3714 |
||
3715 |
def assertHookCalls(self, expected_calls, test_name): |
|
3716 |
test = self.test_class(test_name) |
|
3717 |
result = unittest.TestResult() |
|
3718 |
test.run(result) |
|
3719 |
self.assertTrue(hasattr(test, '_counters')) |
|
3720 |
self.assertTrue(test._counters.has_key('myhook')) |
|
3721 |
self.assertEquals(expected_calls, test._counters['myhook']) |
|
3722 |
||
3723 |
def test_no_hook(self): |
|
3724 |
self.assertHookCalls(0, 'no_hook') |
|
3725 |
||
3726 |
def test_run_hook_once(self): |
|
5743.14.17
by Vincent Ladeuil
Fix pqm failure by requiring the right version of testtools :-/ |
3727 |
tt = features.testtools |
3728 |
if tt.module.__version__ < (0, 9, 8): |
|
3729 |
raise tests.TestSkipped('testtools-0.9.8 required for addDetail') |
|
5743.14.13
by Vincent Ladeuil
Some more doc and tests. |
3730 |
self.assertHookCalls(1, 'run_hook_once') |