Changeset 7107

Timestamp:

May 28, 2009, 7:57:05 AM (15 years ago)

Author:

rwilson

Message:

Made proxy authentication less likely to lock out user on errors.

File:

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

branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/validate.py

@@ -32 +32 @@
            'http://dfn.dl.sourceforge.net/sourceforge/anuga/'             # de
           ]
+
 ### for testing
 ##MIRRORS = ['http://10.7.64.243/patong_validation_data/']       # local linux box
@@ -45 +46 @@
 # these names must be of the form <scene>.sww.<type>.tgz
 # as code below depends upon it.
-Optional_Data_Objects = ('patong.sww.TRIAL.tgz',
+Optional_Data_Objects = (
+                         'patong.sww.TRIAL.tgz',
                          'patong.sww.BASIC.tgz',
-                         #'patong.sww.FINAL.tgz'
+                         'patong.sww.FINAL.tgz'
                         )
 
@@ -118 +120 @@
                 return (True, auth)
             log.debug('Failure fetching from %s' % mirror)
+            auth = None
 
         log.debug('Failure fetching file %s' % remote)
@@ -195 +198 @@
             log.info('Refresh of file %s failed.' % data_object)
             result = False
+            # don't use possibly bad 'auth' again,
+            # some proxies lock out on repeated failures.
+            auth = None
 
     if result:
@@ -377 +383 @@
 
 # prepare user for what is about to happen
-
-msg = '''
+log.critical('''
 Please note that this validation test is accurate only on 64bit Linux or
 Windows.  Running the validation on a 32bit operating system will result in
@@ -396 +401 @@
 if you wish.  If not supplied in environment variables you will be prompted for
 the information.
-'''
-
-log.critical(msg)
+''')
+
 
 # make sure local data is up to date
@@ -442 +446 @@
 
 # clean up
+log.critical('Tearing down ...')
 teardown()