Changeset 2331

Timestamp:

Feb 3, 2006, 11:20:56 AM (19 years ago)

Author:

duncan

Message:

bug fix

Files:

• inundation/pmesh/compile.py (modified) (1 diff)
• inundation/test_all.py (modified) (2 diffs)
• test_all.py (modified) (1 diff)

inundation/pmesh/compile.py

@@ -298 +298 @@
       path = '.'
       files = os.listdir(path)
-      
-      
-
+        
   for filename in files:
       root, ext = splitext(filename)

inundation/test_all.py

@@ -16 +16 @@
 #E.g. if they are known to fail and under development
 exclude_files = ['test_metis.py', 'test_version.py',
-                 'test_interpolate.py'  # this is under development
+                 'test_interpolate.py',# this is under development
                  ]
                  #'test_calculate_region.py', 'test_calculate_point.py']
@@ -59 +59 @@
     import os, unittest
     path = os.getcwd()
-
-    files = get_test_files(path)
-
-
-    while __file__ in files:
-        try:
-            files.remove(__file__)  #Remove self from list (Ver 2.3. or later)
-        except:
-            files.remove('test_all.py')
-
-
+    
+    files = [x for x in  get_test_files(path) if not x == 'test_all.py']
+    
     print 'Testing path %s:' %('...'+path[-50:])
     for file in files:

test_all.py

@@ -3 +3 @@
 buildroot = os.getcwd()
 os.chdir('inundation')
-print 'Changing to', os.getcwd()        
+print 'Changing to', buildroot   
 
 execfile('test_all.py')