Changeset 5183

Timestamp:

Apr 1, 2008, 2:36:00 PM (17 years ago)

Author:

ole

Message:

Implemented a workaround the problem described in ticket:235
Windows machines will now do the automatic testing without attempting to plot.

Location:

anuga_validation/automated_validation_tests/okushiri_tank_validation

Files:

• compare_timeseries_with_measures.py (modified) (1 diff)
• validate_okushiri.py (modified) (2 diffs)

anuga_validation/automated_validation_tests/okushiri_tank_validation/compare_timeseries_with_measures.py

@@ -14 +14 @@
 
 import project
-
-try:
-    from pylab import ion, hold, plot, title, legend, xlabel, ylabel, savefig
-except:
-    print 'Could not import pylab'
+import sys
+
+if sys.platform == 'win32':
+    # Windows has a problem when this module is run through
+    # os.system as done by validate_okushiri.
+    # See https://datamining.anu.edu.au/anuga/ticket/235
+
+    # If you want to see the plots from this validation,
+    # run this module by itself with this if clause removed.
     plotting = False
+    
 else:
-    # Create plots as png files
-    plotting = True
+    try:
+        from pylab import ion, hold, plot, title, legend
+        from pylab import xlabel, ylabel, savefig
+    except:
+        print 'Could not import pylab'
+        plotting = False
+    else:
+        # Create plots as png files
+        plotting = True
     
 

anuga_validation/automated_validation_tests/okushiri_tank_validation/validate_okushiri.py

@@ -23 +23 @@
     def test_that_output_is_as_expected(self):
 
+        
         #print
         s = 'create_okushiri.py'
@@ -33 +34 @@
         res = os.system('python %s > run_okushiri.stdout' %s)        
         assert res == 0
+        
+        
         s = 'compare_timeseries_with_measures.py'
         #print s