Browse Source

verify Syntax errors

Mike Smith 11 years ago
parent
commit
5379e694c2
1 changed files with 6 additions and 6 deletions
  1. 6 6
      toolset/benchmark/framework_test.py

+ 6 - 6
toolset/benchmark/framework_test.py

@@ -262,7 +262,7 @@ class FrameworkTest:
           # This should report results with a mark of failed JSON.
           # This should report results with a mark of failed JSON.
           results = dict()
           results = dict()
           results['results'] = []
           results['results'] = []
-        self.benchmarker.report_results(framework=self, test=self.JSON, results=results['results'], self.json_url_passed)
+        self.benchmarker.report_results(framework=self, test=self.JSON, results=results['results'], passed=self.json_url_passed)
         out.write( "Complete\n" )
         out.write( "Complete\n" )
         out.flush()
         out.flush()
     except AttributeError:
     except AttributeError:
@@ -276,7 +276,7 @@ class FrameworkTest:
         remote_script = self.__generate_concurrency_script(self.db_url, self.port, self.accept_json)
         remote_script = self.__generate_concurrency_script(self.db_url, self.port, self.accept_json)
         self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, self.DB), err)
         self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, self.DB), err)
         results = self.__parse_test(self.DB)
         results = self.__parse_test(self.DB)
-        self.benchmarker.report_results(framework=self, test=self.DB, results=results['results'], self.db_url_passed)
+        self.benchmarker.report_results(framework=self, test=self.DB, results=results['results'], passed=self.db_url_passed)
         out.write( "Complete\n" )
         out.write( "Complete\n" )
     except AttributeError:
     except AttributeError:
       traceback.print_exc()
       traceback.print_exc()
@@ -290,7 +290,7 @@ class FrameworkTest:
         remote_script = self.__generate_query_script(self.query_url, self.port, self.accept_json)
         remote_script = self.__generate_query_script(self.query_url, self.port, self.accept_json)
         self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, self.QUERY), err)
         self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, self.QUERY), err)
         results = self.__parse_test(self.QUERY)
         results = self.__parse_test(self.QUERY)
-        self.benchmarker.report_results(framework=self, test=self.QUERY, results=results['results'], self.query_url_passed)
+        self.benchmarker.report_results(framework=self, test=self.QUERY, results=results['results'], passed=self.query_url_passed)
         out.write( "Complete\n" )
         out.write( "Complete\n" )
         out.flush()
         out.flush()
     except AttributeError:
     except AttributeError:
@@ -305,7 +305,7 @@ class FrameworkTest:
         remote_script = self.__generate_concurrency_script(self.fortune_url, self.port, self.accept_html)
         remote_script = self.__generate_concurrency_script(self.fortune_url, self.port, self.accept_html)
         self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, self.FORTUNE), err)
         self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, self.FORTUNE), err)
         results = self.__parse_test(self.FORTUNE)
         results = self.__parse_test(self.FORTUNE)
-        self.benchmarker.report_results(framework=self, test=self.FORTUNE, results=results['results'], self.fortune_url_passed)
+        self.benchmarker.report_results(framework=self, test=self.FORTUNE, results=results['results'], passed=self.fortune_url_passed)
         out.write( "Complete\n" )
         out.write( "Complete\n" )
         out.flush()
         out.flush()
     except AttributeError:
     except AttributeError:
@@ -320,7 +320,7 @@ class FrameworkTest:
         remote_script = self.__generate_query_script(self.update_url, self.port, self.accept_json)
         remote_script = self.__generate_query_script(self.update_url, self.port, self.accept_json)
         self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, self.UPDATE), err)
         self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, self.UPDATE), err)
         results = self.__parse_test(self.UPDATE)
         results = self.__parse_test(self.UPDATE)
-        self.benchmarker.report_results(framework=self, test=self.UPDATE, results=results['results'], self.update_url_passed)
+        self.benchmarker.report_results(framework=self, test=self.UPDATE, results=results['results'], passed=self.update_url_passed)
         out.write( "Complete\n" )
         out.write( "Complete\n" )
         out.flush()
         out.flush()
     except AttributeError:
     except AttributeError:
@@ -336,7 +336,7 @@ class FrameworkTest:
         remote_script = self.__generate_concurrency_script(self.plaintext_url, self.port, self.accept_plaintext, wrk_command="wrk-pipeline", intervals=[256,1024,4096,16384], pipeline="--pipeline 16")
         remote_script = self.__generate_concurrency_script(self.plaintext_url, self.port, self.accept_plaintext, wrk_command="wrk-pipeline", intervals=[256,1024,4096,16384], pipeline="--pipeline 16")
         self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, self.PLAINTEXT), err)
         self.__run_benchmark(remote_script, self.benchmarker.output_file(self.name, self.PLAINTEXT), err)
         results = self.__parse_test(self.PLAINTEXT)
         results = self.__parse_test(self.PLAINTEXT)
-        self.benchmarker.report_results(framework=self, test=self.PLAINTEXT, results=results['results'], self.plaintext_url_passed)
+        self.benchmarker.report_results(framework=self, test=self.PLAINTEXT, results=results['results'], passed=self.plaintext_url_passed)
         out.write( "Complete\n" )
         out.write( "Complete\n" )
         out.flush()
         out.flush()
     except AttributeError:
     except AttributeError: