[Erp5-report] r13700 - /erp5/trunk/utils/oood/testOoodHighLoad.py

[nobody at svn.erp5.org]

Author: bartek
Date: Tue Mar 27 12:15:45 2007
New Revision: 13700

URL: http://svn.erp5.org?rev=13700&view=rev
Log:
check index file before proceeding; acquire/release locks in a more reasonable way;

Modified:
    erp5/trunk/utils/oood/testOoodHighLoad.py

Modified: erp5/trunk/utils/oood/testOoodHighLoad.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/testOoodHighLoad.py?rev=13700&r1=13699&r2=13700&view=diff
==============================================================================
--- erp5/trunk/utils/oood/testOoodHighLoad.py (original)
+++ erp5/trunk/utils/oood/testOoodHighLoad.py Tue Mar 27 12:15:45 2007
@@ -55,12 +55,24 @@
 sp = ServerProxy('http://%s:%d' % (config.server_host, config.server_port), allow_none = True)
 
 # create a list of od? files if not present
+# first check if the oood_home is writeable
+if not os.access(config.oood_home, os.W_OK):
+  print 'the %s directory is not writeable for me' % config.oood_home
+  print 'I cant proceed'
+  print 'please make it writeable so that I can create "all_odf_docs" file'
+  sys.exit(1)
+
 all_odfs_name = config.oood_home + '/all_odf_docs'
 all_odfs_creation_command = 'find / | egrep "\.od[stp]{1}$" > %s' % all_odfs_name
 if not os.path.exists(all_odfs_name):
   print "creating a list of ODF documents in the system - this can take a while, but I do it only once..."
   os.system(all_odfs_creation_command)
 file_names = open(all_odfs_name).readlines()
+if len(file_names) == 0:
+  print 'all_odf_docs file is empty'
+  print 'please remove it and start again'
+  sys.exit(1)
+#file_names= file_names[50:]
 
 def log(msg):
   """
@@ -103,11 +115,9 @@
       res = bool(res)
       self.failUnless(res)
     except Exception, e:
-      print e
-      try:
-        lock.release()
-      except: # we ignore "release unlocked lock" exception
-        pass
+      # release lock if exception was raised before it was released
+      lock.acquire(False)
+      lock.release()
       raise
 
   def testRandomLoad(self):