[Erp5-report] r45865 guillaume.bottex - in /slapos/trunk: recipe/slapos.recipe.sheepdogtest...

[nobody at svn.erp5.org]

Author: guillaume.bottex
Date: Fri May 20 10:45:28 2011
New Revision: 45865

URL: http://svn.erp5.org?rev=45865&view=rev
Log:
Fixing sheepdog testbed and its nosqltester plugin.

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

Modified: slapos/trunk/recipe/slapos.recipe.sheepdogtestbed/src/slapos/recipe/sheepdogtestbed/__init__.py
URL: http://svn.erp5.org/slapos/trunk/recipe/slapos.recipe.sheepdogtestbed/src/slapos/recipe/sheepdogtestbed/__init__.py?rev=45865&r1=45864&r2=45865&view=diff
==============================================================================
--- slapos/trunk/recipe/slapos.recipe.sheepdogtestbed/src/slapos/recipe/sheepdogtestbed/__init__.py [utf8] (original)
+++ slapos/trunk/recipe/slapos.recipe.sheepdogtestbed/src/slapos/recipe/sheepdogtestbed/__init__.py [utf8] Fri May 20 10:45:28 2011
@@ -99,7 +99,7 @@ class SheepDogTestBed(BaseSlapRecipe):
     tester_config['tester_address'] = self.getGlobalIPv6Address()
     tester_config['report_path'] = self.log_directory
     tester_config['binary'] = tester_config['sheepstrike_binary'] + \
-                              " -l 192.168.1.1 -t " + \
+                              " -t " + \
                               tester_config['nb_thread'] + " " + \
                               tester_config['nb_request'] #" 1000" " -t 32 1024000"
 

Modified: slapos/trunk/util/slapos.tool.nosqltester_manager.sheepdog/src/slapos/tool/nosqltester_manager/sheepdog/__init__.py
URL: http://svn.erp5.org/slapos/trunk/util/slapos.tool.nosqltester_manager.sheepdog/src/slapos/tool/nosqltester_manager/sheepdog/__init__.py?rev=45865&r1=45864&r2=45865&view=diff
==============================================================================
--- slapos/trunk/util/slapos.tool.nosqltester_manager.sheepdog/src/slapos/tool/nosqltester_manager/sheepdog/__init__.py [utf8] (original)
+++ slapos/trunk/util/slapos.tool.nosqltester_manager.sheepdog/src/slapos/tool/nosqltester_manager/sheepdog/__init__.py [utf8] Fri May 20 10:45:28 2011
@@ -82,8 +82,8 @@ class SheepdogTesterManager(NoSQLTesterM
       f = open(inputname, "r")
       lines = f.readlines()
       f.close()
-      for i in range(8, lines.__len__()):
-        if i != 13 and i != 14:
+      for i in range(6, lines.__len__()):
+        if i != 11 and i != 12:
           l.append(re.findall(r'\d+\.\d+|\d+',lines[i])[0].replace('.', ','))
       output.writerow(l)