/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to testsweet.py

remove more duplicate merged hunks. Bad MERGE3, BAD.

Show diffs side-by-side

added added

removed removed

Lines of Context:
testsweet.py
55
55
    """Indicates that a test was intentionally skipped, rather than failing."""
56
56
    # XXX: Not used yet
57
57
 
 
58
 
58
59
class EarlyStoppingTestResultAdapter(object):
59
60
    """An adapter for TestResult to stop at the first first failure or error"""
60
61
 
88
89
    def startTest(self, test):
89
90
        unittest.TestResult.startTest(self, test)
90
91
        # TODO: Maybe show test.shortDescription somewhere?
91
 
        what = test.shortDescription() or test.id()        
 
92
        what = test.id()
 
93
        # python2.3 has the bad habit of just "runit" for doctests
 
94
        if what == 'runit':
 
95
            what = test.shortDescription()
92
96
        if self.showAll:
93
 
            self.stream.write('%-70.70s' % what)
 
97
            self.stream.write('%-60.60s' % what)
94
98
        self.stream.flush()
95
99
 
96
100
    def addError(self, test, err):