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

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Sat Jun 18 15:52:21 2011
New Revision: 45918

URL: http://svn.erp5.org?rev=45918&view=rev
Log:
Handle filename extension for result files

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=45918&r1=45917&r2=45918&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] Sat Jun 18 15:52:21 2011
@@ -60,6 +60,11 @@ class NoSQLTester(object):
         # override it
         conflict_handler='resolve'))
 
+    if self.argument_namespace.compress_method:
+      self._filename_extension = '.' + self.argument_namespace.compress_method
+    else:
+      self._filename_extension = ''
+
     self.childpid = -1
     self.lock = Lock()
 
@@ -151,12 +156,12 @@ class NoSQLTester(object):
                                        report.rstrip(self.argument_namespace.compress_method))):
           data = None
           f = open(os.path.join(self.argument_namespace.report_directory,
-                                report.rstrip(self.argument_namespace.compress_method)), "rb")
+                                report.rstrip(self._filename_extension)), "rb")
           if not self.argument_namespace.compress_method:
             data = f.read(size)
-          elif self.argument_namespace.compress_method == ".bz2":
+          elif self.argument_namespace.compress_method == "bz2":
             data = bz2.compress(f.read(size), 9)
-          elif self.argument_namespace.compress_method == ".zip":
+          elif self.argument_namespace.compress_method == "zip":
             # z = ZipFile(os.path.join(os.getcwd(),
             #                          self.argument_namespace.report_filename + '.zip'),
             #             'w')
@@ -219,7 +224,7 @@ class NoSQLTester(object):
     values['filename'] = filename
     values['url'] = "http://[%s]:%d/result/%s?size=%d" % (self.argument_namespace.tester_address,
                                                           self.argument_namespace.tester_port,
-                                                          filename,
+                                                          filename + self._filename_extension,
                                                           size)
     values['compress_method'] = self.argument_namespace.compress_method
     values['partial'] = partial