114
140
Shows output in a different format, including displaying runtime for tests.
116
142
stop_early = False
118
def _elapsedTime(self):
119
return "%5dms" % (1000 * (time.time() - self._start_time))
144
def __init__(self, stream, descriptions, verbosity, pb=None,
146
"""Construct new TestResult.
148
:param bench_history: Optionally, a writable file object to accumulate
151
unittest._TextTestResult.__init__(self, stream, descriptions, verbosity)
153
if bench_history is not None:
154
from bzrlib.version import _get_bzr_source_tree
155
src_tree = _get_bzr_source_tree()
158
revision_id = src_tree.get_parent_ids()[0]
160
# XXX: if this is a brand new tree, do the same as if there
164
# XXX: If there's no branch, what should we do?
166
bench_history.write("--date %s %s\n" % (time.time(), revision_id))
167
self._bench_history = bench_history
169
def extractBenchmarkTime(self, testCase):
170
"""Add a benchmark time for the current test case."""
171
self._benchmarkTime = getattr(testCase, "_benchtime", None)
173
def _elapsedTestTimeString(self):
174
"""Return a time string for the overall time the current test has taken."""
175
return self._formatTime(time.time() - self._start_time)
177
def _testTimeString(self):
178
if self._benchmarkTime is not None:
180
self._formatTime(self._benchmarkTime),
181
self._elapsedTestTimeString())
183
return " %s" % self._elapsedTestTimeString()
185
def _formatTime(self, seconds):
186
"""Format seconds as milliseconds with leading spaces."""
187
return "%5dms" % (1000 * seconds)
189
def _ellipsise_unimportant_words(self, a_string, final_width,
191
"""Add ellipses (sp?) for overly long strings.
193
:param keep_start: If true preserve the start of a_string rather
197
if len(a_string) > final_width:
198
result = a_string[:final_width-3] + '...'
202
if len(a_string) > final_width:
203
result = '...' + a_string[3-final_width:]
206
return result.ljust(final_width)
121
208
def startTest(self, test):
122
209
unittest.TestResult.startTest(self, test)
124
211
# the beginning, but in an id, the important words are
126
213
SHOW_DESCRIPTIONS = False
215
if not self.showAll and self.dots and self.pb is not None:
218
final_width = osutils.terminal_width()
219
final_width = final_width - 15 - 8
221
if SHOW_DESCRIPTIONS:
222
what = test.shortDescription()
224
what = self._ellipsise_unimportant_words(what, final_width, keep_start=True)
227
if what.startswith('bzrlib.tests.'):
229
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
231
self.stream.write(what)
232
elif self.dots and self.pb is not None:
233
self.pb.update(what, self.testsRun - 1, None)
144
234
self.stream.flush()
235
self._recordTestStartTime()
237
def _recordTestStartTime(self):
238
"""Record that a test has started."""
145
239
self._start_time = time.time()
147
241
def addError(self, test, err):
148
242
if isinstance(err[1], TestSkipped):
149
243
return self.addSkipped(test, err)
150
244
unittest.TestResult.addError(self, test, err)
245
# We can only do this if we have one of our TestCases, not if
247
setKeepLogfile = getattr(test, 'setKeepLogfile', None)
248
if setKeepLogfile is not None:
250
self.extractBenchmarkTime(test)
152
self.stream.writeln("ERROR %s" % self._elapsedTime())
252
self.stream.writeln("ERROR %s" % self._testTimeString())
253
elif self.dots and self.pb is None:
154
254
self.stream.write('E')
256
self.pb.update(self._ellipsise_unimportant_words('ERROR', 13), self.testsRun, None)
257
self.pb.note(self._ellipsise_unimportant_words(
258
test.id() + ': ERROR',
259
osutils.terminal_width()))
155
260
self.stream.flush()
156
261
if self.stop_early:
159
264
def addFailure(self, test, err):
160
265
unittest.TestResult.addFailure(self, test, err)
266
# We can only do this if we have one of our TestCases, not if
268
setKeepLogfile = getattr(test, 'setKeepLogfile', None)
269
if setKeepLogfile is not None:
271
self.extractBenchmarkTime(test)
162
self.stream.writeln(" FAIL %s" % self._elapsedTime())
273
self.stream.writeln(" FAIL %s" % self._testTimeString())
274
elif self.dots and self.pb is None:
164
275
self.stream.write('F')
277
self.pb.update(self._ellipsise_unimportant_words('FAIL', 13), self.testsRun, None)
278
self.pb.note(self._ellipsise_unimportant_words(
279
test.id() + ': FAIL',
280
osutils.terminal_width()))
165
281
self.stream.flush()
166
282
if self.stop_early:
169
285
def addSuccess(self, test):
286
self.extractBenchmarkTime(test)
287
if self._bench_history is not None:
288
if self._benchmarkTime is not None:
289
self._bench_history.write("%s %s\n" % (
290
self._formatTime(self._benchmarkTime),
171
self.stream.writeln(' OK %s' % self._elapsedTime())
293
self.stream.writeln(' OK %s' % self._testTimeString())
294
for bench_called, stats in getattr(test, '_benchcalls', []):
295
self.stream.writeln('LSProf output for %s(%s, %s)' % bench_called)
296
stats.pprint(file=self.stream)
297
elif self.dots and self.pb is None:
173
298
self.stream.write('~')
300
self.pb.update(self._ellipsise_unimportant_words('OK', 13), self.testsRun, None)
174
301
self.stream.flush()
175
302
unittest.TestResult.addSuccess(self, test)
177
304
def addSkipped(self, test, skip_excinfo):
305
self.extractBenchmarkTime(test)
179
print >>self.stream, ' SKIP %s' % self._elapsedTime()
307
print >>self.stream, ' SKIP %s' % self._testTimeString()
180
308
print >>self.stream, ' %s' % skip_excinfo[1]
309
elif self.dots and self.pb is None:
182
310
self.stream.write('S')
312
self.pb.update(self._ellipsise_unimportant_words('SKIP', 13), self.testsRun, None)
183
313
self.stream.flush()
184
314
# seems best to treat this as success from point-of-view of unittest
185
315
# -- it actually does nothing so it barely matters :)
186
unittest.TestResult.addSuccess(self, test)
318
except KeyboardInterrupt:
321
self.addError(test, test.__exc_info())
323
unittest.TestResult.addSuccess(self, test)
188
325
def printErrorList(self, flavour, errors):
189
326
for test, err in errors:
200
337
self.stream.writeln("%s" % err)
203
class TextTestRunner(unittest.TextTestRunner):
340
class TextTestRunner(object):
204
341
stop_on_failure = False
350
self.stream = unittest._WritelnDecorator(stream)
351
self.descriptions = descriptions
352
self.verbosity = verbosity
353
self.keep_output = keep_output
355
self._bench_history = bench_history
206
357
def _makeResult(self):
207
result = _MyResult(self.stream, self.descriptions, self.verbosity)
358
result = _MyResult(self.stream,
362
bench_history=self._bench_history)
208
363
result.stop_early = self.stop_on_failure
367
"Run the given test case or test suite."
368
result = self._makeResult()
369
startTime = time.time()
370
if self.pb is not None:
371
self.pb.update('Running tests', 0, test.countTestCases())
373
stopTime = time.time()
374
timeTaken = stopTime - startTime
376
self.stream.writeln(result.separator2)
377
run = result.testsRun
378
self.stream.writeln("Ran %d test%s in %.3fs" %
379
(run, run != 1 and "s" or "", timeTaken))
380
self.stream.writeln()
381
if not result.wasSuccessful():
382
self.stream.write("FAILED (")
383
failed, errored = map(len, (result.failures, result.errors))
385
self.stream.write("failures=%d" % failed)
387
if failed: self.stream.write(", ")
388
self.stream.write("errors=%d" % errored)
389
self.stream.writeln(")")
391
self.stream.writeln("OK")
392
if self.pb is not None:
393
self.pb.update('Cleaning up', 0, 1)
394
# This is still a little bogus,
395
# but only a little. Folk not using our testrunner will
396
# have to delete their temp directories themselves.
397
test_root = TestCaseInTempDir.TEST_ROOT
398
if result.wasSuccessful() or not self.keep_output:
399
if test_root is not None:
400
# If LANG=C we probably have created some bogus paths
401
# which rmtree(unicode) will fail to delete
402
# so make sure we are using rmtree(str) to delete everything
403
# except on win32, where rmtree(str) will fail
404
# since it doesn't have the property of byte-stream paths
405
# (they are either ascii or mbcs)
406
if sys.platform == 'win32':
407
# make sure we are using the unicode win32 api
408
test_root = unicode(test_root)
410
test_root = test_root.encode(
411
sys.getfilesystemencoding())
412
osutils.rmtree(test_root)
414
if self.pb is not None:
415
self.pb.note("Failed tests working directories are in '%s'\n",
419
"Failed tests working directories are in '%s'\n" %
421
TestCaseInTempDir.TEST_ROOT = None
422
if self.pb is not None:
212
427
def iter_suite_tests(suite):
213
428
"""Return all tests in a suite, recursing through nested suites"""
341
593
def assertIsInstance(self, obj, kls):
342
594
"""Fail if obj is not an instance of kls"""
343
595
if not isinstance(obj, kls):
344
self.fail("%r is not an instance of %s" % (obj, kls))
596
self.fail("%r is an instance of %s rather than %s" % (
597
obj, obj.__class__, kls))
599
def _capture_warnings(self, a_callable, *args, **kwargs):
600
"""A helper for callDeprecated and applyDeprecated.
602
:param a_callable: A callable to call.
603
:param args: The positional arguments for the callable
604
:param kwargs: The keyword arguments for the callable
605
:return: A tuple (warnings, result). result is the result of calling
606
a_callable(*args, **kwargs).
609
def capture_warnings(msg, cls, stacklevel=None):
610
# we've hooked into a deprecation specific callpath,
611
# only deprecations should getting sent via it.
612
self.assertEqual(cls, DeprecationWarning)
613
local_warnings.append(msg)
614
original_warning_method = symbol_versioning.warn
615
symbol_versioning.set_warning_method(capture_warnings)
617
result = a_callable(*args, **kwargs)
619
symbol_versioning.set_warning_method(original_warning_method)
620
return (local_warnings, result)
622
def applyDeprecated(self, deprecation_format, a_callable, *args, **kwargs):
623
"""Call a deprecated callable without warning the user.
625
:param deprecation_format: The deprecation format that the callable
626
should have been deprecated with. This is the same type as the
627
parameter to deprecated_method/deprecated_function. If the
628
callable is not deprecated with this format, an assertion error
630
:param a_callable: A callable to call. This may be a bound method or
631
a regular function. It will be called with *args and **kwargs.
632
:param args: The positional arguments for the callable
633
:param kwargs: The keyword arguments for the callable
634
:return: The result of a_callable(*args, **kwargs)
636
call_warnings, result = self._capture_warnings(a_callable,
638
expected_first_warning = symbol_versioning.deprecation_string(
639
a_callable, deprecation_format)
640
if len(call_warnings) == 0:
641
self.fail("No assertion generated by call to %s" %
643
self.assertEqual(expected_first_warning, call_warnings[0])
646
def callDeprecated(self, expected, callable, *args, **kwargs):
647
"""Assert that a callable is deprecated in a particular way.
649
This is a very precise test for unusual requirements. The
650
applyDeprecated helper function is probably more suited for most tests
651
as it allows you to simply specify the deprecation format being used
652
and will ensure that that is issued for the function being called.
654
:param expected: a list of the deprecation warnings expected, in order
655
:param callable: The callable to call
656
:param args: The positional arguments for the callable
657
:param kwargs: The keyword arguments for the callable
659
call_warnings, result = self._capture_warnings(callable,
661
self.assertEqual(expected, call_warnings)
346
664
def _startLogFile(self):
347
665
"""Send bzr and test log messages to a temporary file.
381
704
def _cleanEnvironment(self):
706
'BZR_HOME': None, # Don't inherit BZR_HOME to all the tests.
383
707
'HOME': os.getcwd(),
384
708
'APPDATA': os.getcwd(),
710
'BZREMAIL': None, # may still be present in the environment
712
'BZR_PROGRESS_BAR': None,
388
714
self.__old_env = {}
389
715
self.addCleanup(self._restoreEnvironment)
390
716
for name, value in new_env.iteritems():
391
717
self._captureVar(name, value)
394
719
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
720
"""Set an environment variable, and reset it when finished."""
721
self.__old_env[name] = osutils.set_or_unset_env(name, newvalue)
411
723
def _restoreEnvironment(self):
412
724
for name, value in self.__old_env.iteritems():
413
self._restoreVar(name, value)
725
osutils.set_or_unset_env(name, value)
415
727
def tearDown(self):
416
728
self._runCleanups()
417
729
unittest.TestCase.tearDown(self)
731
def time(self, callable, *args, **kwargs):
732
"""Run callable and accrue the time it takes to the benchmark time.
734
If lsprofiling is enabled (i.e. by --lsprof-time to bzr selftest) then
735
this will cause lsprofile statistics to be gathered and stored in
738
if self._benchtime is None:
742
if not self._gather_lsprof_in_benchmarks:
743
return callable(*args, **kwargs)
745
# record this benchmark
746
ret, stats = bzrlib.lsprof.profile(callable, *args, **kwargs)
748
self._benchcalls.append(((callable, args, kwargs), stats))
751
self._benchtime += time.time() - start
419
753
def _runCleanups(self):
420
754
"""Run registered cleanup functions.
429
763
def log(self, *args):
433
"""Return as a string the log for this test"""
434
if self._log_file_name:
435
return open(self._log_file_name).read()
766
def _get_log(self, keep_log_file=False):
767
"""Return as a string the log for this test. If the file is still
768
on disk and keep_log_file=False, delete the log file and store the
769
content in self._log_contents."""
770
# flush the log file, to get all content
772
bzrlib.trace._trace_file.flush()
773
if self._log_contents:
437
774
return self._log_contents
438
# TODO: Delete the log after it's been read in
775
if self._log_file_name is not None:
776
logfile = open(self._log_file_name)
778
log_contents = logfile.read()
781
if not keep_log_file:
782
self._log_contents = log_contents
783
os.remove(self._log_file_name)
786
return "DELETED log file to reduce memory footprint"
440
788
def capture(self, cmd, retcode=0):
441
789
"""Shortcut that splits cmd into words, runs, and returns stdout"""
442
790
return self.run_bzr_captured(cmd.split(), retcode=retcode)[0]
444
def run_bzr_captured(self, argv, retcode=0):
792
def run_bzr_captured(self, argv, retcode=0, encoding=None, stdin=None,
445
794
"""Invoke bzr and return (stdout, stderr).
447
796
Useful for code that wants to check the contents of the
458
807
errors, and with logging set to something approximating the
459
808
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.
810
:param argv: arguments to invoke bzr
811
:param retcode: expected return code, or None for don't-care.
812
:param encoding: encoding for sys.stdout and sys.stderr
813
:param stdin: A string to be used as stdin for the command.
814
:param working_dir: Change to this directory before running
466
self.log('run bzr: %s', ' '.join(argv))
817
encoding = bzrlib.user_encoding
818
if stdin is not None:
819
stdin = StringIO(stdin)
820
stdout = StringIOWrapper()
821
stderr = StringIOWrapper()
822
stdout.encoding = encoding
823
stderr.encoding = encoding
825
self.log('run bzr: %r', argv)
467
826
# FIXME: don't call into logging here
468
827
handler = logging.StreamHandler(stderr)
469
handler.setFormatter(bzrlib.trace.QuietFormatter())
470
828
handler.setLevel(logging.INFO)
471
829
logger = logging.getLogger('')
472
830
logger.addHandler(handler)
831
old_ui_factory = bzrlib.ui.ui_factory
832
bzrlib.ui.ui_factory = bzrlib.tests.blackbox.TestUIFactory(
835
bzrlib.ui.ui_factory.stdin = stdin
838
if working_dir is not None:
839
cwd = osutils.getcwd()
840
os.chdir(working_dir)
474
result = self.apply_redirected(None, stdout, stderr,
843
result = self.apply_redirected(stdin, stdout, stderr,
475
844
bzrlib.commands.run_bzr_catch_errors,
478
847
logger.removeHandler(handler)
848
bzrlib.ui.ui_factory = old_ui_factory
479
852
out = stdout.getvalue()
480
853
err = stderr.getvalue()
482
self.log('output:\n%s', out)
855
self.log('output:\n%r', out)
484
self.log('errors:\n%s', err)
857
self.log('errors:\n%r', err)
485
858
if retcode is not None:
486
self.assertEquals(result, retcode)
859
self.assertEquals(retcode, result)
489
862
def run_bzr(self, *args, **kwargs):
496
869
This sends the stdout/stderr results into the test's log,
497
870
where it may be useful for debugging. See also run_captured.
872
:param stdin: A string to be used as stdin for the command.
499
874
retcode = kwargs.pop('retcode', 0)
500
return self.run_bzr_captured(args, retcode)
875
encoding = kwargs.pop('encoding', None)
876
stdin = kwargs.pop('stdin', None)
877
working_dir = kwargs.pop('working_dir', None)
878
return self.run_bzr_captured(args, retcode=retcode, encoding=encoding,
879
stdin=stdin, working_dir=working_dir)
881
def run_bzr_decode(self, *args, **kwargs):
882
if 'encoding' in kwargs:
883
encoding = kwargs['encoding']
885
encoding = bzrlib.user_encoding
886
return self.run_bzr(*args, **kwargs)[0].decode(encoding)
888
def run_bzr_error(self, error_regexes, *args, **kwargs):
889
"""Run bzr, and check that stderr contains the supplied regexes
891
:param error_regexes: Sequence of regular expressions which
892
must each be found in the error output. The relative ordering
894
:param args: command-line arguments for bzr
895
:param kwargs: Keyword arguments which are interpreted by run_bzr
896
This function changes the default value of retcode to be 3,
897
since in most cases this is run when you expect bzr to fail.
898
:return: (out, err) The actual output of running the command (in case you
899
want to do more inspection)
902
# Make sure that commit is failing because there is nothing to do
903
self.run_bzr_error(['no changes to commit'],
904
'commit', '-m', 'my commit comment')
905
# Make sure --strict is handling an unknown file, rather than
906
# giving us the 'nothing to do' error
907
self.build_tree(['unknown'])
908
self.run_bzr_error(['Commit refused because there are unknown files'],
909
'commit', '--strict', '-m', 'my commit comment')
911
kwargs.setdefault('retcode', 3)
912
out, err = self.run_bzr(*args, **kwargs)
913
for regex in error_regexes:
914
self.assertContainsRe(err, regex)
917
def run_bzr_subprocess(self, *args, **kwargs):
918
"""Run bzr in a subprocess for testing.
920
This starts a new Python interpreter and runs bzr in there.
921
This should only be used for tests that have a justifiable need for
922
this isolation: e.g. they are testing startup time, or signal
923
handling, or early startup code, etc. Subprocess code can't be
924
profiled or debugged so easily.
926
:param retcode: The status code that is expected. Defaults to 0. If
927
None is supplied, the status code is not checked.
928
:param env_changes: A dictionary which lists changes to environment
929
variables. A value of None will unset the env variable.
930
The values must be strings. The change will only occur in the
931
child, so you don't need to fix the environment after running.
932
:param universal_newlines: Convert CRLF => LF
934
env_changes = kwargs.get('env_changes', {})
935
working_dir = kwargs.get('working_dir', None)
936
process = self.start_bzr_subprocess(args, env_changes=env_changes,
937
working_dir=working_dir)
938
# We distinguish between retcode=None and retcode not passed.
939
supplied_retcode = kwargs.get('retcode', 0)
940
return self.finish_bzr_subprocess(process, retcode=supplied_retcode,
941
universal_newlines=kwargs.get('universal_newlines', False),
944
def start_bzr_subprocess(self, process_args, env_changes=None,
945
skip_if_plan_to_signal=False,
947
"""Start bzr in a subprocess for testing.
949
This starts a new Python interpreter and runs bzr in there.
950
This should only be used for tests that have a justifiable need for
951
this isolation: e.g. they are testing startup time, or signal
952
handling, or early startup code, etc. Subprocess code can't be
953
profiled or debugged so easily.
955
:param process_args: a list of arguments to pass to the bzr executable,
956
for example `['--version']`.
957
:param env_changes: A dictionary which lists changes to environment
958
variables. A value of None will unset the env variable.
959
The values must be strings. The change will only occur in the
960
child, so you don't need to fix the environment after running.
961
:param skip_if_plan_to_signal: raise TestSkipped when true and os.kill
964
:returns: Popen object for the started process.
966
if skip_if_plan_to_signal:
967
if not getattr(os, 'kill', None):
968
raise TestSkipped("os.kill not available.")
970
if env_changes is None:
974
def cleanup_environment():
975
for env_var, value in env_changes.iteritems():
976
old_env[env_var] = osutils.set_or_unset_env(env_var, value)
978
def restore_environment():
979
for env_var, value in old_env.iteritems():
980
osutils.set_or_unset_env(env_var, value)
982
bzr_path = self.get_bzr_path()
985
if working_dir is not None:
986
cwd = osutils.getcwd()
987
os.chdir(working_dir)
990
# win32 subprocess doesn't support preexec_fn
991
# so we will avoid using it on all platforms, just to
992
# make sure the code path is used, and we don't break on win32
993
cleanup_environment()
994
process = Popen([sys.executable, bzr_path] + list(process_args),
995
stdin=PIPE, stdout=PIPE, stderr=PIPE)
997
restore_environment()
1003
def get_bzr_path(self):
1004
"""Return the path of the 'bzr' executable for this test suite."""
1005
bzr_path = os.path.dirname(os.path.dirname(bzrlib.__file__))+'/bzr'
1006
if not os.path.isfile(bzr_path):
1007
# We are probably installed. Assume sys.argv is the right file
1008
bzr_path = sys.argv[0]
1011
def finish_bzr_subprocess(self, process, retcode=0, send_signal=None,
1012
universal_newlines=False, process_args=None):
1013
"""Finish the execution of process.
1015
:param process: the Popen object returned from start_bzr_subprocess.
1016
:param retcode: The status code that is expected. Defaults to 0. If
1017
None is supplied, the status code is not checked.
1018
:param send_signal: an optional signal to send to the process.
1019
:param universal_newlines: Convert CRLF => LF
1020
:returns: (stdout, stderr)
1022
if send_signal is not None:
1023
os.kill(process.pid, send_signal)
1024
out, err = process.communicate()
1026
if universal_newlines:
1027
out = out.replace('\r\n', '\n')
1028
err = err.replace('\r\n', '\n')
1030
if retcode is not None and retcode != process.returncode:
1031
if process_args is None:
1032
process_args = "(unknown args)"
1033
mutter('Output of bzr %s:\n%s', process_args, out)
1034
mutter('Error for bzr %s:\n%s', process_args, err)
1035
self.fail('Command bzr %s failed with retcode %s != %s'
1036
% (process_args, retcode, process.returncode))
502
1039
def check_inventory_shape(self, inv, shape):
503
1040
"""Compare an inventory to a list of expected names.
793
1352
self.assertTrue(t.is_readonly())
796
def make_branch(self, relpath):
1355
def make_branch(self, relpath, format=None):
797
1356
"""Create a branch on the transport at relpath."""
798
repo = self.make_repository(relpath)
1357
repo = self.make_repository(relpath, format=format)
799
1358
return repo.bzrdir.create_branch()
801
def make_bzrdir(self, relpath):
1360
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)
1362
# might be a relative or absolute path
1363
maybe_a_url = self.get_url(relpath)
1364
segments = maybe_a_url.rsplit('/', 1)
1365
t = get_transport(maybe_a_url)
1366
if len(segments) > 1 and segments[-1] not in ('', '.'):
809
t.mkdir(segments[-1])
810
1369
except errors.FileExists:
812
return bzrlib.bzrdir.BzrDir.create(url)
1372
format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
1373
return format.initialize_on_transport(t)
813
1374
except errors.UninitializableFormat:
814
raise TestSkipped("Format %s is not initializable.")
1375
raise TestSkipped("Format %s is not initializable." % format)
816
def make_repository(self, relpath, shared=False):
1377
def make_repository(self, relpath, shared=False, format=None):
817
1378
"""Create a repository on our default transport at relpath."""
818
made_control = self.make_bzrdir(relpath)
1379
made_control = self.make_bzrdir(relpath, format=format)
819
1380
return made_control.create_repository(shared=shared)
821
def make_branch_and_tree(self, relpath):
1382
def make_branch_and_memory_tree(self, relpath):
1383
"""Create a branch on the default transport and a MemoryTree for it."""
1384
b = self.make_branch(relpath)
1385
return memorytree.MemoryTree.create_on_branch(b)
1387
def make_branch_and_tree(self, relpath, format=None):
822
1388
"""Create a branch on the transport and a tree locally.
1390
If the transport is not a LocalTransport, the Tree can't be created on
1391
the transport. In that case the working tree is created in the local
1392
directory, and the returned tree's branch and repository will also be
1395
This will fail if the original default transport for this test
1396
case wasn't backed by the working directory, as the branch won't
1397
be on disk for us to open it.
1399
:param format: The BzrDirFormat.
1400
:returns: the WorkingTree.
826
1402
# TODO: always use the local disk path for the working tree,
827
1403
# this obviously requires a format that supports branch references
828
1404
# so check for that by checking bzrdir.BzrDirFormat.get_default_format()
830
b = self.make_branch(relpath)
1406
b = self.make_branch(relpath, format=format)
832
1408
return b.bzrdir.create_workingtree()
833
1409
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))
1410
# We can only make working trees locally at the moment. If the
1411
# transport can't support them, then reopen the branch on a local
1412
# transport, and create the working tree there.
1414
# Possibly we should instead keep
1415
# the non-disk-backed branch and create a local checkout?
1416
bd = bzrdir.BzrDir.open(relpath)
1417
return bd.create_workingtree()
840
1419
def assertIsDirectory(self, relpath, transport):
841
1420
"""Assert that relpath within transport is a directory.
883
1462
def run_suite(suite, name='test', verbose=False, pattern=".*",
884
1463
stop_on_failure=False, keep_output=False,
1464
transport=None, lsprof_timed=None, bench_history=None):
886
1465
TestCaseInTempDir._TEST_NAME = name
1466
TestCase._gather_lsprof_in_benchmarks = lsprof_timed
1472
pb = progress.ProgressBar()
891
1473
runner = TextTestRunner(stream=sys.stdout,
1475
verbosity=verbosity,
1476
keep_output=keep_output,
1478
bench_history=bench_history)
894
1479
runner.stop_on_failure=stop_on_failure
895
1480
if pattern != '.*':
896
1481
suite = filter_suite_by_re(suite, pattern)
897
1482
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
1483
return result.wasSuccessful()
914
1486
def selftest(verbose=False, pattern=".*", stop_on_failure=True,
915
1487
keep_output=False,
1489
test_suite_factory=None,
1491
bench_history=None):
917
1492
"""Run the whole test suite under the enhanced runner"""
1493
# XXX: Very ugly way to do this...
1494
# Disable warning about old formats because we don't want it to disturb
1495
# any blackbox tests.
1496
from bzrlib import repository
1497
repository._deprecation_warning_done = True
918
1499
global default_transport
919
1500
if transport is None:
920
1501
transport = default_transport
921
1502
old_transport = default_transport
922
1503
default_transport = transport
1505
if test_suite_factory is None:
1506
suite = test_suite()
1508
suite = test_suite_factory()
925
1509
return run_suite(suite, 'testbzr', verbose=verbose, pattern=pattern,
926
1510
stop_on_failure=stop_on_failure, keep_output=keep_output,
1511
transport=transport,
1512
lsprof_timed=lsprof_timed,
1513
bench_history=bench_history)
929
1515
default_transport = old_transport
933
1518
def test_suite():
934
"""Build and return TestSuite for the whole program."""
935
from doctest import DocTestSuite
937
global MODULES_TO_DOCTEST
1519
"""Build and return TestSuite for the whole of bzrlib.
1521
This function can be replaced if you need to change the default test
1522
suite on a global basis, but it is not encouraged.
940
1525
'bzrlib.tests.test_ancestry',
941
'bzrlib.tests.test_annotate',
942
1526
'bzrlib.tests.test_api',
1527
'bzrlib.tests.test_atomicfile',
943
1528
'bzrlib.tests.test_bad_files',
944
'bzrlib.tests.test_basis_inventory',
945
1529
'bzrlib.tests.test_branch',
1530
'bzrlib.tests.test_bundle',
946
1531
'bzrlib.tests.test_bzrdir',
1532
'bzrlib.tests.test_cache_utf8',
947
1533
'bzrlib.tests.test_command',
948
1534
'bzrlib.tests.test_commit',
949
1535
'bzrlib.tests.test_commit_merge',
973
1564
'bzrlib.tests.test_nonascii',
974
1565
'bzrlib.tests.test_options',
975
1566
'bzrlib.tests.test_osutils',
1567
'bzrlib.tests.test_patch',
1568
'bzrlib.tests.test_patches',
976
1569
'bzrlib.tests.test_permissions',
977
1570
'bzrlib.tests.test_plugins',
978
1571
'bzrlib.tests.test_progress',
979
1572
'bzrlib.tests.test_reconcile',
980
1573
'bzrlib.tests.test_repository',
1574
'bzrlib.tests.test_revert',
981
1575
'bzrlib.tests.test_revision',
982
1576
'bzrlib.tests.test_revisionnamespaces',
983
'bzrlib.tests.test_revprops',
1577
'bzrlib.tests.test_revisiontree',
984
1578
'bzrlib.tests.test_rio',
985
1579
'bzrlib.tests.test_sampler',
986
1580
'bzrlib.tests.test_selftest',
987
1581
'bzrlib.tests.test_setup',
988
1582
'bzrlib.tests.test_sftp_transport',
989
1583
'bzrlib.tests.test_smart_add',
1584
'bzrlib.tests.test_smart_transport',
990
1585
'bzrlib.tests.test_source',
1586
'bzrlib.tests.test_status',
991
1587
'bzrlib.tests.test_store',
992
1588
'bzrlib.tests.test_symbol_versioning',
993
1589
'bzrlib.tests.test_testament',
1590
'bzrlib.tests.test_textfile',
1591
'bzrlib.tests.test_textmerge',
994
1592
'bzrlib.tests.test_trace',
995
1593
'bzrlib.tests.test_transactions',
996
1594
'bzrlib.tests.test_transform',
997
1595
'bzrlib.tests.test_transport',
1596
'bzrlib.tests.test_tree',
1597
'bzrlib.tests.test_treebuilder',
998
1598
'bzrlib.tests.test_tsort',
1599
'bzrlib.tests.test_tuned_gzip',
999
1600
'bzrlib.tests.test_ui',
1000
1601
'bzrlib.tests.test_upgrade',
1602
'bzrlib.tests.test_urlutils',
1001
1603
'bzrlib.tests.test_versionedfile',
1604
'bzrlib.tests.test_version',
1605
'bzrlib.tests.test_version_info',
1002
1606
'bzrlib.tests.test_weave',
1003
1607
'bzrlib.tests.test_whitebox',
1004
1608
'bzrlib.tests.test_workingtree',
1005
1609
'bzrlib.tests.test_xml',
1007
1611
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()
1612
'bzrlib.tests.test_transport_implementations',
1613
'bzrlib.tests.test_read_bundle',
1615
suite = TestUtil.TestSuite()
1616
loader = TestUtil.TestLoader()
1617
suite.addTest(loader.loadTestsFromModuleNames(testmod_names))
1021
1618
from bzrlib.transport import TransportTestProviderAdapter
1022
1619
adapter = TransportTestProviderAdapter()
1023
1620
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
1621
for package in packages_to_test():
1028
1622
suite.addTest(package.test_suite())
1029
1623
for m in MODULES_TO_TEST:
1030
1624
suite.addTest(loader.loadTestsFromModule(m))
1031
for m in (MODULES_TO_DOCTEST):
1032
suite.addTest(DocTestSuite(m))
1625
for m in MODULES_TO_DOCTEST:
1626
suite.addTest(doctest.DocTestSuite(m))
1033
1627
for name, plugin in bzrlib.plugin.all_plugins().items():
1034
1628
if getattr(plugin, 'test_suite', None) is not None:
1035
1629
suite.addTest(plugin.test_suite())
added
removed
bzrlib/tests/__init__.py
