Changeset 8256

Timestamp:

Nov 29, 2011, 5:46:48 PM (13 years ago)

Author:

steve

Message:

Got test_all working again

Location:

trunk/anuga_core/source/anuga_parallel

Files:

• . (modified) (1 prop)
• parallel_abstraction.py (modified) (1 diff)
• parallel_inlet_operator.py (modified) (1 diff)
• test_all.py (modified) (1 diff)
• test_parallel_distribute_domain.py (modified) (3 diffs)

trunk/anuga_core/source/anuga_parallel

@@ -1 +1 @@
 .python_cache
+.temp

@@ -1 +1 @@
 .python_cache
+.temp

trunk/anuga_core/source/anuga_parallel/parallel_abstraction.py

@@ -59 +59 @@
     pypar_available = False
 else:
+    import sys
+    sys.stdout = NullStream()
     from pypar import *
+    sys.stdout = sys.__stdout__ 
     pypar_available = True    

trunk/anuga_core/source/anuga_parallel/parallel_inlet_operator.py

@@ -21 +21 @@
     discharge_routine method for specific subclasses)
 
-    Input: domain, Two points
+    Input: domain, line, 
     """
 

trunk/anuga_core/source/anuga_parallel/test_all.py

@@ -20 +20 @@
 #List files that should be excluded from the testing process.
 #E.g. if they are known to fail and under development
-exclude_files = ['test_parallel_distribute_domain.py']
+exclude_files = ['test_failure.py']
 
 # Directories that should not be searched for test files.

trunk/anuga_core/source/anuga_parallel/test_parallel_distribute_domain.py

@@ -14 +14 @@
 import os
 import sys
+
+
+
+import numpy as num
+
+#------------------------------------------
+# Import pypar without the initial output
+#------------------------------------------
+class NullStream:
+    def write(self,text):
+        pass
+sys.stdout = NullStream()
 import pypar
-
-import numpy as num
-
-
-
+sys.stdout = sys.__stdout__
+
+
+#------------------------------------------
+# anuga imports
+#------------------------------------------
 
 from anuga.utilities.numerical_tools import ensure_numeric
@@ -35 +48 @@
 
 
-from anuga_parallel.interface import distribute, myid, numprocs, finalize
+from anuga_parallel import distribute, myid, numprocs, finalize
 
 
@@ -164 +177 @@
 class Test_parallel_distribute_domain(unittest.TestCase):
     def test_parallel_distribute_domain(self):
-        print "Expect this test to fail if not run from the parallel directory."
+        #print "Expect this test to fail if not run from the parallel directory."
         result = os.system("mpirun -np %d python test_parallel_distribute_domain.py" % nprocs)
         assert_(result == 0)

@@ -1 +1 @@
 .python_cache
+.temp