Changeset 4598

Timestamp:

Jul 6, 2007, 12:00:20 PM (18 years ago)

Author:

nick

Message:

fixed test_get_all_swwfiles1 to work on all OS... I hope

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (4 diffs)
• test_data_manager.py (modified) (2 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -60 +60 @@
 
 import csv
-import os
+import os, sys
 import shutil
 from struct import unpack
@@ -133 +133 @@
     """
 
-    import os, sys
     import os.path
 
@@ -192 +191 @@
 
         os.rmdir(path)
+        
+        
+# ANOTHER OPTION, IF NEED IN THE FUTURE, Nick B 7/2007    
+#    def rmgeneric(path, __func__):
+#        ERROR_STR= """Error removing %(path)s, %(error)s """
+#
+#        try:
+#            __func__(path)
+#            print 'Removed ', path
+#        except OSError, (errno, strerror):
+#            print ERROR_STR % {'path' : path, 'error': strerror }
+#                
+#    def removeall(path):
+#    
+#        if not os.path.isdir(path):
+#            return
+#        
+#        files=os.listdir(path)
+#    
+#        for x in files:
+#            fullpath=os.path.join(path, x)
+#            if os.path.isfile(fullpath):
+#                f=os.remove
+#                rmgeneric(fullpath, f)
+#            elif os.path.isdir(fullpath):
+#                removeall(fullpath)
+#                f=os.rmdir
+#                rmgeneric(fullpath, f)
 
 
@@ -5661 +5688 @@
 
 
+
 #-------------------------------------------------------------
 if __name__ == "__main__":

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -7153 +7153 @@
     def test_get_all_swwfiles1(self):
         
-        filename0 = tempfile.mktemp('.sww','test')
-        filename1 = tempfile.mktemp('.sww','test')
-        filename2 = tempfile.mktemp('.sww','test')
-        filename3 = tempfile.mktemp('.sww','test')
+        temp_dir = tempfile.mkdtemp('sww_test')
+        filename0 = tempfile.mktemp('.sww','test',temp_dir)
+        filename1 = tempfile.mktemp('.sww','test',temp_dir)
+        filename2 = tempfile.mktemp('.sww','test',temp_dir)
+        filename3 = tempfile.mktemp('.sww','test',temp_dir)
        
-#        print filename0,filename1,filename2,filename3
+        #print'filename', filename0#,filename1,filename2,filename3
         
         fid0 = open(filename0, 'w')
@@ -7169 +7170 @@
         fid3.write('hello')
         
-        iterate=get_all_swwfiles('/tmp','test')
-        
-        assert filename0[:-4]==join('/tmp',iterate[0])
-        assert filename1[:-4]==join('/tmp',iterate[1])
-        assert filename2[:-4]==join('/tmp',iterate[2])        
-        assert filename3[:-4]==join('/tmp',iterate[3])        
-
-        os.remove(filename0)
-        os.remove(filename1)
-        os.remove(filename2)
-        os.remove(filename3)
+        dir, name0 = os.path.split(filename0)
+        #print 'dir',dir,name0
+        
+        iterate=get_all_swwfiles(dir,'test')
+        
+        del_dir(temp_dir)
+
+        _, name0 = os.path.split(filename0) 
+        #print'name0',name0[:-4],iterate[0]    
+        _, name1 = os.path.split(filename1)       
+        _, name2 = os.path.split(filename2)       
+        _, name3 = os.path.split(filename3)       
+
+        assert name0[:-4]==iterate[0]
+        assert name1[:-4]==iterate[1]
+        assert name2[:-4]==iterate[2]
+        assert name3[:-4]==iterate[3]
+