[Erp5-report] r23751 - /erp5/trunk/products/ERP5Type/tests/

[nobody at svn.erp5.org]

Author: romain
Date: Tue Sep 23 10:05:17 2008
New Revision: 23751

URL: http://svn.erp5.org?rev=23751&view=rev
Log:
Local directory Extensions should be handle like Document, Propertysheet and
Constraint (as it can be modified by portal_classes).
Clean local directories when using option --save, to prevent using old files.

Modified:
    erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py
    erp5/trunk/products/ERP5Type/tests/custom_zodb.py
    erp5/trunk/products/ERP5Type/tests/runUnitTest.py

Modified: erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py?rev=23751&r1=23750&r2=23751&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py Tue Sep 23 10:05:17 2008
@@ -764,7 +764,7 @@
                 ZopeTestCase._print('done\n')
               if not quiet:
                 ZopeTestCase._print('Dumping static files... ')
-              for dir in ('Constraint', 'Document', 'PropertySheet'):
+              for dir in ('Constraint', 'Document', 'PropertySheet', 'Extensions'):
                 os.system('rm -rf %s/%s.bak' % (instance_home, dir))
                 os.system('cp -ar %s/%s %s/%s.bak' % (instance_home, dir, instance_home, dir))
               if not quiet:

Modified: erp5/trunk/products/ERP5Type/tests/custom_zodb.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/custom_zodb.py?rev=23751&r1=23750&r2=23751&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/custom_zodb.py (original)
+++ erp5/trunk/products/ERP5Type/tests/custom_zodb.py Tue Sep 23 10:05:17 2008
@@ -17,12 +17,16 @@
   assert os.system("mysql %s < %s/dump.sql" % (
                 getMySQLArguments(), instance_home)) == 0
   print("Restoring static files ... ")
-  for dir in ('Constraint', 'Document', 'PropertySheet'):
+  for dir in ('Constraint', 'Document', 'PropertySheet', 'Extensions'):
     if os.path.exists('%s/%s.bak' % (instance_home, dir)):
       assert os.system('rm -rf %s/%s' % (instance_home, dir)) == 0
       assert os.system('cp -ar %s/%s.bak %s/%s' % (
                 instance_home, dir, instance_home, dir)) == 0
 elif os.environ.get('erp5_save_data_fs'):
+  print("Cleaning static files ... ")
+  for dir in ('Constraint', 'Document', 'PropertySheet', 'Extensions'):
+    if os.path.exists('%s/%s' % (instance_home, dir)):
+      assert os.system('rm -f %s/%s/*' % (instance_home, dir)) == 0
   if os.path.exists(new_data_fs_path):
     os.remove(new_data_fs_path)
   Storage = FileStorage(new_data_fs_path)

Modified: erp5/trunk/products/ERP5Type/tests/runUnitTest.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/runUnitTest.py?rev=23751&r1=23750&r2=23751&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/runUnitTest.py (original)
+++ erp5/trunk/products/ERP5Type/tests/runUnitTest.py Tue Sep 23 10:05:17 2008
@@ -77,11 +77,11 @@
                            instance_home):
   if not os.path.exists(instance_home):
     os.mkdir(instance_home)
-  for d in ('Constraint', 'Document', 'PropertySheet', 'bin', 'etc', 'tests', 'var', 'log'):
+  for d in ('Extensions', 'Constraint', 'Document', 'PropertySheet', 'bin', 'etc', 'tests', 'var', 'log'):
     path = os.path.join(instance_home, d)
     if not os.path.exists(path):
       os.mkdir(path)
-  for d in ('Extensions', 'Products', 'bt5', 'svn', 'lib'):
+  for d in ('Products', 'bt5', 'svn', 'lib'):
     src = os.path.join(real_instance_home, d)
     dst = os.path.join(instance_home, d)
     if not os.path.exists(dst):