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