Show More
@@ -361,6 +361,7 b' class Test(object):' | |||
|
361 | 361 | self._out = None |
|
362 | 362 | self._duration = None |
|
363 | 363 | self._result = None |
|
364 | self._skipped = None | |
|
364 | 365 | |
|
365 | 366 | # If we're not in --debug mode and reference output file exists, |
|
366 | 367 | # check test output against it. |
@@ -390,6 +391,7 b' class Test(object):' | |||
|
390 | 391 | self._out = None |
|
391 | 392 | self._duration = None |
|
392 | 393 | self._result = None |
|
394 | self._skipped = None | |
|
393 | 395 | |
|
394 | 396 | def run(self): |
|
395 | 397 | """Run this test instance. |
@@ -461,7 +463,7 b' class Test(object):' | |||
|
461 | 463 | return 'killed by signal: %d' % -ret |
|
462 | 464 | return 'returned error code %d' % ret |
|
463 | 465 | |
|
464 | skipped = False | |
|
466 | self._skipped = False | |
|
465 | 467 | |
|
466 | 468 | if ret == self.SKIPPED_STATUS: |
|
467 | 469 | if out is None: # Debug mode, nothing to parse. |
@@ -477,7 +479,7 b' class Test(object):' | |||
|
477 | 479 | self._result = self.fail('hg have failed checking for %s' % |
|
478 | 480 | failed[-1], ret) |
|
479 | 481 | else: |
|
480 | skipped = True | |
|
482 | self._skipped = True | |
|
481 | 483 | self._result = self.skip(missing[-1]) |
|
482 | 484 | elif ret == 'timeout': |
|
483 | 485 | self._result = self.fail('timed out', ret) |
@@ -500,7 +502,7 b' class Test(object):' | |||
|
500 | 502 | else: |
|
501 | 503 | msg += 'output changed' |
|
502 | 504 | |
|
503 | if (ret != 0 or out != self._refout) and not skipped \ | |
|
505 | if (ret != 0 or out != self._refout) and not self._skipped \ | |
|
504 | 506 | and not options.debug: |
|
505 | 507 | f = open(self._errpath, 'wb') |
|
506 | 508 | for line in out: |
@@ -513,6 +515,12 b' class Test(object):' | |||
|
513 | 515 | else: |
|
514 | 516 | self._result = self.success() |
|
515 | 517 | |
|
518 | if (ret != 0 or out != self._refout) and not self._skipped \ | |
|
519 | and not options.debug: | |
|
520 | f = open(self._errpath, 'wb') | |
|
521 | for line in out: | |
|
522 | f.write(line) | |
|
523 | f.close() | |
|
516 | 524 | |
|
517 | 525 | if not self._unittest: |
|
518 | 526 | self.tearDown() |
General Comments 0
You need to be logged in to leave comments.
Login now