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

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Wed Jun 15 05:26:31 2011
New Revision: 45888

URL: http://svn.erp5.org?rev=45888&view=rev
Log:
Merge execute() into launch_tester() (renamed as run_tester()).

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=45888&r1=45887&r2=45888&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 05:26:31 2011
@@ -86,7 +86,7 @@ class NoSQLTester:
           pid = os.fork()
           
           if pid == 0:
-            result = self.launch_tester()
+            result = self.run_tester()
             if result == 0:
               filename = str(os.getpid())+".log"
               self.send_result_availability_notification(filename)
@@ -126,17 +126,15 @@ class NoSQLTester:
     except:
       self.logger.debug(Formatter().formatException(sys.exc_info()))
 
-  def execute(self, command):
+  def run_tester(self):
+    command = self.params['binary']
+    command += " > " + os.path.join(self.params['report_path'],self.params['report_filename'])
+
     result = os.WEXITSTATUS(os.system(command))
     if result == 127:
       raise ValueError, 'Command not found: %r' % (command, )
     return result
 
-  def launch_tester(self):
-    command = self.params['binary']
-    command += " > " + os.path.join(self.params['report_path'],self.params['report_filename'])
-    return self.execute(command)
-
 def usage():
   pass