Show More
@@ -458,12 +458,12 b' class Test(unittest.TestCase):' | |||
|
458 | 458 | This will return a tuple describing the result of the test. |
|
459 | 459 | """ |
|
460 | 460 | if not os.path.exists(self._path): |
|
461 |
re |
|
|
461 | raise SkipTest("Doesn't exist") | |
|
462 | 462 | |
|
463 | 463 | options = self._options |
|
464 | 464 | if not (options.whitelisted and self.name in options.whitelisted): |
|
465 | 465 | if options.blacklist and self.name in options.blacklist: |
|
466 |
re |
|
|
466 | raise SkipTest('blacklisted') | |
|
467 | 467 | |
|
468 | 468 | if options.retest and not os.path.exists('%s.err' % self.name): |
|
469 | 469 | return self.ignore('not retesting') |
@@ -479,7 +479,7 b' class Test(unittest.TestCase):' | |||
|
479 | 479 | return self.ignore("doesn't match keyword") |
|
480 | 480 | |
|
481 | 481 | if not os.path.basename(self.name.lower()).startswith('test-'): |
|
482 |
re |
|
|
482 | raise SkipTest('not a test file') | |
|
483 | 483 | |
|
484 | 484 | replacements, port = self._getreplacements() |
|
485 | 485 | env = self._getenv(port) |
@@ -525,7 +525,7 b' class Test(unittest.TestCase):' | |||
|
525 | 525 | failed[-1], ret) |
|
526 | 526 | else: |
|
527 | 527 | self._skipped = True |
|
528 |
se |
|
|
528 | raise SkipTest(missing[-1]) | |
|
529 | 529 | elif ret == 'timeout': |
|
530 | 530 | self._result = self.fail('timed out', ret) |
|
531 | 531 | elif out != self._refout: |
@@ -584,7 +584,7 b' class Test(unittest.TestCase):' | |||
|
584 | 584 | |
|
585 | 585 | def _run(self, replacements, env): |
|
586 | 586 | # This should be implemented in child classes to run tests. |
|
587 |
re |
|
|
587 | raise SkipTest('unknown test type') | |
|
588 | 588 | |
|
589 | 589 | def _getreplacements(self): |
|
590 | 590 | port = self._options.port + self._count * 3 |
@@ -687,9 +687,6 b' class Test(unittest.TestCase):' | |||
|
687 | 687 | # Failed is denoted by AssertionError (by default at least). |
|
688 | 688 | raise AssertionError(msg) |
|
689 | 689 | |
|
690 | def skip(self, msg): | |
|
691 | raise SkipTest(msg) | |
|
692 | ||
|
693 | 690 | def ignore(self, msg): |
|
694 | 691 | raise IgnoreTest(msg) |
|
695 | 692 |
General Comments 0
You need to be logged in to leave comments.
Login now