Changeset 6906 for anuga_validation

Timestamp:

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

Author:

rwilson

Message:

Patong beach validation changes plus back-merge changes.

File:

• anuga_validation/automated_validation_tests/patong_beach_validation/validate.py (modified) (4 diffs)

anuga_validation/automated_validation_tests/patong_beach_validation/validate.py

@@ -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)            
                 
@@ -164 +166 @@
                 if not files_same(local_data_digest, remote_data_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)