Changeset 6824

Timestamp:

Apr 17, 2009, 1:44:22 PM (14 years ago)

Author:

rwilson

Message:

Changes into error handling getting files over the 'net.

File:

• branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/validate_patong.py (modified) (8 diffs)

branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/validate_patong.py

@@ -55 +55 @@
 
     These are expected to be *.tgz files/directories.
+    Return True if all went well, else False.
     '''
     
@@ -88 +89 @@
                                 local_digest, auth=auth)
             if auth == False:
+                log.info("Couldn't fetch file: %s" % digest_url)
                 return False
             log.info('Fetching remote file %s' % object_url)
@@ -123 +125 @@
 
     # create local data directory if required
+    log.debug('Creating local directory: %s' % Local_Data_Directory)
     if not os.path.exists(Local_Data_Directory):
         os.mkdir(Local_Data_Directory)
 
     # clean out remote data copy directory
+    log.debug('Cleaning remote directory: %s' % Remote_Data_Directory)
     shutil.rmtree(Remote_Data_Directory, ignore_errors=True)
     os.mkdir(Remote_Data_Directory)
@@ -133 +137 @@
     auth = None
     for data_object in Local_Data_Objects:
+        log.debug('Trying to update: %s' % data_object)
         auth = update_object(data_object, auth)
         if auth == False:
+            log.debug('Failed fetching %s, returning False' % data_object)
             return False
 
@@ -155 +161 @@
     '''
 
-    log.critical('Checking if you have the required files ...')
+    log.critical('Checking if you have the required files to run locally ...')
 
     have_files = True
@@ -180 +186 @@
     # now untar file/directory objects
     for obj in Local_Data_Objects:
-        log.debug('Untarring %s in directory %s'
-                  % (obj_path, Local_Data_Directory))
+        log.info('Untarring %s in directory %s'
+                 % (obj_path, Local_Data_Directory))
         untar_file(obj_path, target_dir=Local_Data_Directory)
 
@@ -298 +304 @@
 # make sure local data is up to date
 if not update_local_data():
+    log.info("Can't update local files over the internet (for some reason).")
     if not can_we_run():
         log.critical('')
@@ -316 +323 @@
 
 # clean up
-teardown()
+#teardown()