[Erp5-report] r45960 arnaud.fontaine - /slapos/trunk/util/slapos.tool.nosqltester_manager/s...

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Mon Jul  4 10:58:12 2011
New Revision: 45960

URL: http://svn.erp5.org?rev=45960&view=rev
Log:
Fix adding node when given a range of users

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

Modified: slapos/trunk/util/slapos.tool.nosqltester_manager/src/slapos/tool/nosqltester_manager/__init__.py
URL: http://svn.erp5.org/slapos/trunk/util/slapos.tool.nosqltester_manager/src/slapos/tool/nosqltester_manager/__init__.py?rev=45960&r1=45959&r2=45960&view=diff
==============================================================================
--- slapos/trunk/util/slapos.tool.nosqltester_manager/src/slapos/tool/nosqltester_manager/__init__.py [utf8] (original)
+++ slapos/trunk/util/slapos.tool.nosqltester_manager/src/slapos/tool/nosqltester_manager/__init__.py [utf8] Mon Jul  4 10:58:12 2011
@@ -74,10 +74,6 @@ class NoSQLTesterManager(object):
     self.max_server = int(params['nb_server_max'])
     self.max_tester = int(params['nb_tester_max'])
     self.node_increment = int(params['node_increment'])
-
-    self.current_max_tester = self.nb_init_tester
-    self.current_max_server = self.nb_init_server
-
     self.software_release_url = params['software_release_url']
     self.server_url = params['server_url']
     self.key_file = params['key_file']
@@ -324,28 +320,22 @@ class NoSQLTesterManager(object):
             f.write(data)
             f.close()
             
-            if 'partial' in request.form and request.form['partial'] == unicode(True):
-              pass
-            else:
+            if not ('partial' in request.form and request.form['partial'] == unicode(True)):
               self.todo -= 1
             
             if self.todo == 0:
               self.writeCSV(self.reports, os.path.join(self.log_directory, 'report'+str(self.node_count)+'.csv'))
               self.reports = []
-              self.node_count += 1
 
-              if self.node_count >= getattr(self, "current_max_%s" % self.node_type):
-                if getattr(self, "current_max_%s" % self.node_type) < getattr(self, "max_%s" % self.node_type):
-                  self.add_node()
-                  self.todo = self.tester_urls.__len__()
-                  os.write(self.write_pipe, "GO")
-                  self.node_count = 0
-                  setattr(self, 'current_max_%s' % self.node_type,
-                          getattr(self, 'current_max_%s' % self.node_type) + self.node_increment)
-                else:
-                  os.write(self.write_pipe, "END")
-                  os.close(self.write_pipe)
-                  self.write_pipe = -1
+              if self.node_count < getattr(self, "max_%s" % self.node_type):
+                self.add_node()
+                self.todo = self.tester_urls.__len__()
+                os.write(self.write_pipe, "GO")
+                self.node_count += self.node_increment
+              else:
+                os.write(self.write_pipe, "END")
+                os.close(self.write_pipe)
+                self.write_pipe = -1
           else:
             self.logger.debug("No data: url='%s', filename='%s', "
                               "compress_method='%s'" % (request.form['url'],