Changeset 7267 for anuga_validation/automated_validation_tests

Timestamp:

Jun 25, 2009, 3:15:28 PM (16 years ago)

Author:

rwilson

Message:

Fixed bug and tried to make processes run with same python that started main file.

File:

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

anuga_validation/automated_validation_tests/patong_beach_validation/validate.py

@@ -13 +13 @@
 import time
 import shutil
+import platform
 
 from anuga.utilities.system_tools import get_web_file, untar_file, file_length
@@ -65 +66 @@
 OUTPUT_SWW = 'patong.sww'
 
+# default name of python to run
+PythonName = 'python'
+
 
 def setup():
@@ -281 +285 @@
     # modify project.py template
     log.debug("Creating '%s' version of project.py" % vtype)
-    fd = open('project.py.template', 'r')
+    fd = open('project_template.py', 'r')
     project = fd.readlines()
     fd.close()
@@ -298 +302 @@
     # run the simulation, produce SWW file
     log.info('Running the simulation ...')
-    cmd = 'python run_model.py > %s' % RUNMODEL_STDOUT
+    cmd = '%s run_model.py > %s' % (PythonName, RUNMODEL_STDOUT)
     log.debug("run_simulation: doing '%s'" % cmd)
     res = os.system(cmd)
@@ -345 +349 @@
     # compare SWW files here and there
     new_output_sww = os.path.join(output_directory, expected_sww)
-    cmd = 'python cmpsww.py %s %s > cmpsww.stdout' % (local_sww, new_output_sww)
+    cmd = '%s cmpsww.py %s %s > cmpsww.stdout' % (PythonName, local_sww, new_output_sww)
     log.debug("check_that_output_is_as_expected: doing '%s'" % cmd)
     res = os.system(cmd)
@@ -376 +380 @@
 # Mainline - run the simulation, check output.
 ################################################################################
+
+# determine what python we are, initialize PythonName
+py_tuple = platform.python_version_tuple()
+PythonName = 'python%s.%s' % (py_tuple[0], py_tuple[1])
 
 # set logging levels