Changeset 6782

Timestamp:

Apr 14, 2009, 9:55:53 AM (16 years ago)

Author:

rwilson

Message:

Modified to run correctly in remote user environment.

File:

• anuga_validation/automated_validation_tests/patong_validation/validate_patong.py (modified) (4 diffs)

anuga_validation/automated_validation_tests/patong_validation/validate_patong.py

@@ -13 +13 @@
 import shutil
 
-import project
 from anuga.utilities.system_tools import get_web_file, untar_file
 import anuga.utilities.log as log
@@ -46 +45 @@
     Check we have required data set in project.py.
     '''
-    
-    # Check that environment variables are defined.
-    if os.getenv(project.ENV_INUNDATIONHOME) is None:
-        msg = ("Environment variable '%s' is not set in project.py"
-               % project.ENV_INUNDATIONHOME)
-        raise Exception, msg
-
-    if os.getenv(project.ENV_MUXHOME) is None:
-        msg = ("Environment variable '%s' is not set in project.py"
-               % project.ENV_MUXHOME)
-        raise Exception, msg
+   
+    pass
 
 
@@ -147 +137 @@
     
     # modify environment so we use the local data
-    # INUNDATIONHOME points into the 'data' local data directory
-    old_inundationhome = os.getenv(project.ENV_INUNDATIONHOME)
-    os.putenv(project.ENV_INUNDATIONHOME,
-              os.path.join(Local_Data_Directory, ''))
-    old_muxhome = os.getenv(project.ENV_MUXHOME)
-    os.putenv(project.ENV_MUXHOME,
-              os.path.join(Local_Data_Directory, 'data'))
-    
+    new_inundationhome = os.path.join(Local_Data_Directory, '')
+    os.environ['INUNDATIONHOME'] = new_inundationhome
+    new_muxhome = os.path.join(Local_Data_Directory, 'data')
+    os.environ['MUXHOME'] = new_muxhome
+
+    # We import here, _after_ environment variables are set
+    import project
+
     # run the simulation, produce SWW file
     log.debug('Running Patong simulation ...')
@@ -161 +151 @@
     assert res == 0
 
-    # undo environment changes
-    if old_inundationhome:
-        os.putenv(project.ENV_INUNDATIONHOME, old_inundationhome)
-    if old_muxhome:
-        os.putenv(project.ENV_MUXHOME, old_muxhome)
-
-    
 def check_that_output_is_as_expected():
     '''Check that validation output is as required.'''