Changeset 7756 for trunk

Timestamp:

May 31, 2010, 12:36:32 PM (15 years ago)

Author:

James Hudson

Message:

Fixed broken unit tests in file utils.

Location:

trunk/anuga_core/source/anuga/utilities

Files:

• file_utils.py (modified) (2 diffs)
• test_file_utils.py (modified) (2 diffs)

trunk/anuga_core/source/anuga/utilities/file_utils.py

@@ -7 +7 @@
 import csv
 import numpy as num
+import shutil
 
 ##
@@ -394 +395 @@
 
 
-def copy_code_files(dir_name, filename1, filename2, verbose=False):
+def copy_code_files(dir_name, filename1, filename2=None, verbose=False):
     """Copies "filename1" and "filename2" to "dir_name".
 

trunk/anuga_core/source/anuga/utilities/test_file_utils.py

@@ +1 @@
+import unittest
+import tempfile
+import os
+import shutil
+
+from file_utils import copy_code_files
 
 
@@ -38 +44 @@
 
         # 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))
+        self.failUnless(os.access(os.path.join(dst_dir, f1), os.F_OK))
+        self.failUnless(os.access(os.path.join(dst_dir, f2), os.F_OK))
+        self.failUnless(os.access(os.path.join(dst_dir, f3), os.F_OK))
+        self.failUnless(os.access(os.path.join(dst_dir, f4), os.F_OK))
+        self.failUnless(os.access(os.path.join(dst_dir, f5), os.F_OK))
 
         # clean up