Changeset 2762

Timestamp:

Apr 26, 2006, 2:48:11 PM (19 years ago)

Author:

duncan

Message:

fixing test_all ticket issue #72

Location:

inundation

Files:

• pyvolution/domain.py (modified) (1 diff)
• pyvolution/quantity.py (modified) (1 diff)
• test_all.py (modified) (4 diffs)

inundation/pyvolution/domain.py

@@ -8 +8 @@
 """
 
-from mesh import Mesh
-from generic_boundary_conditions import Boundary
-from generic_boundary_conditions import File_boundary
-from generic_boundary_conditions import Dirichlet_boundary
-from generic_boundary_conditions import Time_boundary
-from generic_boundary_conditions import Transmissive_boundary
-from pmesh2domain import pmesh_to_domain
+from pyvolution.mesh import Mesh
+from pyvolution.generic_boundary_conditions import Boundary
+from pyvolution.generic_boundary_conditions import File_boundary
+from pyvolution.generic_boundary_conditions import Dirichlet_boundary
+from pyvolution.generic_boundary_conditions import Time_boundary
+from pyvolution.generic_boundary_conditions import Transmissive_boundary
+from pyvolution.pmesh2domain import pmesh_to_domain
 
 import types

inundation/pyvolution/quantity.py

@@ -20 +20 @@
     def __init__(self, domain, vertex_values=None):
 
-        from mesh import Mesh
+        from pyvolution.mesh import Mesh
         from Numeric import array, zeros, Float
 

inundation/test_all.py

@@ -11 +11 @@
 import unittest
 import os
+import sys
 
 
@@ -33 +34 @@
 def get_test_files(path):
 
-    import sys
 
     try:
@@ -43 +43 @@
     test_files = []
 
+    #Exclude svn admin dirs
+    files = [x for x in files if x not in exclude_dirs]
+    path_files = []
     for file in files:
-
-        #Exclude svn admin dirs
-        if file in exclude_dirs:
-            continue
 
         absolute_filename = path + os.sep + file
 
+        #sys.path.append('pmesh')
         if os.path.isdir(absolute_filename):
             sys.path.append(file) #FIXME: May cause name conflicts between pyvolution\mesh.py and pmesh\mesh.py on some systems
+            path_files.append(file)
             print 'Recursing into', file
-            test_files += get_test_files(absolute_filename)
+            more_test_files, more_path_files =get_test_files(absolute_filename)
+            test_files += more_test_files
+            path_files += more_path_files
         elif file.startswith('test_') and file.endswith('.py'):
             test_files.append(file)
         else:
             pass
-    return test_files
+    return test_files , path_files
 
 
 
 def regressionTest():
-    import os, unittest
     path = os.getcwd()
-
-    files = [x for x in  get_test_files(path) if not x == 'test_all.py']
+    test_files, path_files = get_test_files(path)
+    files = [x for x in test_files if not x == 'test_all.py']
 
     print 'Testing path %s:' %('...'+path[-50:])
     for file in files:
         print '  ' + file
-
     if globals().has_key('exclude_files'):
         for file in exclude_files:
@@ -78 +79 @@
             print 'WARNING: File '+ file + ' excluded from testing'
 
-
     filenameToModuleName = lambda f: os.path.splitext(f)[0]
     moduleNames = map(filenameToModuleName, files)
     modules = map(__import__, moduleNames)
+
+    # Fix up the system path
+    for file in path_files:
+        sys.path.remove(file)
+        
     load = unittest.defaultTestLoader.loadTestsFromModule
     return unittest.TestSuite(map(load, modules))