1
1
# Copyright (C) 2005, 2006 by Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
44
46
import bzrlib.branch
45
47
import bzrlib.bzrdir as bzrdir
46
48
import bzrlib.commands
49
import bzrlib.bundle.serializer
47
50
import bzrlib.errors as errors
48
51
import bzrlib.inventory
49
52
import bzrlib.iterablefile
50
53
import bzrlib.lockdir
57
# lsprof not available
51
59
from bzrlib.merge import merge_inner
52
60
import bzrlib.merge3
53
61
import bzrlib.osutils
54
62
import bzrlib.osutils as osutils
55
63
import bzrlib.plugin
64
import bzrlib.progress as progress
56
65
from bzrlib.revision import common_ancestor
57
66
import bzrlib.store
67
from bzrlib import symbol_versioning
58
68
import bzrlib.trace
59
from bzrlib.transport import urlescape, get_transport
69
from bzrlib.transport import get_transport
60
70
import bzrlib.transport
61
71
from bzrlib.transport.local import LocalRelpathServer
62
72
from bzrlib.transport.readonly import ReadonlyServer
63
73
from bzrlib.trace import mutter
64
from bzrlib.tests.TestUtil import TestLoader, TestSuite
74
from bzrlib.tests import TestUtil
75
from bzrlib.tests.TestUtil import (
65
79
from bzrlib.tests.treeshape import build_tree_contents
80
import bzrlib.urlutils as urlutils
66
81
from bzrlib.workingtree import WorkingTree, WorkingTreeFormat2
68
83
default_transport = LocalRelpathServer
114
136
Shows output in a different format, including displaying runtime for tests.
116
138
stop_early = False
118
def _elapsedTime(self):
119
return "%5dms" % (1000 * (time.time() - self._start_time))
140
def __init__(self, stream, descriptions, verbosity, pb=None,
142
"""Construct new TestResult.
144
:param bench_history: Optionally, a writable file object to accumulate
147
unittest._TextTestResult.__init__(self, stream, descriptions, verbosity)
149
if bench_history is not None:
150
from bzrlib.version import _get_bzr_source_tree
151
src_tree = _get_bzr_source_tree()
154
revision_id = src_tree.get_parent_ids()[0]
156
# XXX: if this is a brand new tree, do the same as if there
160
# XXX: If there's no branch, what should we do?
162
bench_history.write("--date %s %s\n" % (time.time(), revision_id))
163
self._bench_history = bench_history
165
def extractBenchmarkTime(self, testCase):
166
"""Add a benchmark time for the current test case."""
167
self._benchmarkTime = getattr(testCase, "_benchtime", None)
169
def _elapsedTestTimeString(self):
170
"""Return a time string for the overall time the current test has taken."""
171
return self._formatTime(time.time() - self._start_time)
173
def _testTimeString(self):
174
if self._benchmarkTime is not None:
176
self._formatTime(self._benchmarkTime),
177
self._elapsedTestTimeString())
179
return " %s" % self._elapsedTestTimeString()
181
def _formatTime(self, seconds):
182
"""Format seconds as milliseconds with leading spaces."""
183
return "%5dms" % (1000 * seconds)
185
def _ellipsise_unimportant_words(self, a_string, final_width,
187
"""Add ellipses (sp?) for overly long strings.
189
:param keep_start: If true preserve the start of a_string rather
193
if len(a_string) > final_width:
194
result = a_string[:final_width-3] + '...'
198
if len(a_string) > final_width:
199
result = '...' + a_string[3-final_width:]
202
return result.ljust(final_width)
121
204
def startTest(self, test):
122
205
unittest.TestResult.startTest(self, test)
124
207
# the beginning, but in an id, the important words are
126
209
SHOW_DESCRIPTIONS = False
211
if not self.showAll and self.dots and self.pb is not None:
214
final_width = osutils.terminal_width()
215
final_width = final_width - 15 - 8
217
if SHOW_DESCRIPTIONS:
218
what = test.shortDescription()
220
what = self._ellipsise_unimportant_words(what, final_width, keep_start=True)
223
if what.startswith('bzrlib.tests.'):
225
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
227
self.stream.write(what)
228
elif self.dots and self.pb is not None:
229
self.pb.update(what, self.testsRun - 1, None)
144
230
self.stream.flush()
231
self._recordTestStartTime()
233
def _recordTestStartTime(self):
234
"""Record that a test has started."""
145
235
self._start_time = time.time()
147
237
def addError(self, test, err):
148
238
if isinstance(err[1], TestSkipped):
149
239
return self.addSkipped(test, err)
150
240
unittest.TestResult.addError(self, test, err)
241
self.extractBenchmarkTime(test)
152
self.stream.writeln("ERROR %s" % self._elapsedTime())
243
self.stream.writeln("ERROR %s" % self._testTimeString())
244
elif self.dots and self.pb is None:
154
245
self.stream.write('E')
247
self.pb.update(self._ellipsise_unimportant_words('ERROR', 13), self.testsRun, None)
248
self.pb.note(self._ellipsise_unimportant_words(
249
test.id() + ': ERROR',
250
osutils.terminal_width()))
155
251
self.stream.flush()
156
252
if self.stop_early:
159
255
def addFailure(self, test, err):
160
256
unittest.TestResult.addFailure(self, test, err)
257
self.extractBenchmarkTime(test)
162
self.stream.writeln(" FAIL %s" % self._elapsedTime())
259
self.stream.writeln(" FAIL %s" % self._testTimeString())
260
elif self.dots and self.pb is None:
164
261
self.stream.write('F')
263
self.pb.update(self._ellipsise_unimportant_words('FAIL', 13), self.testsRun, None)
264
self.pb.note(self._ellipsise_unimportant_words(
265
test.id() + ': FAIL',
266
osutils.terminal_width()))
165
267
self.stream.flush()
166
268
if self.stop_early:
169
271
def addSuccess(self, test):
272
self.extractBenchmarkTime(test)
273
if self._bench_history is not None:
274
if self._benchmarkTime is not None:
275
self._bench_history.write("%s %s\n" % (
276
self._formatTime(self._benchmarkTime),
171
self.stream.writeln(' OK %s' % self._elapsedTime())
279
self.stream.writeln(' OK %s' % self._testTimeString())
280
for bench_called, stats in getattr(test, '_benchcalls', []):
281
self.stream.writeln('LSProf output for %s(%s, %s)' % bench_called)
282
stats.pprint(file=self.stream)
283
elif self.dots and self.pb is None:
173
284
self.stream.write('~')
286
self.pb.update(self._ellipsise_unimportant_words('OK', 13), self.testsRun, None)
174
287
self.stream.flush()
175
288
unittest.TestResult.addSuccess(self, test)
177
290
def addSkipped(self, test, skip_excinfo):
291
self.extractBenchmarkTime(test)
179
print >>self.stream, ' SKIP %s' % self._elapsedTime()
293
print >>self.stream, ' SKIP %s' % self._testTimeString()
180
294
print >>self.stream, ' %s' % skip_excinfo[1]
295
elif self.dots and self.pb is None:
182
296
self.stream.write('S')
298
self.pb.update(self._ellipsise_unimportant_words('SKIP', 13), self.testsRun, None)
183
299
self.stream.flush()
184
300
# seems best to treat this as success from point-of-view of unittest
185
301
# -- it actually does nothing so it barely matters :)
186
unittest.TestResult.addSuccess(self, test)
304
except KeyboardInterrupt:
307
self.addError(test, test.__exc_info())
309
unittest.TestResult.addSuccess(self, test)
188
311
def printErrorList(self, flavour, errors):
189
312
for test, err in errors:
200
323
self.stream.writeln("%s" % err)
203
class TextTestRunner(unittest.TextTestRunner):
326
class TextTestRunner(object):
204
327
stop_on_failure = False
336
self.stream = unittest._WritelnDecorator(stream)
337
self.descriptions = descriptions
338
self.verbosity = verbosity
339
self.keep_output = keep_output
341
self._bench_history = bench_history
206
343
def _makeResult(self):
207
result = _MyResult(self.stream, self.descriptions, self.verbosity)
344
result = _MyResult(self.stream,
348
bench_history=self._bench_history)
208
349
result.stop_early = self.stop_on_failure
353
"Run the given test case or test suite."
354
result = self._makeResult()
355
startTime = time.time()
356
if self.pb is not None:
357
self.pb.update('Running tests', 0, test.countTestCases())
359
stopTime = time.time()
360
timeTaken = stopTime - startTime
362
self.stream.writeln(result.separator2)
363
run = result.testsRun
364
self.stream.writeln("Ran %d test%s in %.3fs" %
365
(run, run != 1 and "s" or "", timeTaken))
366
self.stream.writeln()
367
if not result.wasSuccessful():
368
self.stream.write("FAILED (")
369
failed, errored = map(len, (result.failures, result.errors))
371
self.stream.write("failures=%d" % failed)
373
if failed: self.stream.write(", ")
374
self.stream.write("errors=%d" % errored)
375
self.stream.writeln(")")
377
self.stream.writeln("OK")
378
if self.pb is not None:
379
self.pb.update('Cleaning up', 0, 1)
380
# This is still a little bogus,
381
# but only a little. Folk not using our testrunner will
382
# have to delete their temp directories themselves.
383
test_root = TestCaseInTempDir.TEST_ROOT
384
if result.wasSuccessful() or not self.keep_output:
385
if test_root is not None:
386
# If LANG=C we probably have created some bogus paths
387
# which rmtree(unicode) will fail to delete
388
# so make sure we are using rmtree(str) to delete everything
389
# except on win32, where rmtree(str) will fail
390
# since it doesn't have the property of byte-stream paths
391
# (they are either ascii or mbcs)
392
if sys.platform == 'win32':
393
# make sure we are using the unicode win32 api
394
test_root = unicode(test_root)
396
test_root = test_root.encode(
397
sys.getfilesystemencoding())
398
osutils.rmtree(test_root)
400
if self.pb is not None:
401
self.pb.note("Failed tests working directories are in '%s'\n",
405
"Failed tests working directories are in '%s'\n" %
407
TestCaseInTempDir.TEST_ROOT = None
408
if self.pb is not None:
212
413
def iter_suite_tests(suite):
213
414
"""Return all tests in a suite, recursing through nested suites"""
225
426
class TestSkipped(Exception):
226
427
"""Indicates that a test was intentionally skipped, rather than failing."""
230
430
class CommandFailed(Exception):
434
class StringIOWrapper(object):
435
"""A wrapper around cStringIO which just adds an encoding attribute.
437
Internally we can check sys.stdout to see what the output encoding
438
should be. However, cStringIO has no encoding attribute that we can
439
set. So we wrap it instead.
444
def __init__(self, s=None):
446
self.__dict__['_cstring'] = StringIO(s)
448
self.__dict__['_cstring'] = StringIO()
450
def __getattr__(self, name, getattr=getattr):
451
return getattr(self.__dict__['_cstring'], name)
453
def __setattr__(self, name, val):
454
if name == 'encoding':
455
self.__dict__['encoding'] = val
457
return setattr(self._cstring, name, val)
233
460
class TestCase(unittest.TestCase):
234
461
"""Base class for bzr unit tests.
341
578
def assertIsInstance(self, obj, kls):
342
579
"""Fail if obj is not an instance of kls"""
343
580
if not isinstance(obj, kls):
344
self.fail("%r is not an instance of %s" % (obj, kls))
581
self.fail("%r is an instance of %s rather than %s" % (
582
obj, obj.__class__, kls))
584
def _capture_warnings(self, a_callable, *args, **kwargs):
585
"""A helper for callDeprecated and applyDeprecated.
587
:param a_callable: A callable to call.
588
:param args: The positional arguments for the callable
589
:param kwargs: The keyword arguments for the callable
590
:return: A tuple (warnings, result). result is the result of calling
591
a_callable(*args, **kwargs).
594
def capture_warnings(msg, cls, stacklevel=None):
595
# we've hooked into a deprecation specific callpath,
596
# only deprecations should getting sent via it.
597
self.assertEqual(cls, DeprecationWarning)
598
local_warnings.append(msg)
599
original_warning_method = symbol_versioning.warn
600
symbol_versioning.set_warning_method(capture_warnings)
602
result = a_callable(*args, **kwargs)
604
symbol_versioning.set_warning_method(original_warning_method)
605
return (local_warnings, result)
607
def applyDeprecated(self, deprecation_format, a_callable, *args, **kwargs):
608
"""Call a deprecated callable without warning the user.
610
:param deprecation_format: The deprecation format that the callable
611
should have been deprecated with. This is the same type as the
612
parameter to deprecated_method/deprecated_function. If the
613
callable is not deprecated with this format, an assertion error
615
:param a_callable: A callable to call. This may be a bound method or
616
a regular function. It will be called with *args and **kwargs.
617
:param args: The positional arguments for the callable
618
:param kwargs: The keyword arguments for the callable
619
:return: The result of a_callable(*args, **kwargs)
621
call_warnings, result = self._capture_warnings(a_callable,
623
expected_first_warning = symbol_versioning.deprecation_string(
624
a_callable, deprecation_format)
625
if len(call_warnings) == 0:
626
self.fail("No assertion generated by call to %s" %
628
self.assertEqual(expected_first_warning, call_warnings[0])
631
def callDeprecated(self, expected, callable, *args, **kwargs):
632
"""Assert that a callable is deprecated in a particular way.
634
This is a very precise test for unusual requirements. The
635
applyDeprecated helper function is probably more suited for most tests
636
as it allows you to simply specify the deprecation format being used
637
and will ensure that that is issued for the function being called.
639
:param expected: a list of the deprecation warnings expected, in order
640
:param callable: The callable to call
641
:param args: The positional arguments for the callable
642
:param kwargs: The keyword arguments for the callable
644
call_warnings, result = self._capture_warnings(callable,
646
self.assertEqual(expected, call_warnings)
346
649
def _startLogFile(self):
347
650
"""Send bzr and test log messages to a temporary file.
383
687
'HOME': os.getcwd(),
384
688
'APPDATA': os.getcwd(),
690
'BZREMAIL': None, # may still be present in the environment
692
'BZR_PROGRESS_BAR': None,
388
694
self.__old_env = {}
389
695
self.addCleanup(self._restoreEnvironment)
390
696
for name, value in new_env.iteritems():
391
697
self._captureVar(name, value)
394
699
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
700
"""Set an environment variable, and reset it when finished."""
701
self.__old_env[name] = osutils.set_or_unset_env(name, newvalue)
411
703
def _restoreEnvironment(self):
412
704
for name, value in self.__old_env.iteritems():
413
self._restoreVar(name, value)
705
osutils.set_or_unset_env(name, value)
415
707
def tearDown(self):
416
708
self._runCleanups()
417
709
unittest.TestCase.tearDown(self)
711
def time(self, callable, *args, **kwargs):
712
"""Run callable and accrue the time it takes to the benchmark time.
714
If lsprofiling is enabled (i.e. by --lsprof-time to bzr selftest) then
715
this will cause lsprofile statistics to be gathered and stored in
718
if self._benchtime is None:
722
if not self._gather_lsprof_in_benchmarks:
723
return callable(*args, **kwargs)
725
# record this benchmark
726
ret, stats = bzrlib.lsprof.profile(callable, *args, **kwargs)
728
self._benchcalls.append(((callable, args, kwargs), stats))
731
self._benchtime += time.time() - start
419
733
def _runCleanups(self):
420
734
"""Run registered cleanup functions.
458
772
errors, and with logging set to something approximating the
459
773
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.
775
:param argv: arguments to invoke bzr
776
:param retcode: expected return code, or None for don't-care.
777
:param encoding: encoding for sys.stdout and sys.stderr
778
:param stdin: A string to be used as stdin for the command.
466
self.log('run bzr: %s', ' '.join(argv))
781
encoding = bzrlib.user_encoding
782
if stdin is not None:
783
stdin = StringIO(stdin)
784
stdout = StringIOWrapper()
785
stderr = StringIOWrapper()
786
stdout.encoding = encoding
787
stderr.encoding = encoding
789
self.log('run bzr: %r', argv)
467
790
# FIXME: don't call into logging here
468
791
handler = logging.StreamHandler(stderr)
469
handler.setFormatter(bzrlib.trace.QuietFormatter())
470
792
handler.setLevel(logging.INFO)
471
793
logger = logging.getLogger('')
472
794
logger.addHandler(handler)
795
old_ui_factory = bzrlib.ui.ui_factory
796
bzrlib.ui.ui_factory = bzrlib.tests.blackbox.TestUIFactory(
799
bzrlib.ui.ui_factory.stdin = stdin
474
result = self.apply_redirected(None, stdout, stderr,
801
result = self.apply_redirected(stdin, stdout, stderr,
475
802
bzrlib.commands.run_bzr_catch_errors,
478
805
logger.removeHandler(handler)
806
bzrlib.ui.ui_factory = old_ui_factory
479
808
out = stdout.getvalue()
480
809
err = stderr.getvalue()
482
self.log('output:\n%s', out)
811
self.log('output:\n%r', out)
484
self.log('errors:\n%s', err)
813
self.log('errors:\n%r', err)
485
814
if retcode is not None:
486
self.assertEquals(result, retcode)
815
self.assertEquals(retcode, result)
489
818
def run_bzr(self, *args, **kwargs):
496
825
This sends the stdout/stderr results into the test's log,
497
826
where it may be useful for debugging. See also run_captured.
828
:param stdin: A string to be used as stdin for the command.
499
830
retcode = kwargs.pop('retcode', 0)
500
return self.run_bzr_captured(args, retcode)
831
encoding = kwargs.pop('encoding', None)
832
stdin = kwargs.pop('stdin', None)
833
return self.run_bzr_captured(args, retcode=retcode, encoding=encoding, stdin=stdin)
835
def run_bzr_decode(self, *args, **kwargs):
836
if 'encoding' in kwargs:
837
encoding = kwargs['encoding']
839
encoding = bzrlib.user_encoding
840
return self.run_bzr(*args, **kwargs)[0].decode(encoding)
842
def run_bzr_error(self, error_regexes, *args, **kwargs):
843
"""Run bzr, and check that stderr contains the supplied regexes
845
:param error_regexes: Sequence of regular expressions which
846
must each be found in the error output. The relative ordering
848
:param args: command-line arguments for bzr
849
:param kwargs: Keyword arguments which are interpreted by run_bzr
850
This function changes the default value of retcode to be 3,
851
since in most cases this is run when you expect bzr to fail.
852
:return: (out, err) The actual output of running the command (in case you
853
want to do more inspection)
856
# Make sure that commit is failing because there is nothing to do
857
self.run_bzr_error(['no changes to commit'],
858
'commit', '-m', 'my commit comment')
859
# Make sure --strict is handling an unknown file, rather than
860
# giving us the 'nothing to do' error
861
self.build_tree(['unknown'])
862
self.run_bzr_error(['Commit refused because there are unknown files'],
863
'commit', '--strict', '-m', 'my commit comment')
865
kwargs.setdefault('retcode', 3)
866
out, err = self.run_bzr(*args, **kwargs)
867
for regex in error_regexes:
868
self.assertContainsRe(err, regex)
871
def run_bzr_subprocess(self, *args, **kwargs):
872
"""Run bzr in a subprocess for testing.
874
This starts a new Python interpreter and runs bzr in there.
875
This should only be used for tests that have a justifiable need for
876
this isolation: e.g. they are testing startup time, or signal
877
handling, or early startup code, etc. Subprocess code can't be
878
profiled or debugged so easily.
880
:param retcode: The status code that is expected. Defaults to 0. If
881
None is supplied, the status code is not checked.
882
:param env_changes: A dictionary which lists changes to environment
883
variables. A value of None will unset the env variable.
884
The values must be strings. The change will only occur in the
885
child, so you don't need to fix the environment after running.
886
:param universal_newlines: Convert CRLF => LF
888
env_changes = kwargs.get('env_changes', {})
892
def cleanup_environment():
893
for env_var, value in env_changes.iteritems():
894
old_env[env_var] = osutils.set_or_unset_env(env_var, value)
896
def restore_environment():
897
for env_var, value in old_env.iteritems():
898
osutils.set_or_unset_env(env_var, value)
900
bzr_path = os.path.dirname(os.path.dirname(bzrlib.__file__))+'/bzr'
904
# win32 subprocess doesn't support preexec_fn
905
# so we will avoid using it on all platforms, just to
906
# make sure the code path is used, and we don't break on win32
907
cleanup_environment()
908
process = Popen([sys.executable, bzr_path]+args,
909
stdout=PIPE, stderr=PIPE)
911
restore_environment()
913
out = process.stdout.read()
914
err = process.stderr.read()
916
if kwargs.get('universal_newlines', False):
917
out = out.replace('\r\n', '\n')
918
err = err.replace('\r\n', '\n')
920
retcode = process.wait()
921
supplied_retcode = kwargs.get('retcode', 0)
922
if supplied_retcode is not None:
923
assert supplied_retcode == retcode
502
926
def check_inventory_shape(self, inv, shape):
503
927
"""Compare an inventory to a list of expected names.
676
1106
end = os.linesep
678
1108
raise errors.BzrError('Invalid line ending request %r' % (line_endings,))
679
content = "contents of %s%s" % (name, end)
680
transport.put(urlescape(name), StringIO(content))
1109
content = "contents of %s%s" % (name.encode('utf-8'), end)
1110
# Technically 'put()' is the right command. However, put
1111
# uses an AtomicFile, which requires an extra rename into place
1112
# As long as the files didn't exist in the past, append() will
1113
# do the same thing as put()
1114
# On jam's machine, make_kernel_like_tree is:
1115
# put: 4.5-7.5s (averaging 6s)
1117
# put_non_atomic: 2.9-4.5s
1118
transport.put_bytes_non_atomic(urlutils.escape(name), content)
682
1120
def build_tree_contents(self, shape):
683
1121
build_tree_contents(shape)
793
1232
self.assertTrue(t.is_readonly())
796
def make_branch(self, relpath):
1235
def make_branch(self, relpath, format=None):
797
1236
"""Create a branch on the transport at relpath."""
798
repo = self.make_repository(relpath)
1237
repo = self.make_repository(relpath, format=format)
799
1238
return repo.bzrdir.create_branch()
801
def make_bzrdir(self, relpath):
1240
def make_bzrdir(self, relpath, format=None):
803
1242
url = self.get_url(relpath)
804
segments = relpath.split('/')
1243
mutter('relpath %r => url %r', relpath, url)
1244
segments = url.split('/')
805
1245
if segments and segments[-1] not in ('', '.'):
806
parent = self.get_url('/'.join(segments[:-1]))
1246
parent = '/'.join(segments[:-1])
807
1247
t = get_transport(parent)
809
1249
t.mkdir(segments[-1])
810
1250
except errors.FileExists:
812
return bzrlib.bzrdir.BzrDir.create(url)
1253
format=bzrlib.bzrdir.BzrDirFormat.get_default_format()
1254
# FIXME: make this use a single transport someday. RBC 20060418
1255
return format.initialize_on_transport(get_transport(relpath))
813
1256
except errors.UninitializableFormat:
814
raise TestSkipped("Format %s is not initializable.")
1257
raise TestSkipped("Format %s is not initializable." % format)
816
def make_repository(self, relpath, shared=False):
1259
def make_repository(self, relpath, shared=False, format=None):
817
1260
"""Create a repository on our default transport at relpath."""
818
made_control = self.make_bzrdir(relpath)
1261
made_control = self.make_bzrdir(relpath, format=format)
819
1262
return made_control.create_repository(shared=shared)
821
def make_branch_and_tree(self, relpath):
1264
def make_branch_and_tree(self, relpath, format=None):
822
1265
"""Create a branch on the transport and a tree locally.
824
1267
Returns the tree.
883
1326
def run_suite(suite, name='test', verbose=False, pattern=".*",
884
1327
stop_on_failure=False, keep_output=False,
1328
transport=None, lsprof_timed=None, bench_history=None):
886
1329
TestCaseInTempDir._TEST_NAME = name
1330
TestCase._gather_lsprof_in_benchmarks = lsprof_timed
1336
pb = progress.ProgressBar()
891
1337
runner = TextTestRunner(stream=sys.stdout,
1339
verbosity=verbosity,
1340
keep_output=keep_output,
1342
bench_history=bench_history)
894
1343
runner.stop_on_failure=stop_on_failure
895
1344
if pattern != '.*':
896
1345
suite = filter_suite_by_re(suite, pattern)
897
1346
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
1347
return result.wasSuccessful()
914
1350
def selftest(verbose=False, pattern=".*", stop_on_failure=True,
915
1351
keep_output=False,
1353
test_suite_factory=None,
1355
bench_history=None):
917
1356
"""Run the whole test suite under the enhanced runner"""
1357
# XXX: Very ugly way to do this...
1358
# Disable warning about old formats because we don't want it to disturb
1359
# any blackbox tests.
1360
from bzrlib import repository
1361
repository._deprecation_warning_done = True
918
1363
global default_transport
919
1364
if transport is None:
920
1365
transport = default_transport
921
1366
old_transport = default_transport
922
1367
default_transport = transport
1369
if test_suite_factory is None:
1370
suite = test_suite()
1372
suite = test_suite_factory()
925
1373
return run_suite(suite, 'testbzr', verbose=verbose, pattern=pattern,
926
1374
stop_on_failure=stop_on_failure, keep_output=keep_output,
1375
transport=transport,
1376
lsprof_timed=lsprof_timed,
1377
bench_history=bench_history)
929
1379
default_transport = old_transport
933
1382
def test_suite():
934
"""Build and return TestSuite for the whole program."""
935
from doctest import DocTestSuite
937
global MODULES_TO_DOCTEST
1383
"""Build and return TestSuite for the whole of bzrlib.
1385
This function can be replaced if you need to change the default test
1386
suite on a global basis, but it is not encouraged.
940
1389
'bzrlib.tests.test_ancestry',
941
'bzrlib.tests.test_annotate',
942
1390
'bzrlib.tests.test_api',
1391
'bzrlib.tests.test_atomicfile',
943
1392
'bzrlib.tests.test_bad_files',
944
'bzrlib.tests.test_basis_inventory',
945
1393
'bzrlib.tests.test_branch',
1394
'bzrlib.tests.test_bundle',
946
1395
'bzrlib.tests.test_bzrdir',
1396
'bzrlib.tests.test_cache_utf8',
947
1397
'bzrlib.tests.test_command',
948
1398
'bzrlib.tests.test_commit',
949
1399
'bzrlib.tests.test_commit_merge',
973
1425
'bzrlib.tests.test_nonascii',
974
1426
'bzrlib.tests.test_options',
975
1427
'bzrlib.tests.test_osutils',
1428
'bzrlib.tests.test_patch',
1429
'bzrlib.tests.test_patches',
976
1430
'bzrlib.tests.test_permissions',
977
1431
'bzrlib.tests.test_plugins',
978
1432
'bzrlib.tests.test_progress',
979
1433
'bzrlib.tests.test_reconcile',
980
1434
'bzrlib.tests.test_repository',
1435
'bzrlib.tests.test_revert',
981
1436
'bzrlib.tests.test_revision',
982
1437
'bzrlib.tests.test_revisionnamespaces',
983
'bzrlib.tests.test_revprops',
1438
'bzrlib.tests.test_revisiontree',
984
1439
'bzrlib.tests.test_rio',
985
1440
'bzrlib.tests.test_sampler',
986
1441
'bzrlib.tests.test_selftest',
987
1442
'bzrlib.tests.test_setup',
988
1443
'bzrlib.tests.test_sftp_transport',
1444
'bzrlib.tests.test_ftp_transport',
989
1445
'bzrlib.tests.test_smart_add',
990
1446
'bzrlib.tests.test_source',
1447
'bzrlib.tests.test_status',
991
1448
'bzrlib.tests.test_store',
992
1449
'bzrlib.tests.test_symbol_versioning',
993
1450
'bzrlib.tests.test_testament',
1451
'bzrlib.tests.test_textfile',
1452
'bzrlib.tests.test_textmerge',
994
1453
'bzrlib.tests.test_trace',
995
1454
'bzrlib.tests.test_transactions',
996
1455
'bzrlib.tests.test_transform',
997
1456
'bzrlib.tests.test_transport',
1457
'bzrlib.tests.test_tree',
998
1458
'bzrlib.tests.test_tsort',
1459
'bzrlib.tests.test_tuned_gzip',
999
1460
'bzrlib.tests.test_ui',
1000
1461
'bzrlib.tests.test_upgrade',
1462
'bzrlib.tests.test_urlutils',
1001
1463
'bzrlib.tests.test_versionedfile',
1464
'bzrlib.tests.test_version',
1002
1465
'bzrlib.tests.test_weave',
1003
1466
'bzrlib.tests.test_whitebox',
1004
1467
'bzrlib.tests.test_workingtree',
1005
1468
'bzrlib.tests.test_xml',
1007
1470
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()
1471
'bzrlib.tests.test_transport_implementations',
1472
'bzrlib.tests.test_read_bundle',
1474
suite = TestUtil.TestSuite()
1475
loader = TestUtil.TestLoader()
1476
suite.addTest(loader.loadTestsFromModuleNames(testmod_names))
1021
1477
from bzrlib.transport import TransportTestProviderAdapter
1022
1478
adapter = TransportTestProviderAdapter()
1023
1479
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
1480
for package in packages_to_test():
1028
1481
suite.addTest(package.test_suite())
1029
1482
for m in MODULES_TO_TEST:
1030
1483
suite.addTest(loader.loadTestsFromModule(m))
1031
for m in (MODULES_TO_DOCTEST):
1032
suite.addTest(DocTestSuite(m))
1484
for m in MODULES_TO_DOCTEST:
1485
suite.addTest(doctest.DocTestSuite(m))
1033
1486
for name, plugin in bzrlib.plugin.all_plugins().items():
1034
1487
if getattr(plugin, 'test_suite', None) is not None:
1035
1488
suite.addTest(plugin.test_suite())
1039
1492
def adapt_modules(mods_list, adapter, loader, suite):
1040
1493
"""Adapt the modules in mods_list using adapter and add to suite."""
1041
for mod_name in mods_list:
1042
mod = _load_module_by_name(mod_name)
1043
for test in iter_suite_tests(loader.loadTestsFromModule(mod)):
1044
suite.addTests(adapter.adapt(test))
1047
def _load_module_by_name(mod_name):
1048
parts = mod_name.split('.')
1049
module = __import__(mod_name)
1051
# for historical reasons python returns the top-level module even though
1052
# it loads the submodule; we need to walk down to get the one we want.
1054
module = getattr(module, parts.pop(0))
1494
for test in iter_suite_tests(loader.loadTestsFromModuleNames(mods_list)):
1495
suite.addTests(adapter.adapt(test))
added
removed
bzrlib/tests/__init__.py
