[Erp5-report] r45887 guillaume.bottex - /slapos/trunk/util/slapos.tool.nosqltester/src/slap...

[nobody at svn.erp5.org]

Author: guillaume.bottex
Date: Wed Jun 15 05:01:47 2011
New Revision: 45887

URL: http://svn.erp5.org?rev=45887&view=rev
Log:
Few improvements.

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=45887&r1=45886&r2=45887&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:01:47 2011
@@ -88,7 +88,8 @@ class NoSQLTester:
           if pid == 0:
             result = self.launch_tester()
             if result == 0:
-              self.send_result_availability_notification()
+              filename = str(os.getpid())+".log"
+              self.send_result_availability_notification(filename)
             os._exit(os.EX_OK)
           else:
             self.lock.acquire()
@@ -108,9 +109,10 @@ class NoSQLTester:
     app.run(host=self.params['address'], port=self.params['port'], threaded=True)
 
 
-  def send_result_availability_notification(self):
+  def send_result_availability_notification(self, filename=None):
     values = {}
-    values['filename'] = str(os.getpid())+".log"
+    if filename != None:
+      values['filename'] = filename
     values['url'] = "http://"+self.params['address']+":"+str(self.params['port'])+"/result/"+self.params['report_filename']
     values['compress_method'] = self.params['compress_method']
     
@@ -148,15 +150,14 @@ def main(argv=None):
             # who wants to download the report
             'host_address':"",
             'host_port':5000,
-            'num':1000,
             'report_path':"/var/log",
-            'binary':"echo lol",
+            'binary':"echo nothing",
             'report_filename':"report.log",
             # 'debug':False,
             'debug':True,
             'compress_method':"",
             'log_directory':"/var/log",
-            'plugin_name':None}
+            'plugin_name':""}
 
   if argv == None:
     argv = sys.argv[1:]
@@ -164,7 +165,7 @@ def main(argv=None):
   try:
     opts, args = getopt.getopt(argv, "m:q:a:p:n:r:b:o:dc:l:", \
                                     ["manager=", "manager-port=", "address=", "port=", \
-                                     "request-number=", "report-path=","binary=","output=", \
+                                     "plugin-name=", "report-path=","binary=","output=", \
                                      "debug", "compress-method=", "log-directory="])
   except getopt.GetoptError:
     usage()
@@ -179,8 +180,8 @@ def main(argv=None):
       params['address'] = arg
     elif opt in ("-p", "--port"):
       params['port'] = int(arg)
-    elif opt in ("-n", "--request-number"):
-      params['num'] = int(arg)
+    elif opt in ("-n", "--plugin-name"):
+      params['plugin_name'] = int(arg)
     elif opt in ("-r", "--report-path"):
       params['report_path'] = arg
     elif opt in ("-b", "--binary"):
@@ -202,10 +203,10 @@ def main(argv=None):
     print "You must at least give the host address"
     sys.exit()
 
-  if args.__len__() == 1:
-    params['plugin_name'] = args[0]
-  else:
-    params['plugin_name'] = ""
+  if args.__len__() > 0:
+    params['argv'] = args
+  else
+    params['argv'] = []
 
   if params['plugin_name'] != "":
     entry_point = iter_entry_points(group='slapos.tool.nosqltester.plugin', name=params['plugin_name']).next()