Changeset 6906 for branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/validate.py

Timestamp:

Apr 26, 2009, 5:35:16 PM (16 years ago)

Author:

rwilson

Message:

Patong beach validation changes plus back-merge changes.

File:

• branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/validate.py (modified) (9 diffs)

branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/validate.py

@@ -42 +42 @@
 # as code below depends upon it.
 Optional_Data_Objects = ('patong.sww.TRIAL.tgz',
-                         'patong.sww.BASIC.tgz',
-                         'patong.sww.FINAL.tgz'
+#                         'patong.sww.BASIC.tgz',
+#                         'patong.sww.FINAL.tgz'
                         )
 
@@ -58 +58 @@
 OUTDIR_PREFIX = 'Make directory '
 
-# Name of SWW file produced by simulation
+# Name of SWW file produced by run_model.py
 OUTPUT_SWW = 'patong.sww'
 
@@ -93 +93 @@
 
         if 'DOCTYPE' in data:
-            return False
-        
-        return True
+            return True
+        
+        return False
 
     
@@ -114 +114 @@
             (result, auth) = get_web_file(remote_url, local, auth=auth)
             if result and is_html(local)==False:
-                log.debug('Success fetching file %s' % remote_url)
+                log.debug('Success fetching file %s' % remote)
                 return (True, auth)
-
+            log.debug('Failure fetching from %s' % mirror)
+
+        log.debug('Failure fetching file %s' % remote)
         return (False, auth)            
                 
@@ -162 +164 @@
             (res, auth) = get_remote_from_mirrors(obj_digest, remote_digest, auth, mirrors)
             if res:
-                if not files_same(local_data_digest, remote_data_digest):
+                if not files_same(local_digest, remote_digest):
                     # digests differ, refresh object
-                    log.info('Local file %s is out of date, refreshing ...' % obj)
                     shutil.move(remote_digest, local_digest)
                     (res, auth) = get_remote_from_mirrors(obj, local_file, auth, mirrors)
@@ -269 +270 @@
 
     # modify project.py template
+    log.info('Creating %s version of project.py' % vtype)
     fd = open('project.py.template', 'r')
     project = fd.readlines()
@@ -285 +287 @@
 
     # run the simulation, produce SWW file
+    log.info('Running run_model.py')
     cmd = 'python run_model.py > %s' % RUNMODEL_STDOUT
     log.debug("run_simulation: doing '%s'" % cmd)
@@ -374 +377 @@
 log.console_logging_level = log.INFO
 log.log_logging_level = log.DEBUG
+log_filename = log.log_filename
+
 setup()
 
@@ -429 +434 @@
         (expected_sww, _) = valid_sww.rsplit('.', 1)
         check_that_output_is_as_expected(expected_sww, valid_sww)
+    shutil.move(log_filename, '%s.%s' % (log_filename, vtype))
 
 # clean up