Show More
@@ -1315,6 +1315,9 b' class TestRunner(object):' | |||||
1315 | tests = [self._gettest(t, i, asunit=self.options.unittest) |
|
1315 | tests = [self._gettest(t, i, asunit=self.options.unittest) | |
1316 | for i, t in enumerate(tests)] |
|
1316 | for i, t in enumerate(tests)] | |
1317 |
|
1317 | |||
|
1318 | failed = False | |||
|
1319 | warned = False | |||
|
1320 | ||||
1318 | if self.options.unittest: |
|
1321 | if self.options.unittest: | |
1319 | suite = TestSuite(self, tests=tests) |
|
1322 | suite = TestSuite(self, tests=tests) | |
1320 | verbosity = 1 |
|
1323 | verbosity = 1 | |
@@ -1325,27 +1328,27 b' class TestRunner(object):' | |||||
1325 | else: |
|
1328 | else: | |
1326 | self._executetests(tests) |
|
1329 | self._executetests(tests) | |
1327 |
|
1330 | |||
1328 | failed = len(self.results['!']) |
|
1331 | failed = len(self.results['!']) | |
1329 | warned = len(self.results['~']) |
|
1332 | warned = len(self.results['~']) | |
1330 | tested = len(self.results['.']) + failed + warned |
|
1333 | tested = len(self.results['.']) + failed + warned | |
1331 | skipped = len(self.results['s']) |
|
1334 | skipped = len(self.results['s']) | |
1332 | ignored = len(self.results['i']) |
|
1335 | ignored = len(self.results['i']) | |
1333 |
|
1336 | |||
1334 |
|
1337 | |||
1335 | if not self.options.noskips: |
|
1338 | if not self.options.noskips: | |
1336 | for s in self.results['s']: |
|
1339 | for s in self.results['s']: | |
1337 | print "Skipped %s: %s" % s |
|
1340 | print "Skipped %s: %s" % s | |
1338 | for s in self.results['~']: |
|
1341 | for s in self.results['~']: | |
1339 | print "Warned %s: %s" % s |
|
1342 | print "Warned %s: %s" % s | |
1340 | for s in self.results['!']: |
|
1343 | for s in self.results['!']: | |
1341 | print "Failed %s: %s" % s |
|
1344 | print "Failed %s: %s" % s | |
1342 | self._checkhglib("Tested") |
|
1345 | self._checkhglib("Tested") | |
1343 | print "# Ran %d tests, %d skipped, %d warned, %d failed." % ( |
|
1346 | print "# Ran %d tests, %d skipped, %d warned, %d failed." % ( | |
1344 | tested, skipped + ignored, warned, failed) |
|
1347 | tested, skipped + ignored, warned, failed) | |
1345 | if self.results['!']: |
|
1348 | if self.results['!']: | |
1346 | print 'python hash seed:', os.environ['PYTHONHASHSEED'] |
|
1349 | print 'python hash seed:', os.environ['PYTHONHASHSEED'] | |
1347 | if self.options.time: |
|
1350 | if self.options.time: | |
1348 | self._outputtimes() |
|
1351 | self._outputtimes() | |
1349 |
|
1352 | |||
1350 | if self.options.anycoverage: |
|
1353 | if self.options.anycoverage: | |
1351 | self._outputcoverage() |
|
1354 | self._outputcoverage() |
General Comments 0
You need to be logged in to leave comments.
Login now