Changeset 6665

Timestamp:

Mar 31, 2009, 12:41:08 PM (16 years ago)

Author:

rwilson

Message:

Final form, for now.

File:

• anuga_validation/automated_validation_tests/patong_validation/validate_patong.py (modified) (4 diffs)

anuga_validation/automated_validation_tests/patong_validation/validate_patong.py

@@ -119 +119 @@
         return auth
 
-    log.debug('----------------------------------------- refreshing local data')
+    log.debug('Refreshing local data ...')
     
     # create local data directory if required
@@ -140 +140 @@
         untar_file(tar_path, target_dir=Local_Data_Directory)
         
-    log.debug('Update done.')
-    log.debug('----------------------------------------- refreshing local data')
+    log.debug('Local data has been refreshed.')
 
 
@@ -210 +209 @@
     # clear all data objects from local data directory
     for data_object in Local_Data_Objects:
-        obj_path = os.path.join(Remote_Data_Directory, data_object)
-        shutil.rmtree(obj_path, ignore_errors=True)
+        obj_path = os.path.join(Local_Data_Directory, data_object)
+        if os.path.isfile(obj_path):
+            os.remove(obj_path)
+        else:
+            shutil.rmtree(obj_path, ignore_errors=True)
+
+    # remove remote directory and stdout capture file
+    shutil.rmtree(Remote_Data_Directory, ignore_errors=True)
+    os.remove(RUNMODEL_STDOUT)
             
 
@@ -226 +232 @@
 
 # run the simulation
-##import cProfile
-##cProfile.run('run_simulation()', filename='patong.prof')
-
 run_simulation()