[Piglit] [PATCH 12/19] framework: Don't pass json_writer to Test.execute

[Dylan Baker]

This is a really sill pass, since all of the information that we want
to write is actually available to profile.run(), so not passing it
reduces some code complexity.

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 framework/exectest.py | 5 +----
 framework/profile.py  | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/framework/exectest.py b/framework/exectest.py
index cb07ae0..72aaf8e 100644
--- a/framework/exectest.py
+++ b/framework/exectest.py
@@ -87,7 +87,7 @@ class Test(object):
         # self.run is called.
         self._test_hook_execute_run = lambda: None
 
-    def execute(self, path, log, json_writer, dmesg):
+    def execute(self, path, log, dmesg):
         """ Run a test
 
         Run a test, but with features. This times the test, uses dmesg checking
@@ -96,7 +96,6 @@ class Test(object):
         Arguments:
         path -- the name of the test
         log -- a log.Log instance
-        json_writer -- a results.JSONWriter instance
         dmesg -- a dmesg.BaseDmesg derived class
 
         """
@@ -122,8 +121,6 @@ class Test(object):
 
             log.log(path, self.result['result'])
             log.post_log(log_current, self.result['result'])
-
-            json_writer.write_test(path, self.result)
         else:
             log.log(path, 'dry-run')
             log.post_log(log_current, 'dry-run')
diff --git a/framework/profile.py b/framework/profile.py
index 5428890..8dfb741 100644
--- a/framework/profile.py
+++ b/framework/profile.py
@@ -201,7 +201,8 @@ class TestProfile(object):
 
             """
             name, test = pair
-            test.execute(name, log, json_writer, self.dmesg)
+            test.execute(name, log, self.dmesg)
+            json_writer.write_test(name, test.result)
 
         def run_threads(pool, testlist):
             """ Open a pool, close it, and join it """
-- 
2.1.0