[Erp5-report] r45889 arnaud.fontaine - /slapos/trunk/util/slapos.tool.nosqltester/src/slapo...

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Wed Jun 15 07:23:18 2011
New Revision: 45889

URL: http://svn.erp5.org?rev=45889&view=rev
Log:
Create a single report file and send the results when the tester is finished.

Modified:
    slapos/trunk/util/slapos.tool.nosqltester/src/slapos/tool/nosqltester/__init__.py

Modified: slapos/trunk/util/slapos.tool.nosqltester/src/slapos/tool/nosqltester/__init__.py
URL: http://svn.erp5.org/slapos/trunk/util/slapos.tool.nosqltester/src/slapos/tool/nosqltester/__init__.py?rev=45889&r1=45888&r2=45889&view=diff
==============================================================================
--- slapos/trunk/util/slapos.tool.nosqltester/src/slapos/tool/nosqltester/__init__.py [utf8] (original)
+++ slapos/trunk/util/slapos.tool.nosqltester/src/slapos/tool/nosqltester/__init__.py [utf8] Wed Jun 15 07:23:18 2011
@@ -87,9 +87,6 @@ class NoSQLTester:
           
           if pid == 0:
             result = self.run_tester()
-            if result == 0:
-              filename = str(os.getpid())+".log"
-              self.send_result_availability_notification(filename)
             os._exit(os.EX_OK)
           else:
             self.lock.acquire()
@@ -108,12 +105,10 @@ class NoSQLTester:
 
     app.run(host=self.params['address'], port=self.params['port'], threaded=True)
 
-
-  def send_result_availability_notification(self, filename=None):
+  def send_result_availability_notification(self, filename):
     values = {}
-    if filename != None:
-      values['filename'] = filename
-    values['url'] = "http://"+self.params['address']+":"+str(self.params['port'])+"/result/"+self.params['report_filename']
+    values['filename'] = filename
+    values['url'] = "http://"+self.params['address']+":"+str(self.params['port'])+"/result/"+filename
     values['compress_method'] = self.params['compress_method']
     
     if self.params['compress_method'] != None:
@@ -133,6 +128,10 @@ class NoSQLTester:
     result = os.WEXITSTATUS(os.system(command))
     if result == 127:
       raise ValueError, 'Command not found: %r' % (command, )
+
+    if result == 0:
+      self.send_result_availability_notification(self.params['report_filename'])
+
     return result
 
 def usage():