Browse Source

Fixing syntax errors

Hamilton Turner 11 years ago
parent
commit
15f6d715c2
2 changed files with 5 additions and 5 deletions
  1. 4 4
      toolset/benchmark/benchmarker.py
  2. 1 1
      toolset/benchmark/framework_test.py

+ 4 - 4
toolset/benchmark/benchmarker.py

@@ -643,16 +643,16 @@ class Benchmarker:
     except (OSError, IOError, subprocess.CalledProcessError) as e:
       self.__write_intermediate_results(test.name,"<setup.py> raised an exception")
       log.error(Header("Subprocess Error %s" % test.name))
-      log.error("%s" % e)
-      log.error("%s" % sys.exc_info()[:2])
+      log.error("%s", e)
+      log.error("%s", sys.exc_info()[:2])
       log.debug("Subprocess Error Details", exc_info=True)
       try:
         test.stop(log)
       except (subprocess.CalledProcessError) as e:
         self.__write_intermediate_results(test.name,"<setup.py>#stop() raised an error")
         log.error(Header("Subprocess Error: Test .stop() raised exception %s" % test.name))
-        log.error("%s" % e)
-        log.error("%s" % sys.exc_info()[:2])
+        log.error("%s", e)
+        log.error("%s", sys.exc_info()[:2])
         log.debug("Subprocess Error Details", exc_info=True)
     except (KeyboardInterrupt, SystemExit) as e:
       test.stop(log)

+ 1 - 1
toolset/benchmark/framework_test.py

@@ -636,7 +636,7 @@ class FrameworkTest:
             pass
         if self.plaintext_url_passed:
           remote_script = self.__generate_concurrency_script(self.plaintext_url, self.port, self.accept_plaintext, wrk_command="wrk", intervals=[256,1024,4096,16384], pipeline="16")
-          self.__run_benchmark(remote_script, output_file, err)
+          self.__run_benchmark(remote_script, output_file, logger)
         results = self.__parse_test(self.PLAINTEXT)
         self.benchmarker.report_results(framework=self, test=self.PLAINTEXT, results=results['results'])
         logger.info( "Complete" )