Changeset 2305 for inundation/pyvolution/test_data_manager.py

Timestamp:

Jan 31, 2006, 12:33:19 PM (19 years ago)

Author:

ole

Message:

Fixed problem with leaking files from tests as per ticket:42

File:

• inundation/pyvolution/test_data_manager.py (modified) (11 diffs)

inundation/pyvolution/test_data_manager.py

@@ -141 +141 @@
             
         
-        fid.close()
+            fid.close()
+
         
 
@@ -147 +148 @@
     def tearDown(self):
         import os
-        #os.remove(self.test_MOST_file)
-        
+        for ext in ['_ha.nc', '_ua.nc', '_va.nc', '_e.nc']:
+            #print 'Trying to remove', self.test_MOST_file + ext
+            os.remove(self.test_MOST_file + ext)        
 
     def test_sww_constant(self):
@@ -1865 +1867 @@
         #Done (Ole) - it was because sww2ers didn't close it's sww file 
         os.remove(sww.filename)
+        os.remove(self.domain.filename + '_elevation')
+        os.remove(self.domain.filename + '_elevation.ers')                 
 
 
@@ -1891 +1895 @@
         first_value = fid.variables['HA'][:][0,0,0]
         fourth_value = fid.variables['HA'][:][0,0,3]
+        fid.close()
 
 
@@ -1930 +1935 @@
         #Cleanup
         import os
-        #os.remove('small.sww')
         os.remove(self.test_MOST_file + '.sww')
 
@@ -2232 +2236 @@
 
 
-    def test_sww2domain(self):
+    def test_sww2domain1(self):
         ################################################
         #Create a test domain, and evolve and save it.
@@ -2298 +2302 @@
         ###################
 
-        os.remove(domain.filename + '.sww')
+        #os.remove(domain.filename + '.sww')
+        os.remove(filename)        
 
         bits = ['vertex_coordinates']
@@ -2390 +2395 @@
         domain.visualise = False
         domain.store = True
-        domain.filename = 'bedslope'
+        domain.set_name('test_file')
+        domain.set_datadir('.')
         domain.default_order=2
         domain.quantities_to_be_stored=['stage']
@@ -2430 +2436 @@
         try:
             domain2 = sww2domain(filename,boundary,fail_if_NaN=True,verbose=False)
-            assert True == False
         except:
             #Now import it, filling NaNs to be 0
@@ -2436 +2441 @@
             domain2 = sww2domain(filename,None,fail_if_NaN=False,NaN_filler = filler,verbose=False)
 
+        #Clean up
+        os.remove(filename)
             
 
@@ -2455 +2462 @@
         assert min(min(domain2.get_quantity('ymomentum')))==filler
 
-        #print 'passed'
-
-        #FIXME (DSG-all) this doesn't work (in windows), due to permitions
-        #it the file is created in the temp area this problem
-        # might be avoided
-        
-        #cleanup
-        #import os
-        #os.remove(domain.datadir+'/'+domain.filename+'.sww')
-        for filename in os.listdir('.'):
-            if filename.endswith('sww'):
-                print filename
-        os.remove(domain.filename + '.sww')