Changeset 6808

Timestamp:

Apr 15, 2009, 9:40:55 AM (16 years ago)

Author:

rwilson

Message:

Improved error handling.

Location:

branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation

Files:

• cmpsww.py (modified) (1 diff)
• validate_patong.py (modified) (5 diffs)

branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/cmpsww.py

@@ -346 +346 @@
                            timesteps=timesteps, variables=variables)
     except RuntimeError, msg:
-         print >>sys.stderr, msg
+         print msg
+         return 10
 
 

branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/validate_patong.py

@@ -19 +19 @@
 
 # base URL for the remote ANUGA data
-PATONG_DATA_URL = 'http://10.7.64.243/patong_validation_data/'
+PATONG_HOST = 'http://10.7.64.243/'
+PATONG_DATA_URL = PATONG_HOST + 'patong_validation_data/'
 
 # path to the local data directory
@@ -150 +151 @@
     
     Return True if we *can* run, else False.
+
+    Tell user what is happening first, then untar files.
     '''
 
     log.critical('Checking if you have the required files ...')
+
+    have_files = True
+    max_width = 0
+    for obj in Local_Data_Objects:
+        max_width = max(len(obj), max_width)
 
     for obj in Local_Data_Objects:
@@ -158 +166 @@
         obj_path = os.path.join(Local_Data_Directory, obj+'.tgz')
         if os.path.exists(obj_path):
-            log.debug('Untarring %s in directory %s'
-                      % (obj_path, Local_Data_Directory))
-            untar_file(obj_path, target_dir=Local_Data_Directory)
+            log.info('%s  found' % obj.ljust(max_width))
         else:
-            return False
-
-    log.critical('You appear to have the required files here, '
-                 'continuing the validation.')
+            log.info('%s  MISSING!' % obj.ljust(max_width))
+            have_files = False
+
+    if not have_files:
+        log.critical('You must obtain the missing files before you can run '
+                     'this validation.')
+        return False
+
+    log.critical('You have the required files.')
+
+    # now untar file/directory objects
+    for obj in Local_Data_Objects:
+        log.debug('Untarring %s in directory %s'
+                  % (obj_path, Local_Data_Directory))
+        untar_file(obj_path, target_dir=Local_Data_Directory)
+
     return True
 
@@ -223 +241 @@
     else:
         log.critical('Simulation results are NOT as expected.')
+        fd = open('cmpsww.stdout', 'r')
+        cmp_error = fd.readlines()
+        fd.close()
+        log.critical('\n' + ''.join(cmp_error))
 
 
@@ -283 +305 @@
         log.critical('Terminating the validation.')
         log.critical('')
-        log.critical('If you get these files from %s:' % PATONG_DATA_URL)
-        for obj in Local_Data_Objects:
-            log.critical('    %s.tgz' % obj)
+        log.critical('If you get the missing files from %s' % PATONG_DATA_URL)
         log.critical('then you can try to run the validation again.')
         sys.exit(10)