114
138
Shows output in a different format, including displaying runtime for tests.
116
140
stop_early = False
118
def _elapsedTime(self):
119
return "%5dms" % (1000 * (time.time() - self._start_time))
142
def __init__(self, stream, descriptions, verbosity, pb=None,
144
"""Construct new TestResult.
146
:param bench_history: Optionally, a writable file object to accumulate
149
unittest._TextTestResult.__init__(self, stream, descriptions, verbosity)
151
if bench_history is not None:
152
from bzrlib.version import _get_bzr_source_tree
153
src_tree = _get_bzr_source_tree()
156
revision_id = src_tree.get_parent_ids()[0]
158
# XXX: if this is a brand new tree, do the same as if there
162
# XXX: If there's no branch, what should we do?
164
bench_history.write("--date %s %s\n" % (time.time(), revision_id))
165
self._bench_history = bench_history
167
def extractBenchmarkTime(self, testCase):
168
"""Add a benchmark time for the current test case."""
169
self._benchmarkTime = getattr(testCase, "_benchtime", None)
171
def _elapsedTestTimeString(self):
172
"""Return a time string for the overall time the current test has taken."""
173
return self._formatTime(time.time() - self._start_time)
175
def _testTimeString(self):
176
if self._benchmarkTime is not None:
178
self._formatTime(self._benchmarkTime),
179
self._elapsedTestTimeString())
181
return " %s" % self._elapsedTestTimeString()
183
def _formatTime(self, seconds):
184
"""Format seconds as milliseconds with leading spaces."""
185
return "%5dms" % (1000 * seconds)
187
def _ellipsise_unimportant_words(self, a_string, final_width,
189
"""Add ellipses (sp?) for overly long strings.
191
:param keep_start: If true preserve the start of a_string rather
195
if len(a_string) > final_width:
196
result = a_string[:final_width-3] + '...'
200
if len(a_string) > final_width:
201
result = '...' + a_string[3-final_width:]
204
return result.ljust(final_width)
121
206
def startTest(self, test):
122
207
unittest.TestResult.startTest(self, test)
124
209
# the beginning, but in an id, the important words are
126
211
SHOW_DESCRIPTIONS = False
213
if not self.showAll and self.dots and self.pb is not None:
216
final_width = osutils.terminal_width()
217
final_width = final_width - 15 - 8
219
if SHOW_DESCRIPTIONS:
220
what = test.shortDescription()
222
what = self._ellipsise_unimportant_words(what, final_width, keep_start=True)
225
if what.startswith('bzrlib.tests.'):
227
what = self._ellipsise_unimportant_words(what, final_width)
128
width = osutils.terminal_width()
129
name_width = width - 15
131
if SHOW_DESCRIPTIONS:
132
what = test.shortDescription()
134
if len(what) > name_width:
135
what = what[:name_width-3] + '...'
138
if what.startswith('bzrlib.tests.'):
140
if len(what) > name_width:
141
what = '...' + what[3-name_width:]
142
what = what.ljust(name_width)
143
229
self.stream.write(what)
230
elif self.dots and self.pb is not None:
231
self.pb.update(what, self.testsRun - 1, None)
144
232
self.stream.flush()
233
self._recordTestStartTime()
235
def _recordTestStartTime(self):
236
"""Record that a test has started."""
145
237
self._start_time = time.time()
147
239
def addError(self, test, err):
148
240
if isinstance(err[1], TestSkipped):
149
241
return self.addSkipped(test, err)
150
242
unittest.TestResult.addError(self, test, err)
243
self.extractBenchmarkTime(test)
152
self.stream.writeln("ERROR %s" % self._elapsedTime())
245
self.stream.writeln("ERROR %s" % self._testTimeString())
246
elif self.dots and self.pb is None:
154
247
self.stream.write('E')
249
self.pb.update(self._ellipsise_unimportant_words('ERROR', 13), self.testsRun, None)
250
self.pb.note(self._ellipsise_unimportant_words(
251
test.id() + ': ERROR',
252
osutils.terminal_width()))
155
253
self.stream.flush()
156
254
if self.stop_early:
159
257
def addFailure(self, test, err):
160
258
unittest.TestResult.addFailure(self, test, err)
259
self.extractBenchmarkTime(test)
162
self.stream.writeln(" FAIL %s" % self._elapsedTime())
261
self.stream.writeln(" FAIL %s" % self._testTimeString())
262
elif self.dots and self.pb is None:
164
263
self.stream.write('F')
265
self.pb.update(self._ellipsise_unimportant_words('FAIL', 13), self.testsRun, None)
266
self.pb.note(self._ellipsise_unimportant_words(
267
test.id() + ': FAIL',
268
osutils.terminal_width()))
165
269
self.stream.flush()
166
270
if self.stop_early:
169
273
def addSuccess(self, test):
274
self.extractBenchmarkTime(test)
275
if self._bench_history is not None:
276
if self._benchmarkTime is not None:
277
self._bench_history.write("%s %s\n" % (
278
self._formatTime(self._benchmarkTime),
171
self.stream.writeln(' OK %s' % self._elapsedTime())
281
self.stream.writeln(' OK %s' % self._testTimeString())
282
for bench_called, stats in getattr(test, '_benchcalls', []):
283
self.stream.writeln('LSProf output for %s(%s, %s)' % bench_called)
284
stats.pprint(file=self.stream)
285
elif self.dots and self.pb is None:
173
286
self.stream.write('~')
288
self.pb.update(self._ellipsise_unimportant_words('OK', 13), self.testsRun, None)
174
289
self.stream.flush()
175
290
unittest.TestResult.addSuccess(self, test)
177
292
def addSkipped(self, test, skip_excinfo):
293
self.extractBenchmarkTime(test)
179
print >>self.stream, ' SKIP %s' % self._elapsedTime()
295
print >>self.stream, ' SKIP %s' % self._testTimeString()
180
296
print >>self.stream, ' %s' % skip_excinfo[1]
297
elif self.dots and self.pb is None:
182
298
self.stream.write('S')
300
self.pb.update(self._ellipsise_unimportant_words('SKIP', 13), self.testsRun, None)
183
301
self.stream.flush()
184
302
# seems best to treat this as success from point-of-view of unittest
185
303
# -- it actually does nothing so it barely matters :)
186
unittest.TestResult.addSuccess(self, test)
306
except KeyboardInterrupt:
309
self.addError(test, test.__exc_info())
311
unittest.TestResult.addSuccess(self, test)
188
313
def printErrorList(self, flavour, errors):
189
314
for test, err in errors:
200
325
self.stream.writeln("%s" % err)
203
class TextTestRunner(unittest.TextTestRunner):
328
class TextTestRunner(object):
204
329
stop_on_failure = False
338
self.stream = unittest._WritelnDecorator(stream)
339
self.descriptions = descriptions
340
self.verbosity = verbosity
341
self.keep_output = keep_output
343
self._bench_history = bench_history
206
345
def _makeResult(self):
207
result = _MyResult(self.stream, self.descriptions, self.verbosity)
346
result = _MyResult(self.stream,
350
bench_history=self._bench_history)
208
351
result.stop_early = self.stop_on_failure
355
"Run the given test case or test suite."
356
result = self._makeResult()
357
startTime = time.time()
358
if self.pb is not None:
359
self.pb.update('Running tests', 0, test.countTestCases())
361
stopTime = time.time()
362
timeTaken = stopTime - startTime
364
self.stream.writeln(result.separator2)
365
run = result.testsRun
366
self.stream.writeln("Ran %d test%s in %.3fs" %
367
(run, run != 1 and "s" or "", timeTaken))
368
self.stream.writeln()
369
if not result.wasSuccessful():
370
self.stream.write("FAILED (")
371
failed, errored = map(len, (result.failures, result.errors))
373
self.stream.write("failures=%d" % failed)
375
if failed: self.stream.write(", ")
376
self.stream.write("errors=%d" % errored)
377
self.stream.writeln(")")
379
self.stream.writeln("OK")
380
if self.pb is not None:
381
self.pb.update('Cleaning up', 0, 1)
382
# This is still a little bogus,
383
# but only a little. Folk not using our testrunner will
384
# have to delete their temp directories themselves.
385
test_root = TestCaseInTempDir.TEST_ROOT
386
if result.wasSuccessful() or not self.keep_output:
387
if test_root is not None:
388
# If LANG=C we probably have created some bogus paths
389
# which rmtree(unicode) will fail to delete
390
# so make sure we are using rmtree(str) to delete everything
391
# except on win32, where rmtree(str) will fail
392
# since it doesn't have the property of byte-stream paths
393
# (they are either ascii or mbcs)
394
if sys.platform == 'win32':
395
# make sure we are using the unicode win32 api
396
test_root = unicode(test_root)
398
test_root = test_root.encode(
399
sys.getfilesystemencoding())
400
osutils.rmtree(test_root)
402
if self.pb is not None:
403
self.pb.note("Failed tests working directories are in '%s'\n",
407
"Failed tests working directories are in '%s'\n" %
409
TestCaseInTempDir.TEST_ROOT = None
410
if self.pb is not None:
212
415
def iter_suite_tests(suite):
213
416
"""Return all tests in a suite, recursing through nested suites"""
341
580
def assertIsInstance(self, obj, kls):
342
581
"""Fail if obj is not an instance of kls"""
343
582
if not isinstance(obj, kls):
344
self.fail("%r is not an instance of %s" % (obj, kls))
583
self.fail("%r is an instance of %s rather than %s" % (
584
obj, obj.__class__, kls))
586
def _capture_warnings(self, a_callable, *args, **kwargs):
587
"""A helper for callDeprecated and applyDeprecated.
589
:param a_callable: A callable to call.
590
:param args: The positional arguments for the callable
591
:param kwargs: The keyword arguments for the callable
592
:return: A tuple (warnings, result). result is the result of calling
593
a_callable(*args, **kwargs).
596
def capture_warnings(msg, cls, stacklevel=None):
597
# we've hooked into a deprecation specific callpath,
598
# only deprecations should getting sent via it.
599
self.assertEqual(cls, DeprecationWarning)
600
local_warnings.append(msg)
601
original_warning_method = symbol_versioning.warn
602
symbol_versioning.set_warning_method(capture_warnings)
604
result = a_callable(*args, **kwargs)
606
symbol_versioning.set_warning_method(original_warning_method)
607
return (local_warnings, result)
609
def applyDeprecated(self, deprecation_format, a_callable, *args, **kwargs):
610
"""Call a deprecated callable without warning the user.
612
:param deprecation_format: The deprecation format that the callable
613
should have been deprecated with. This is the same type as the
614
parameter to deprecated_method/deprecated_function. If the
615
callable is not deprecated with this format, an assertion error
617
:param a_callable: A callable to call. This may be a bound method or
618
a regular function. It will be called with *args and **kwargs.
619
:param args: The positional arguments for the callable
620
:param kwargs: The keyword arguments for the callable
621
:return: The result of a_callable(*args, **kwargs)
623
call_warnings, result = self._capture_warnings(a_callable,
625
expected_first_warning = symbol_versioning.deprecation_string(
626
a_callable, deprecation_format)
627
if len(call_warnings) == 0:
628
self.fail("No assertion generated by call to %s" %
630
self.assertEqual(expected_first_warning, call_warnings[0])
633
def callDeprecated(self, expected, callable, *args, **kwargs):
634
"""Assert that a callable is deprecated in a particular way.
636
This is a very precise test for unusual requirements. The
637
applyDeprecated helper function is probably more suited for most tests
638
as it allows you to simply specify the deprecation format being used
639
and will ensure that that is issued for the function being called.
641
:param expected: a list of the deprecation warnings expected, in order
642
:param callable: The callable to call
643
:param args: The positional arguments for the callable
644
:param kwargs: The keyword arguments for the callable
646
call_warnings, result = self._capture_warnings(callable,
648
self.assertEqual(expected, call_warnings)
346
651
def _startLogFile(self):
347
652
"""Send bzr and test log messages to a temporary file.
383
689
'HOME': os.getcwd(),
384
690
'APPDATA': os.getcwd(),
692
'BZREMAIL': None, # may still be present in the environment
694
'BZR_PROGRESS_BAR': None,
388
696
self.__old_env = {}
389
697
self.addCleanup(self._restoreEnvironment)
390
698
for name, value in new_env.iteritems():
391
699
self._captureVar(name, value)
394
701
def _captureVar(self, name, newvalue):
395
"""Set an environment variable, preparing it to be reset when finished."""
396
self.__old_env[name] = os.environ.get(name, None)
398
if name in os.environ:
401
os.environ[name] = newvalue
404
def _restoreVar(name, value):
406
if name in os.environ:
409
os.environ[name] = value
702
"""Set an environment variable, and reset it when finished."""
703
self.__old_env[name] = osutils.set_or_unset_env(name, newvalue)
411
705
def _restoreEnvironment(self):
412
706
for name, value in self.__old_env.iteritems():
413
self._restoreVar(name, value)
707
osutils.set_or_unset_env(name, value)
415
709
def tearDown(self):
416
710
self._runCleanups()
417
711
unittest.TestCase.tearDown(self)
713
def time(self, callable, *args, **kwargs):
714
"""Run callable and accrue the time it takes to the benchmark time.
716
If lsprofiling is enabled (i.e. by --lsprof-time to bzr selftest) then
717
this will cause lsprofile statistics to be gathered and stored in
720
if self._benchtime is None:
724
if not self._gather_lsprof_in_benchmarks:
725
return callable(*args, **kwargs)
727
# record this benchmark
728
ret, stats = bzrlib.lsprof.profile(callable, *args, **kwargs)
730
self._benchcalls.append(((callable, args, kwargs), stats))
733
self._benchtime += time.time() - start
419
735
def _runCleanups(self):
420
736
"""Run registered cleanup functions.
458
774
errors, and with logging set to something approximating the
459
775
default, so that error reporting can be checked.
461
argv -- arguments to invoke bzr
462
retcode -- expected return code, or None for don't-care.
777
:param argv: arguments to invoke bzr
778
:param retcode: expected return code, or None for don't-care.
779
:param encoding: encoding for sys.stdout and sys.stderr
780
:param stdin: A string to be used as stdin for the command.
466
self.log('run bzr: %s', ' '.join(argv))
783
encoding = bzrlib.user_encoding
784
if stdin is not None:
785
stdin = StringIO(stdin)
786
stdout = StringIOWrapper()
787
stderr = StringIOWrapper()
788
stdout.encoding = encoding
789
stderr.encoding = encoding
791
self.log('run bzr: %r', argv)
467
792
# FIXME: don't call into logging here
468
793
handler = logging.StreamHandler(stderr)
469
handler.setFormatter(bzrlib.trace.QuietFormatter())
470
794
handler.setLevel(logging.INFO)
471
795
logger = logging.getLogger('')
472
796
logger.addHandler(handler)
797
old_ui_factory = bzrlib.ui.ui_factory
798
bzrlib.ui.ui_factory = bzrlib.tests.blackbox.TestUIFactory(
801
bzrlib.ui.ui_factory.stdin = stdin
474
result = self.apply_redirected(None, stdout, stderr,
803
result = self.apply_redirected(stdin, stdout, stderr,
475
804
bzrlib.commands.run_bzr_catch_errors,
478
807
logger.removeHandler(handler)
808
bzrlib.ui.ui_factory = old_ui_factory
479
810
out = stdout.getvalue()
480
811
err = stderr.getvalue()
482
self.log('output:\n%s', out)
813
self.log('output:\n%r', out)
484
self.log('errors:\n%s', err)
815
self.log('errors:\n%r', err)
485
816
if retcode is not None:
486
self.assertEquals(result, retcode)
817
self.assertEquals(retcode, result)
489
820
def run_bzr(self, *args, **kwargs):
496
827
This sends the stdout/stderr results into the test's log,
497
828
where it may be useful for debugging. See also run_captured.
830
:param stdin: A string to be used as stdin for the command.
499
832
retcode = kwargs.pop('retcode', 0)
500
return self.run_bzr_captured(args, retcode)
833
encoding = kwargs.pop('encoding', None)
834
stdin = kwargs.pop('stdin', None)
835
return self.run_bzr_captured(args, retcode=retcode, encoding=encoding, stdin=stdin)
837
def run_bzr_decode(self, *args, **kwargs):
838
if 'encoding' in kwargs:
839
encoding = kwargs['encoding']
841
encoding = bzrlib.user_encoding
842
return self.run_bzr(*args, **kwargs)[0].decode(encoding)
844
def run_bzr_error(self, error_regexes, *args, **kwargs):
845
"""Run bzr, and check that stderr contains the supplied regexes
847
:param error_regexes: Sequence of regular expressions which
848
must each be found in the error output. The relative ordering
850
:param args: command-line arguments for bzr
851
:param kwargs: Keyword arguments which are interpreted by run_bzr
852
This function changes the default value of retcode to be 3,
853
since in most cases this is run when you expect bzr to fail.
854
:return: (out, err) The actual output of running the command (in case you
855
want to do more inspection)
858
# Make sure that commit is failing because there is nothing to do
859
self.run_bzr_error(['no changes to commit'],
860
'commit', '-m', 'my commit comment')
861
# Make sure --strict is handling an unknown file, rather than
862
# giving us the 'nothing to do' error
863
self.build_tree(['unknown'])
864
self.run_bzr_error(['Commit refused because there are unknown files'],
865
'commit', '--strict', '-m', 'my commit comment')
867
kwargs.setdefault('retcode', 3)
868
out, err = self.run_bzr(*args, **kwargs)
869
for regex in error_regexes:
870
self.assertContainsRe(err, regex)
873
def run_bzr_subprocess(self, *args, **kwargs):
874
"""Run bzr in a subprocess for testing.
876
This starts a new Python interpreter and runs bzr in there.
877
This should only be used for tests that have a justifiable need for
878
this isolation: e.g. they are testing startup time, or signal
879
handling, or early startup code, etc. Subprocess code can't be
880
profiled or debugged so easily.
882
:param retcode: The status code that is expected. Defaults to 0. If
883
None is supplied, the status code is not checked.
884
:param env_changes: A dictionary which lists changes to environment
885
variables. A value of None will unset the env variable.
886
The values must be strings. The change will only occur in the
887
child, so you don't need to fix the environment after running.
888
:param universal_newlines: Convert CRLF => LF
890
env_changes = kwargs.get('env_changes', {})
891
process = self.start_bzr_subprocess(args, env_changes=env_changes)
892
# We distinguish between retcode=None and retcode not passed.
893
supplied_retcode = kwargs.get('retcode', 0)
894
return self.finish_bzr_subprocess(process, retcode=supplied_retcode,
895
universal_newlines=kwargs.get('universal_newlines', False),
898
def start_bzr_subprocess(self, process_args, env_changes=None,
899
skip_if_plan_to_signal=False):
900
"""Start bzr in a subprocess for testing.
902
This starts a new Python interpreter and runs bzr in there.
903
This should only be used for tests that have a justifiable need for
904
this isolation: e.g. they are testing startup time, or signal
905
handling, or early startup code, etc. Subprocess code can't be
906
profiled or debugged so easily.
908
:param process_args: a list of arguments to pass to the bzr executable,
909
for example `['--version']`.
910
:param env_changes: A dictionary which lists changes to environment
911
variables. A value of None will unset the env variable.
912
The values must be strings. The change will only occur in the
913
child, so you don't need to fix the environment after running.
914
:param skip_if_plan_to_signal: raise TestSkipped when true and os.kill
917
:returns: Popen object for the started process.
919
if skip_if_plan_to_signal:
920
if not getattr(os, 'kill', None):
921
raise TestSkipped("os.kill not available.")
923
if env_changes is None:
927
def cleanup_environment():
928
for env_var, value in env_changes.iteritems():
929
old_env[env_var] = osutils.set_or_unset_env(env_var, value)
931
def restore_environment():
932
for env_var, value in old_env.iteritems():
933
osutils.set_or_unset_env(env_var, value)
935
bzr_path = self.get_bzr_path()
938
# win32 subprocess doesn't support preexec_fn
939
# so we will avoid using it on all platforms, just to
940
# make sure the code path is used, and we don't break on win32
941
cleanup_environment()
942
process = Popen([sys.executable, bzr_path] + list(process_args),
943
stdin=PIPE, stdout=PIPE, stderr=PIPE)
945
restore_environment()
948
def get_bzr_path(self):
949
"""Return the path of the 'bzr' executable for this test suite."""
950
bzr_path = os.path.dirname(os.path.dirname(bzrlib.__file__))+'/bzr'
951
if not os.path.isfile(bzr_path):
952
# We are probably installed. Assume sys.argv is the right file
953
bzr_path = sys.argv[0]
956
def finish_bzr_subprocess(self, process, retcode=0, send_signal=None,
957
universal_newlines=False, process_args=None):
958
"""Finish the execution of process.
960
:param process: the Popen object returned from start_bzr_subprocess.
961
:param retcode: The status code that is expected. Defaults to 0. If
962
None is supplied, the status code is not checked.
963
:param send_signal: an optional signal to send to the process.
964
:param universal_newlines: Convert CRLF => LF
965
:returns: (stdout, stderr)
967
if send_signal is not None:
968
os.kill(process.pid, send_signal)
969
out, err = process.communicate()
971
if universal_newlines:
972
out = out.replace('\r\n', '\n')
973
err = err.replace('\r\n', '\n')
975
if retcode is not None and retcode != process.returncode:
976
if process_args is None:
977
process_args = "(unknown args)"
978
mutter('Output of bzr %s:\n%s', process_args, out)
979
mutter('Error for bzr %s:\n%s', process_args, err)
980
self.fail('Command bzr %s failed with retcode %s != %s'
981
% (process_args, retcode, process.returncode))
502
984
def check_inventory_shape(self, inv, shape):
503
985
"""Compare an inventory to a list of expected names.
793
1297
self.assertTrue(t.is_readonly())
796
def make_branch(self, relpath):
1300
def make_branch(self, relpath, format=None):
797
1301
"""Create a branch on the transport at relpath."""
798
repo = self.make_repository(relpath)
1302
repo = self.make_repository(relpath, format=format)
799
1303
return repo.bzrdir.create_branch()
801
def make_bzrdir(self, relpath):
1305
def make_bzrdir(self, relpath, format=None):
803
url = self.get_url(relpath)
804
segments = relpath.split('/')
805
if segments and segments[-1] not in ('', '.'):
806
parent = self.get_url('/'.join(segments[:-1]))
807
t = get_transport(parent)
1307
# might be a relative or absolute path
1308
maybe_a_url = self.get_url(relpath)
1309
segments = maybe_a_url.rsplit('/', 1)
1310
t = get_transport(maybe_a_url)
1311
if len(segments) > 1 and segments[-1] not in ('', '.'):
809
t.mkdir(segments[-1])
810
1314
except errors.FileExists:
812
return bzrlib.bzrdir.BzrDir.create(url)
1317
format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
1318
return format.initialize_on_transport(t)
813
1319
except errors.UninitializableFormat:
814
raise TestSkipped("Format %s is not initializable.")
1320
raise TestSkipped("Format %s is not initializable." % format)
816
def make_repository(self, relpath, shared=False):
1322
def make_repository(self, relpath, shared=False, format=None):
817
1323
"""Create a repository on our default transport at relpath."""
818
made_control = self.make_bzrdir(relpath)
1324
made_control = self.make_bzrdir(relpath, format=format)
819
1325
return made_control.create_repository(shared=shared)
821
def make_branch_and_tree(self, relpath):
1327
def make_branch_and_memory_tree(self, relpath):
1328
"""Create a branch on the default transport and a MemoryTree for it."""
1329
b = self.make_branch(relpath)
1330
return memorytree.MemoryTree.create_on_branch(b)
1332
def make_branch_and_tree(self, relpath, format=None):
822
1333
"""Create a branch on the transport and a tree locally.
1335
If the transport is not a LocalTransport, the Tree can't be created on
1336
the transport. In that case the working tree is created in the local
1337
directory, and the returned tree's branch and repository will also be
1340
This will fail if the original default transport for this test
1341
case wasn't backed by the working directory, as the branch won't
1342
be on disk for us to open it.
1344
:param format: The BzrDirFormat.
1345
:returns: the WorkingTree.
826
1347
# TODO: always use the local disk path for the working tree,
827
1348
# this obviously requires a format that supports branch references
828
1349
# so check for that by checking bzrdir.BzrDirFormat.get_default_format()
830
b = self.make_branch(relpath)
1351
b = self.make_branch(relpath, format=format)
832
1353
return b.bzrdir.create_workingtree()
833
1354
except errors.NotLocalUrl:
834
# new formats - catch No tree error and create
835
# a branch reference and a checkout.
836
# old formats at that point - raise TestSkipped.
838
return WorkingTreeFormat2().initialize(bzrdir.BzrDir.open(relpath))
1355
# We can only make working trees locally at the moment. If the
1356
# transport can't support them, then reopen the branch on a local
1357
# transport, and create the working tree there.
1359
# Possibly we should instead keep
1360
# the non-disk-backed branch and create a local checkout?
1361
bd = bzrdir.BzrDir.open(relpath)
1362
return bd.create_workingtree()
840
1364
def assertIsDirectory(self, relpath, transport):
841
1365
"""Assert that relpath within transport is a directory.
883
1407
def run_suite(suite, name='test', verbose=False, pattern=".*",
884
1408
stop_on_failure=False, keep_output=False,
1409
transport=None, lsprof_timed=None, bench_history=None):
886
1410
TestCaseInTempDir._TEST_NAME = name
1411
TestCase._gather_lsprof_in_benchmarks = lsprof_timed
1417
pb = progress.ProgressBar()
891
1418
runner = TextTestRunner(stream=sys.stdout,
1420
verbosity=verbosity,
1421
keep_output=keep_output,
1423
bench_history=bench_history)
894
1424
runner.stop_on_failure=stop_on_failure
895
1425
if pattern != '.*':
896
1426
suite = filter_suite_by_re(suite, pattern)
897
1427
result = runner.run(suite)
898
# This is still a little bogus,
899
# but only a little. Folk not using our testrunner will
900
# have to delete their temp directories themselves.
901
test_root = TestCaseInTempDir.TEST_ROOT
902
if result.wasSuccessful() or not keep_output:
903
if test_root is not None:
904
print 'Deleting test root %s...' % test_root
906
shutil.rmtree(test_root)
910
print "Failed tests working directories are in '%s'\n" % TestCaseInTempDir.TEST_ROOT
911
1428
return result.wasSuccessful()
914
1431
def selftest(verbose=False, pattern=".*", stop_on_failure=True,
915
1432
keep_output=False,
1434
test_suite_factory=None,
1436
bench_history=None):
917
1437
"""Run the whole test suite under the enhanced runner"""
1438
# XXX: Very ugly way to do this...
1439
# Disable warning about old formats because we don't want it to disturb
1440
# any blackbox tests.
1441
from bzrlib import repository
1442
repository._deprecation_warning_done = True
918
1444
global default_transport
919
1445
if transport is None:
920
1446
transport = default_transport
921
1447
old_transport = default_transport
922
1448
default_transport = transport
1450
if test_suite_factory is None:
1451
suite = test_suite()
1453
suite = test_suite_factory()
925
1454
return run_suite(suite, 'testbzr', verbose=verbose, pattern=pattern,
926
1455
stop_on_failure=stop_on_failure, keep_output=keep_output,
1456
transport=transport,
1457
lsprof_timed=lsprof_timed,
1458
bench_history=bench_history)
929
1460
default_transport = old_transport
933
1463
def test_suite():
934
"""Build and return TestSuite for the whole program."""
935
from doctest import DocTestSuite
937
global MODULES_TO_DOCTEST
1464
"""Build and return TestSuite for the whole of bzrlib.
1466
This function can be replaced if you need to change the default test
1467
suite on a global basis, but it is not encouraged.
940
1470
'bzrlib.tests.test_ancestry',
941
'bzrlib.tests.test_annotate',
942
1471
'bzrlib.tests.test_api',
1472
'bzrlib.tests.test_atomicfile',
943
1473
'bzrlib.tests.test_bad_files',
944
'bzrlib.tests.test_basis_inventory',
945
1474
'bzrlib.tests.test_branch',
1475
'bzrlib.tests.test_bundle',
946
1476
'bzrlib.tests.test_bzrdir',
1477
'bzrlib.tests.test_cache_utf8',
947
1478
'bzrlib.tests.test_command',
948
1479
'bzrlib.tests.test_commit',
949
1480
'bzrlib.tests.test_commit_merge',
973
1509
'bzrlib.tests.test_nonascii',
974
1510
'bzrlib.tests.test_options',
975
1511
'bzrlib.tests.test_osutils',
1512
'bzrlib.tests.test_patch',
1513
'bzrlib.tests.test_patches',
976
1514
'bzrlib.tests.test_permissions',
977
1515
'bzrlib.tests.test_plugins',
978
1516
'bzrlib.tests.test_progress',
979
1517
'bzrlib.tests.test_reconcile',
980
1518
'bzrlib.tests.test_repository',
1519
'bzrlib.tests.test_revert',
981
1520
'bzrlib.tests.test_revision',
982
1521
'bzrlib.tests.test_revisionnamespaces',
983
'bzrlib.tests.test_revprops',
1522
'bzrlib.tests.test_revisiontree',
984
1523
'bzrlib.tests.test_rio',
985
1524
'bzrlib.tests.test_sampler',
986
1525
'bzrlib.tests.test_selftest',
987
1526
'bzrlib.tests.test_setup',
988
1527
'bzrlib.tests.test_sftp_transport',
989
1528
'bzrlib.tests.test_smart_add',
1529
'bzrlib.tests.test_smart_transport',
990
1530
'bzrlib.tests.test_source',
1531
'bzrlib.tests.test_status',
991
1532
'bzrlib.tests.test_store',
992
1533
'bzrlib.tests.test_symbol_versioning',
993
1534
'bzrlib.tests.test_testament',
1535
'bzrlib.tests.test_textfile',
1536
'bzrlib.tests.test_textmerge',
994
1537
'bzrlib.tests.test_trace',
995
1538
'bzrlib.tests.test_transactions',
996
1539
'bzrlib.tests.test_transform',
997
1540
'bzrlib.tests.test_transport',
1541
'bzrlib.tests.test_tree',
1542
'bzrlib.tests.test_treebuilder',
998
1543
'bzrlib.tests.test_tsort',
1544
'bzrlib.tests.test_tuned_gzip',
999
1545
'bzrlib.tests.test_ui',
1000
1546
'bzrlib.tests.test_upgrade',
1547
'bzrlib.tests.test_urlutils',
1001
1548
'bzrlib.tests.test_versionedfile',
1549
'bzrlib.tests.test_version',
1002
1550
'bzrlib.tests.test_weave',
1003
1551
'bzrlib.tests.test_whitebox',
1004
1552
'bzrlib.tests.test_workingtree',
1005
1553
'bzrlib.tests.test_xml',
1007
1555
test_transport_implementations = [
1008
'bzrlib.tests.test_transport_implementations']
1010
TestCase.BZRPATH = osutils.pathjoin(
1011
osutils.realpath(osutils.dirname(bzrlib.__path__[0])), 'bzr')
1012
print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
1013
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
1016
# python2.4's TestLoader.loadTestsFromNames gives very poor
1017
# errors if it fails to load a named module - no indication of what's
1018
# actually wrong, just "no such module". We should probably override that
1019
# class, but for the moment just load them ourselves. (mbp 20051202)
1020
loader = TestLoader()
1556
'bzrlib.tests.test_transport_implementations',
1557
'bzrlib.tests.test_read_bundle',
1559
suite = TestUtil.TestSuite()
1560
loader = TestUtil.TestLoader()
1561
suite.addTest(loader.loadTestsFromModuleNames(testmod_names))
1021
1562
from bzrlib.transport import TransportTestProviderAdapter
1022
1563
adapter = TransportTestProviderAdapter()
1023
1564
adapt_modules(test_transport_implementations, adapter, loader, suite)
1024
for mod_name in testmod_names:
1025
mod = _load_module_by_name(mod_name)
1026
suite.addTest(loader.loadTestsFromModule(mod))
1027
1565
for package in packages_to_test():
1028
1566
suite.addTest(package.test_suite())
1029
1567
for m in MODULES_TO_TEST:
1030
1568
suite.addTest(loader.loadTestsFromModule(m))
1031
for m in (MODULES_TO_DOCTEST):
1032
suite.addTest(DocTestSuite(m))
1569
for m in MODULES_TO_DOCTEST:
1570
suite.addTest(doctest.DocTestSuite(m))
1033
1571
for name, plugin in bzrlib.plugin.all_plugins().items():
1034
1572
if getattr(plugin, 'test_suite', None) is not None:
1035
1573
suite.addTest(plugin.test_suite())
added
removed
bzrlib/tests/__init__.py
