Changeset 9441

Timestamp:

Jan 20, 2015, 5:26:46 PM (10 years ago)

Author:

steve

Message:

Cleanup inlet test file

File:

• trunk/anuga_core/source/anuga/structures/test/test_inlet_operator.py (modified) (4 diffs)

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

@@ -12 +12 @@
 from anuga.shallow_water.shallow_water_domain import Domain
 from anuga.abstract_2d_finite_volumes.util import file_function
+from anuga.utilities.system_tools import get_pathname_from_package
 
 from anuga.structures.inlet_operator import Inlet_operator
@@ -24 +25 @@
 
     def tearDown(self):
-        pass
+        try:
+            os.remove('Test_Outlet_Inlet.sww')
+        except:
+            pass
+        
     
     
@@ -210 +215 @@
         baseDir = os.getcwd()
 
-        try:
-            os.chdir('structures')
-        except:
-            pass
+#         try:
+#             os.chdir('structures')
+#         except:
+#             pass
+        
+        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')
 
         line1 = [[95.0, 10.0], [105.0, 10.0]]
-        Q1 = file_function(filename='inlet_operator_test1.tms', quantities=['hydrograph'])
+        Q1 = file_function(filename=filename1, quantities=['hydrograph'])
         
         line2 = [[10.0, 90.0], [20.0, 90.0]]
-        Q2 = file_function(filename='inlet_operator_test2.tms', quantities=['hydrograph'])
+        Q2 = file_function(filename=filename2, quantities=['hydrograph'])
 
         os.chdir(baseDir)
@@ -272 +281 @@
         baseDir = os.getcwd()
 
-        try:
-            os.chdir('structures')
-        except:
-            pass
+        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')
 
         line1 = [[95.0, 10.0], [105.0, 10.0]]
-        Q1 = file_function(filename='inlet_operator_test1.tms', quantities=['hydrograph'])
+        Q1 = file_function(filename=filename1, quantities=['hydrograph'])
 
         line2 = [[10.0, 90.0], [20.0, 90.0]]
-        Q2 = file_function(filename='inlet_operator_test2.tms', quantities=['hydrograph'])
+        Q2 = file_function(filename=filename2, quantities=['hydrograph'])
 
         os.chdir(baseDir)