diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2016-05-04 13:19:15 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2016-05-17 14:23:05 -0700 |
commit | 83680fef2bbefbdb3c34120237770613d0675c85 (patch) | |
tree | 84cee9101cfdc6ab8036ac9c97eb26957cebd60b | |
parent | 06259c33f5c6f1a8cd497a4ce7245295cca400b2 (diff) |
framework: Don't report an error message for fast skipping
Piglit has a number of mechanisms for fast skipping, some for GL
features, some for platform support, and some other things. It puts a
nice little message in stdout to let the developer know why it skipped,
but currently that message includes something to the effect of "This is
an unhandled exception", which it isn't it's being handled
appropriately. This patch fixes that.
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
-rw-r--r-- | framework/test/base.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/framework/test/base.py b/framework/test/base.py index a5cac7aff..358dfeb27 100644 --- a/framework/test/base.py +++ b/framework/test/base.py @@ -119,7 +119,9 @@ _SUPPRESS_TIMEOUT = bool(os.environ.get('PIGLIT_NO_TIMEOUT', False)) class TestIsSkip(exceptions.PiglitException): """Exception raised in is_skip() if the test is a skip.""" - pass + def __init__(self, reason): + super(TestIsSkip, self).__init__() + self.reason = reason class TestRunError(exceptions.PiglitException): @@ -254,7 +256,7 @@ class Test(object): self.is_skip() except TestIsSkip as e: self.result.result = 'skip' - self.result.out = six.text_type(e) + self.result.out = e.reason self.result.returncode = None return |