summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <baker.dylan.c@gmail.com>2014-04-10 16:46:43 -0700
committerDylan Baker <baker.dylan.c@gmail.com>2014-04-17 08:00:17 -0700
commit7970bf1fedfa9e2bad8e07c61747730029c71a59 (patch)
treeba6442ed266834bdfef1570f549add9e1ed580d4
parent580d3d5f40b5fbaa3a26ac877911b0dc1f1b9b4b (diff)
exectest.py: remove try/except from PiglitTest.interpret_result
This removes a try/except that would catch everything and return a 'fail' status and a possibly related error message. Instead, just let the method except and allow it to get caught and logged as a python exception. Signed-off-by: Dylan Baker <baker.dylan.c@gmail.com> Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
-rw-r--r--framework/exectest.py22
1 files changed, 9 insertions, 13 deletions
diff --git a/framework/exectest.py b/framework/exectest.py
index 43c9a9946..4410115a9 100644
--- a/framework/exectest.py
+++ b/framework/exectest.py
@@ -273,16 +273,12 @@ class PiglitTest(Test):
outlines = self.result['out'].split('\n')
outpiglit = (s[7:] for s in outlines if s.startswith('PIGLIT:'))
- try:
- for piglit in outpiglit:
- if piglit.startswith('subtest'):
- if not 'subtest' in self.result:
- self.result['subtest'] = {}
- self.result['subtest'].update(eval(piglit[7:]))
- else:
- self.result.update(eval(piglit))
- self.result['out'] = '\n'.join(
- s for s in outlines if not s.startswith('PIGLIT:'))
- except:
- self.result['result'] = 'fail'
- self.result['note'] = 'Failed to parse result string'
+ for piglit in outpiglit:
+ if piglit.startswith('subtest'):
+ if not 'subtest' in self.result:
+ self.result['subtest'] = {}
+ self.result['subtest'].update(eval(piglit[7:]))
+ else:
+ self.result.update(eval(piglit))
+ self.result['out'] = '\n'.join(
+ s for s in outlines if not s.startswith('PIGLIT:'))