[Erp5-report] r45959 arnaud.fontaine - /erp5/trunk/utils/erp5.utils.benchmark/src/erp5/util...

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Fri Jul  1 17:42:46 2011
New Revision: 45959

URL: http://svn.erp5.org?rev=45959&view=rev
Log:
Add partial argument (matching nosqltester API)

Modified:
    erp5/trunk/utils/erp5.utils.benchmark/src/erp5/utils/benchmark/benchmark.py
    erp5/trunk/utils/erp5.utils.benchmark/src/erp5/utils/benchmark/scalability_tester.py

Modified: erp5/trunk/utils/erp5.utils.benchmark/src/erp5/utils/benchmark/benchmark.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.utils.benchmark/src/erp5/utils/benchmark/benchmark.py?rev=45959&r1=45958&r2=45959&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.utils.benchmark/src/erp5/utils/benchmark/benchmark.py [utf8] (original)
+++ erp5/trunk/utils/erp5.utils.benchmark/src/erp5/utils/benchmark/benchmark.py [utf8] Fri Jul  1 17:42:46 2011
@@ -245,12 +245,12 @@ class BenchmarkResult(object):
     self._suite_idx += 1
 
   @abc.abstractmethod
-  def flush(self):
+  def flush(self, partial=True):
     self._all_result_list = []
 
   @abc.abstractmethod
   def __exit__(self, exc_type, exc_value, traceback):
-    self.flush()
+    self.flush(partial=False)
     return True
 
 class CSVBenchmarkResult(BenchmarkResult):
@@ -288,7 +288,7 @@ class CSVBenchmarkResult(BenchmarkResult
 
     return self
 
-  def flush(self):
+  def flush(self, partial=True):
     if self._result_file.tell() == 0:
       self._csv_writer.writerow(self.label_list)
 
@@ -296,7 +296,7 @@ class CSVBenchmarkResult(BenchmarkResult
     self._result_file.flush()
     os.fsync(self._result_file.fileno())
 
-    super(CSVBenchmarkResult, self).flush()
+    super(CSVBenchmarkResult, self).flush(partial)
 
   def __exit__(self, exc_type, exc_value, traceback):
     super(CSVBenchmarkResult, self).__exit__(exc_type, exc_value, traceback)
@@ -329,7 +329,7 @@ class ERP5BenchmarkResult(BenchmarkResul
     self._log_buffer_list.append(self.log_file.getvalue())
     self.log_file.seek(0)
 
-  def flush(self):
+  def flush(self, partial=True):
     benchmark_result = xmlrpclib.ServerProxy(
       self._argument_namespace.erp5_publish_url,
       verbose=True,

Modified: erp5/trunk/utils/erp5.utils.benchmark/src/erp5/utils/benchmark/scalability_tester.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.utils.benchmark/src/erp5/utils/benchmark/scalability_tester.py?rev=45959&r1=45958&r2=45959&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.utils.benchmark/src/erp5/utils/benchmark/scalability_tester.py [utf8] (original)
+++ erp5/trunk/utils/erp5.utils.benchmark/src/erp5/utils/benchmark/scalability_tester.py [utf8] Fri Jul  1 17:42:46 2011
@@ -31,10 +31,11 @@
 from benchmark import CSVBenchmarkResult
 
 class CSVScalabilityBenchmarkResult(CSVBenchmarkResult):
-  def flush(self):
-    super(CSVScalabilityBenchmarkResult, self).flush()
+  def flush(self, partial=True):
+    super(CSVScalabilityBenchmarkResult, self).flush(partial)
     self._argument_namespace.notify_method(self._result_filename,
-                                           self._result_file.tell())
+                                           self._result_file.tell(),
+                                           partial=partial)
 
 from erp5.utils.benchmark.performance_tester import PerformanceTester