Browse Source

Merge branch 'fix-one-result' of http://github.com/methane/FrameworkBenchmarks into 893

James Yen 11 years ago
parent
commit
34219a9163
1 changed files with 9 additions and 1 deletions
  1. 9 1
      toolset/benchmark/benchmarker.py

+ 9 - 1
toolset/benchmark/benchmarker.py

@@ -492,6 +492,7 @@ class Benchmarker:
           test_process = Process(target=self.__run_test, args=(test,))
           test_process.start()
           test_process.join(self.run_test_timeout_seconds)
+          self.__load_results()  # Load intermediate result from child process
           if(test_process.is_alive()):
             logging.debug("Child process for {name} is still alive. Terminating.".format(name=test.name))
             self.__write_intermediate_results(test.name,"__run_test timeout (="+ str(self.run_test_timeout_seconds) + " seconds)")
@@ -573,7 +574,7 @@ class Benchmarker:
           p.communicate("""
             sudo restart mysql
             sudo restart mongodb
-  		      sudo /etc/init.d/postgresql restart
+            sudo /etc/init.d/postgresql restart
           """)
           time.sleep(10)
 
@@ -830,6 +831,13 @@ class Benchmarker:
   # End __write_intermediate_results
   ############################################################
 
+  def __load_results(self):
+    try:
+      with open(os.path.join(self.latest_results_directory, 'results.json')) as f:
+        self.results = json.load(f)
+    except (ValueError, IOError):
+      pass
+
   ############################################################
   # __finish
   ############################################################