Changeset 9459

Timestamp:

Jan 21, 2015, 4:15:30 PM (10 years ago)

Author:

steve

Message:

removing test_all.py from folders so that nosetests works from those folders

Location:

trunk/anuga_core/source/anuga

Files:

• operators/test/all_tests.py (deleted)
• structures/test/data (moved) (moved from trunk/anuga_core/source/anuga/structures/data)
• structures/test/test_all.py (deleted)
• structures/test/test_inlet_operator.py (modified) (3 diffs)
• utilities/test/data (moved) (moved from trunk/anuga_core/source/anuga/utilities/data)
• utilities/test/test_all.py (deleted)
• utilities/test/test_system_tools.py (modified) (2 diffs)

trunk/anuga_core/source/anuga/structures/test/test_inlet_operator.py

@@ -15 +15 @@
 
 from anuga.structures.inlet_operator import Inlet_operator
+
+import warnings
+warnings.simplefilter("ignore")
 
 class Test_inlet_operator(unittest.TestCase):
@@ -215 +218 @@
         
         path = get_pathname_from_package('anuga.structures')
-        filename1 = os.path.join(path, 'data', 'inlet_operator_test1.tms')
-        filename2 = os.path.join(path, 'data', 'inlet_operator_test2.tms')
+        filename1 = os.path.join(path, 'test', 'data', 'inlet_operator_test1.tms')
+        filename2 = os.path.join(path, 'test', 'data', 'inlet_operator_test2.tms')
 
         line1 = [[95.0, 10.0], [105.0, 10.0]]
@@ -275 +278 @@
 
         path = get_pathname_from_package('anuga.structures')
-        filename1 = os.path.join(path, 'data', 'inlet_operator_test1.tms')
-        filename2 = os.path.join(path, 'data', 'inlet_operator_test2.tms')
+        filename1 = os.path.join(path, 'test', 'data', 'inlet_operator_test1.tms')
+        filename2 = os.path.join(path, 'test', 'data', 'inlet_operator_test2.tms')
 
         line1 = [[95.0, 10.0], [105.0, 10.0]]

trunk/anuga_core/source/anuga/utilities/test/test_system_tools.py

@@ -17 +17 @@
 # I'm trying to keep this file general, so it works for EQRM and ANUGA
 # EQRM also uses this file, but has a different directory structure
-from system_tools import *
+from anuga.utilities.system_tools import *
 
 class Test_system_tools(unittest.TestCase):
@@ -123 +123 @@
         """
 
-        # Get path where this test is run
-        # I'm trying to keep this file general, so it works for EQRM and ANUGA
-        path, tail = split(__file__)
-        if path == '':
-            path = '.' + sep
-
-        filename = path + sep + '..' + sep + 'data' + sep + 'crc_test_file.png'
+
+            
+        path = get_pathname_from_package('anuga.utilities')        
+                
+        filename = os.path.join(path, 'test', 'data', 'crc_test_file.png') 
+
+
 
         ref_crc = 1203293305 # Computed on Windows box