summaryrefslogtreecommitdiff
path: root/tests/es3conform.py
diff options
context:
space:
mode:
authorDylan Baker <baker.dylan.c@gmail.com>2014-04-10 16:27:40 -0700
committerDylan Baker <baker.dylan.c@gmail.com>2014-04-17 08:00:17 -0700
commitfb6c545d880791f8e3057bbd86dd5cdf1bf3a3d3 (patch)
tree56aed87a59d2671fe1951dec7ce6b621e2ecd7fb /tests/es3conform.py
parent83ee6944bb5cce025ed8fadc57cfd212225bc1b8 (diff)
framework: stop passing duplicate arguments
A number of methods in Test require to have stdout, the returncode and the TestResult() instance passed into them. This is redundant since the TestResult() instance already has all of that information in it. Since a lot of methods need this information make the TestResult() an instance attribute. Signed-off-by: Dylan Baker <baker.dylan.c@gmail.com> Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Diffstat (limited to 'tests/es3conform.py')
-rw-r--r--tests/es3conform.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/es3conform.py b/tests/es3conform.py
index 0aefe5825..b94cb06d5 100644
--- a/tests/es3conform.py
+++ b/tests/es3conform.py
@@ -55,13 +55,12 @@ class GTFTest(Test):
'-minfmt', '-width=113', '-height=47',
'-run=' + testpath])
- def interpret_result(self, out, returncode, results):
- mo = self.pass_re.search(out)
+ def interpret_result(self):
+ mo = self.pass_re.search(self.result['out'])
if mo is not None and int(mo.group('passed')) > 0:
- results['result'] = 'pass'
+ self.result['result'] = 'pass'
else:
- results['result'] = 'fail'
- return out
+ self.result['result'] = 'fail'
def populateTests(runfile):
"Read a .run file, adding any .test files to the profile"