Browse Source

Fixed benchmarker.py#__write_intermediate_results() - thank you Michael R.

Shawn Bandy 12 years ago
parent
commit
fe62426e76
3 changed files with 3 additions and 3 deletions
  1. 1 1
      gemini/Docroot/WEB-INF/resin.xml
  2. BIN
      toolset/.run-tests.py.swp
  3. 2 2
      toolset/benchmark/benchmarker.py

+ 1 - 1
gemini/Docroot/WEB-INF/resin.xml

@@ -14,7 +14,7 @@
     </server>
 
     <host>
-      <web-app id="/" root-directory="/home/hyoung/FrameworkBenchmarks/gemini/Docroot" />
+      <web-app id="/" root-directory="/home/sbandy/FrameworkBenchmarks/gemini/Docroot" />
     </host>
 
   </cluster>

BIN
toolset/.run-tests.py.swp


+ 2 - 2
toolset/benchmark/benchmarker.py

@@ -500,7 +500,7 @@ class Benchmarker:
         Saving results through {name}
         ----------------------------------------------------
         )""".format(name=test.name))
-        self.__write_intermediate_results(test.name,"completed successfully")
+        self.__write_intermediate_results(test.name,time.strftime("%Y%m%d%H%M%S", time.localtime()))
       except (OSError, subprocess.CalledProcessError):
         self.__write_intermediate_results(test.name,"<setup.py> raised an exception")
         print textwrap.dedent("""
@@ -639,7 +639,7 @@ class Benchmarker:
   ############################################################
   # __write_intermediate_results
   ############################################################
-  def __write_intermediate_results(test_name,status_message):
+  def __write_intermediate_results(self,test_name,status_message):
     try:
       self.results["completed"][test_name] = status_message
       with open(os.path.join(self.latest_results_directory, 'results.json'), 'w') as f: