Browse Source

Fix plaintext default settings, open raw output file before using

Hamilton Turner 10 years ago
parent
commit
8a1a36df4b
1 changed files with 7 additions and 4 deletions
  1. 7 4
      toolset/benchmark/framework_test.py

+ 7 - 4
toolset/benchmark/framework_test.py

@@ -297,7 +297,9 @@ class FrameworkTest:
           pass
           pass
 
 
       if test.passed:
       if test.passed:
-        if test.requires_db:
+        if test_type == 'plaintext': # One special case
+          remote_script = self.__generate_concurrency_script(test.get_url(), self.port, test.accept_header, levels=[256,1024,4096,16384], pipeline="16")
+        elif test.requires_db:
           remote_script = self.__generate_query_script(test.get_url(), self.port, test.accept_header)
           remote_script = self.__generate_query_script(test.get_url(), self.port, test.accept_header)
         else:
         else:
           remote_script = self.__generate_concurrency_script(test.get_url(), self.port, test.accept_header)
           remote_script = self.__generate_concurrency_script(test.get_url(), self.port, test.accept_header)
@@ -306,9 +308,10 @@ class FrameworkTest:
         self.__begin_logging(test_type)
         self.__begin_logging(test_type)
         
         
         # Run the benchmark 
         # Run the benchmark 
-        p = subprocess.Popen(self.benchmarker.client_ssh_string.split(" "), stdin=subprocess.PIPE, stdout=output_file, stderr=err)
-        p.communicate(remote_script)
-        err.flush()
+        with open(output_file, 'w') as raw_file:
+          p = subprocess.Popen(self.benchmarker.client_ssh_string.split(" "), stdin=subprocess.PIPE, stdout=raw_file, stderr=err)
+          p.communicate(remote_script)
+          err.flush()
 
 
         # End resource usage metrics collection
         # End resource usage metrics collection
         self.__end_logging()
         self.__end_logging()