← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/__init__.py

  • Committer: Martin Pool
  • Date: 2005-09-29 12:35:37 UTC
  • mto: (1185.12.2) (1393.1.12)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: mbp@sourcefrog.net-20050929123537-65f1aa0de94e1fea
- fold testsweet into bzrlib.selftest

  This makes the test suite run properly even for an installed copy of
  bzr.  testsweet was pretty strongly coupled to bzrlib anyhow.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/__init__.py
25
25
import subprocess
26
26
import shutil
27
27
 
28
 
import testsweet
29
28
import bzrlib.commands
30
29
import bzrlib.trace
31
30
import bzrlib.fetch
 
31
from bzrlib.selftest import TestUtil
 
32
from bzrlib.selftest.TestUtil import TestLoader, TestSuite
32
33
 
33
34
 
34
35
MODULES_TO_TEST = []
36
37
 
37
38
from logging import debug, warning, error
38
39
 
 
40
 
 
41
 
 
42
class EarlyStoppingTestResultAdapter(object):
 
43
    """An adapter for TestResult to stop at the first first failure or error"""
 
44
 
 
45
    def __init__(self, result):
 
46
        self._result = result
 
47
 
 
48
    def addError(self, test, err):
 
49
        self._result.addError(test, err)
 
50
        self._result.stop()
 
51
 
 
52
    def addFailure(self, test, err):
 
53
        self._result.addFailure(test, err)
 
54
        self._result.stop()
 
55
 
 
56
    def __getattr__(self, name):
 
57
        return getattr(self._result, name)
 
58
 
 
59
    def __setattr__(self, name, value):
 
60
        if name == '_result':
 
61
            object.__setattr__(self, name, value)
 
62
        return setattr(self._result, name, value)
 
63
 
 
64
 
 
65
class _MyResult(unittest._TextTestResult):
 
66
    """
 
67
    Custom TestResult.
 
68
 
 
69
    No special behaviour for now.
 
70
    """
 
71
 
 
72
    def startTest(self, test):
 
73
        unittest.TestResult.startTest(self, test)
 
74
        # TODO: Maybe show test.shortDescription somewhere?
 
75
        what = test.shortDescription() or test.id()        
 
76
        if self.showAll:
 
77
            self.stream.write('%-70.70s' % what)
 
78
        self.stream.flush()
 
79
 
 
80
    def addError(self, test, err):
 
81
        super(_MyResult, self).addError(test, err)
 
82
        self.stream.flush()
 
83
 
 
84
    def addFailure(self, test, err):
 
85
        super(_MyResult, self).addFailure(test, err)
 
86
        self.stream.flush()
 
87
 
 
88
    def addSuccess(self, test):
 
89
        if self.showAll:
 
90
            self.stream.writeln('OK')
 
91
        elif self.dots:
 
92
            self.stream.write('~')
 
93
        self.stream.flush()
 
94
        unittest.TestResult.addSuccess(self, test)
 
95
 
 
96
    def printErrorList(self, flavour, errors):
 
97
        for test, err in errors:
 
98
            self.stream.writeln(self.separator1)
 
99
            self.stream.writeln("%s: %s" % (flavour,self.getDescription(test)))
 
100
            if hasattr(test, '_get_log'):
 
101
                self.stream.writeln()
 
102
                self.stream.writeln('log from this test:')
 
103
                print >>self.stream, test._get_log()
 
104
            self.stream.writeln(self.separator2)
 
105
            self.stream.writeln("%s" % err)
 
106
 
 
107
 
 
108
class TextTestRunner(unittest.TextTestRunner):
 
109
 
 
110
    def _makeResult(self):
 
111
        result = _MyResult(self.stream, self.descriptions, self.verbosity)
 
112
        return EarlyStoppingTestResultAdapter(result)
 
113
 
 
114
 
 
115
class filteringVisitor(TestUtil.TestVisitor):
 
116
    """I accruse all the testCases I visit that pass a regexp filter on id
 
117
    into my suite
 
118
    """
 
119
 
 
120
    def __init__(self, filter):
 
121
        import re
 
122
        TestUtil.TestVisitor.__init__(self)
 
123
        self._suite=None
 
124
        self.filter=re.compile(filter)
 
125
 
 
126
    def suite(self):
 
127
        """answer the suite we are building"""
 
128
        if self._suite is None:
 
129
            self._suite=TestUtil.TestSuite()
 
130
        return self._suite
 
131
 
 
132
    def visitCase(self, aCase):
 
133
        if self.filter.match(aCase.id()):
 
134
            self.suite().addTest(aCase)
 
135
 
 
136
class TestSkipped(Exception):
 
137
    """Indicates that a test was intentionally skipped, rather than failing."""
 
138
    # XXX: Not used yet
 
139
 
 
140
 
39
141
class CommandFailed(Exception):
40
142
    pass
41
143
 
55
157
    BZRPATH = 'bzr'
56
158
 
57
159
    def setUp(self):
58
 
        # this replaces the default testsweet.TestCase; we don't want logging changed
59
160
        unittest.TestCase.setUp(self)
60
161
        bzrlib.trace.disable_default_logging()
61
162
        self._enable_file_logging()
296
397
        ##assert 0
297
398
 
298
399
 
 
400
 
 
401
def run_suite(suite, name='test', verbose=False, pattern=".*"):
 
402
    TestCaseInTempDir._TEST_NAME = name
 
403
    if verbose:
 
404
        verbosity = 2
 
405
    else:
 
406
        verbosity = 1
 
407
    runner = TextTestRunner(stream=sys.stdout,
 
408
                            descriptions=0,
 
409
                            verbosity=verbosity)
 
410
    visitor = filteringVisitor(pattern)
 
411
    suite.visit(visitor)
 
412
    result = runner.run(visitor.suite())
 
413
    # This is still a little bogus, 
 
414
    # but only a little. Folk not using our testrunner will
 
415
    # have to delete their temp directories themselves.
 
416
    if result.wasSuccessful():
 
417
        if TestCaseInTempDir.TEST_ROOT is not None:
 
418
            shutil.rmtree(TestCaseInTempDir.TEST_ROOT) 
 
419
    else:
 
420
        print "Failed tests working directories are in '%s'\n" % TestCaseInTempDir.TEST_ROOT
 
421
    return result.wasSuccessful()
 
422
 
 
423
 
299
424
def selftest(verbose=False, pattern=".*"):
300
425
    """Run the whole test suite under the enhanced runner"""
301
 
    return testsweet.run_suite(test_suite(), 'testbzr', verbose=verbose, pattern=pattern)
 
426
    return run_suite(test_suite(), 'testbzr', verbose=verbose, pattern=pattern)
302
427
 
303
428
 
304
429
def test_suite():
305
430
    """Build and return TestSuite for the whole program."""
306
 
    from bzrlib.selftest.TestUtil import TestLoader, TestSuite
307
 
    import bzrlib, bzrlib.store, bzrlib.inventory, bzrlib.branch
308
 
    import bzrlib.osutils, bzrlib.commands, bzrlib.merge3, bzrlib.plugin
 
431
    import bzrlib.store, bzrlib.inventory, bzrlib.branch
 
432
    import bzrlib.osutils, bzrlib.merge3, bzrlib.plugin
309
433
    from doctest import DocTestSuite
310
434
 
311
435
    global MODULES_TO_TEST, MODULES_TO_DOCTEST