Changeset 6903 for anuga_validation

Timestamp:

Apr 24, 2009, 5:24:52 PM (16 years ago)

Author:

rwilson

Message:

Ongoing changes with Patong validation.

Location:

anuga_validation/automated_validation_tests/patong_beach_validation

Files:

• project.py (deleted)
• project.py.template (added)
• validate.py (modified) (10 diffs)

anuga_validation/automated_validation_tests/patong_beach_validation/validate.py

@@ -38 +38 @@
 Mandatory_Data_Objects = ('data.tgz',)
 
-# sequence of optional local data objects
+# sequence of optional local data objects.
+# these names must be of the form <scene>.sww.<type>.tgz
+# as code below depends upon it.
 Optional_Data_Objects = ('patong.sww.TRIAL.tgz',
                          'patong.sww.BASIC.tgz',
@@ -115 +117 @@
                 return (True, auth)
 
-        log.info('Could not refresh file %s' % local)
         return (False, auth)            
                 
@@ -141 +142 @@
         else (False, <updated_auth>).
         '''
-
-        log.info("Refreshing local object '%s'" % obj)
 
         # create local and remote file paths.
@@ -168 +167 @@
                     shutil.move(remote_digest, local_digest)
                     (res, auth) = get_remote_from_mirrors(obj, local_file, auth, mirrors)
-                
+
         return (res, auth)
 
@@ -185 +184 @@
     result = True
     for data_object in data_objects:
+        log.info("Refreshing file '%s'" % data_object)
         log.debug('refresh_local_data: getting %s from mirrors, auth=%s'
                   % (data_object, str(auth)))
@@ -191 +191 @@
                   % (str(res), str(auth)))
         if res == False:
-            log.debug('Failed fetching %s, returning False' % data_object)
+            log.info('Refresh of file %s failed.' % data_object)
             result = False
 
-    log.info('Local data has been refreshed, result=%s.' % str(result))
+    if result:
+        log.info('Local data has been refreshed.')
+    else:
+        log.info('Local data has been refreshed, with one or more errors.')
     return result
 
@@ -282 +285 @@
 
     # run the simulation, produce SWW file
-    log.critical('Running Patong simulation ...')
     cmd = 'python run_model.py > %s' % RUNMODEL_STDOUT
     log.debug("run_simulation: doing '%s'" % cmd)
@@ -297 +299 @@
     return res == 0
 
-def check_that_output_is_as_expected():
+def check_that_output_is_as_expected(expected_sww, valid_sww):
     '''Check that validation output is as required.'''
 
     # get path to expected SWW file
     log.critical('Checking that simulation results are as expected ...')
-    local_sww = os.path.join(Local_Data_Directory, Local_Data_Objects[0])
+    local_sww = os.path.join(Local_Data_Directory, valid_sww)
 
     # get output directory from stdout capture file
@@ -329 +331 @@
     
     # compare SWW files here and there
-    new_output_sww = os.path.join(output_directory, OUTPUT_SWW)
+    new_output_sww = os.path.join(output_directory, expected_sww)
     cmd = 'python cmpsww.py %s %s > cmpsww.stdout' % (local_sww, new_output_sww)
     log.debug("check_that_output_is_as_expected: doing '%s'" % cmd)
@@ -423 +425 @@
     log.critical("Running Patong '%s' validation ..." % vtype)
     if run_simulation(vtype, odo):
-        check_that_output_is_as_expected(vtype, odo)
+        # get SWW names expected and valid, check 'equal'
+        (valid_sww, _) = odo.rsplit('.', 1)
+        (expected_sww, _) = valid_sww.rsplit('.', 1)
+        check_that_output_is_as_expected(expected_sww, valid_sww)
 
 # clean up