Changeset 7745

Timestamp:

May 25, 2010, 2:20:32 PM (15 years ago)

Author:

hudson

Message:

Fixed some failing tests, created separate test module for file_utils

Location:

anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/util.py (modified) (1 diff)
• shallow_water/test_data_manager.py (modified) (2 diffs)
• utilities/file_utils.py (modified) (1 diff)
• utilities/test_file_utils.py (added)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -309 +309 @@
 
 
-# FIXME (DSG): Add unit test, make general, not just 2 files,
-# but any number of files.
-##
-# @brief ??
-# @param dir_name ??
-# @param filename1 ??
-# @param filename2 ??
-# @return ??
-# @note TEMP
-def copy_code_files(dir_name, filename1, filename2):
-    """Temporary Interface to new location"""
-
-    from anuga.shallow_water.data_manager import \
-                    copy_code_files as dm_copy_code_files
-    log.critical('copy_code_files has moved from util.py.')
-    log.critical('Please use "from anuga.shallow_water.data_manager import '
-                 'copy_code_files"')
-    
-    return dm_copy_code_files(dir_name, filename1, filename2)
-
+def copy_code_files(dir_name, filename1, filename2, verbose=False):
+    """Copies "filename1" and "filename2" to "dir_name".
+
+    Each 'filename' may be a string or list of filename strings.
+
+    Filenames must be absolute pathnames
+    """
+
+    ##
+    # @brief copies a file or sequence to destination directory.
+    # @param dest The destination directory to copy to.
+    # @param file A filename string or sequence of filename strings.
+    def copy_file_or_sequence(dest, file):
+        if hasattr(file, '__iter__'):
+            for f in file:
+                shutil.copy(f, dir_name)
+                if verbose:
+                    log.critical('File %s copied' % f)
+        else:
+            shutil.copy(file, dir_name)
+            if verbose:
+                log.critical('File %s copied' % file)
+
+    # check we have a destination directory, create if necessary
+    if not os.path.isdir(dir_name):
+        if verbose:
+            log.critical('Make directory %s' % dir_name)
+        mkdir(dir_name, 0777)
+
+    if verbose:
+        log.critical('Output directory: %s' % dir_name)        
+
+    copy_file_or_sequence(dir_name, filename1)
+
+    if not filename2 is None:
+        copy_file_or_sequence(dir_name, filename2)
 
 ##

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -7546 +7546 @@
         assert len(iterate)==4
 
-    def test_screen_catcher(self):
-    
-        stdout_orginal = sys.stdout
-        stderr_orginal = sys.stderr
-        
-        output_dir = tempfile.mkdtemp('','output_test')
-        #print output_dir
-        start_screen_catcher(output_dir+sep,verbose=False)
-        
-        print 'hello screen catcher'
-        print 'goodbye screen catcher'
-        
-        sys.stdout = stdout_orginal
-        sys.stderr = stderr_orginal
-        
-        output_file = output_dir+sep+'screen_output.txt'
-        assert access(output_file,F_OK)
-        
-        fid = open(output_file)
-        file_line1 = fid.readline()
-        file_line2 = fid.readline()
-        
-        #print 'file contents',file_line1, file_line2
-        assert (file_line1 == 'hello screen catcher\n')
-        assert (file_line2 == 'goodbye screen catcher\n')
-        
  
     def test_points2polygon(self):  
@@ -7771 +7745 @@
             assert float(values[id]) == float(floors[id])
 
-            
-    def test_copy_code_files(self):
-        '''test that the copy_code_files() function is sane.'''
-
-        def create_file(f):
-            fd = open(f, 'w')
-            fd.write('%s\n' % f)
-            fd.close()
-
-        # create working directories and test files
-        work_dir = tempfile.mkdtemp()
-        dst_dir = tempfile.mkdtemp(dir=work_dir)
-        src_dir = tempfile.mkdtemp(dir=work_dir)
-
-        f1 = 'file1'        
-        filename1 = os.path.join(src_dir, f1)
-        create_file(filename1)
-        f2 = 'file2'        
-        filename2 = os.path.join(src_dir, f2)
-        create_file(filename2)
-        f3 = 'file3'        
-        filename3 = os.path.join(src_dir, f3)
-        create_file(filename3)
-        f4 = 'file4'        
-        filename4 = os.path.join(src_dir, f4)
-        create_file(filename4)
-        f5 = 'file5'        
-        filename5 = os.path.join(src_dir, f5)
-        create_file(filename5)
-
-        # exercise the copy function
-        copy_code_files(dst_dir, filename1)
-        copy_code_files(dst_dir, filename1, filename2)
-        copy_code_files(dst_dir, (filename4, filename5, filename3))
-
-        # test that files were actually copied
-        self.failUnless(access(os.path.join(dst_dir, f1), F_OK))
-        self.failUnless(access(os.path.join(dst_dir, f2), F_OK))
-        self.failUnless(access(os.path.join(dst_dir, f3), F_OK))
-        self.failUnless(access(os.path.join(dst_dir, f4), F_OK))
-        self.failUnless(access(os.path.join(dst_dir, f5), F_OK))
-
-        # clean up
-        shutil.rmtree(work_dir)
-            
+
 #-------------------------------------------------------------
 

anuga_core/source/anuga/utilities/file_utils.py

@@ -391 +391 @@
 
     return Y
+
+