Changeset 8256


Ignore:
Timestamp:
Nov 29, 2011, 5:46:48 PM (11 years ago)
Author:
steve
Message:

Got test_all working again

Location:
trunk/anuga_core/source/anuga_parallel
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/anuga_core/source/anuga_parallel

    • Property svn:ignore
      •  

        old new  
        11.python_cache
         2.temp
  • trunk/anuga_core/source/anuga_parallel/parallel_abstraction.py

    r8115 r8256  
    5959    pypar_available = False
    6060else:
     61    import sys
     62    sys.stdout = NullStream()
    6163    from pypar import *
     64    sys.stdout = sys.__stdout__
    6265    pypar_available = True   
  • trunk/anuga_core/source/anuga_parallel/parallel_inlet_operator.py

    r8227 r8256  
    2121    discharge_routine method for specific subclasses)
    2222
    23     Input: domain, Two points
     23    Input: domain, line,
    2424    """
    2525
  • trunk/anuga_core/source/anuga_parallel/test_all.py

    r8115 r8256  
    2020#List files that should be excluded from the testing process.
    2121#E.g. if they are known to fail and under development
    22 exclude_files = ['test_parallel_distribute_domain.py']
     22exclude_files = ['test_failure.py']
    2323
    2424# Directories that should not be searched for test files.
  • trunk/anuga_core/source/anuga_parallel/test_parallel_distribute_domain.py

    r7877 r8256  
    1414import os
    1515import sys
     16
     17
     18
     19import numpy as num
     20
     21#------------------------------------------
     22# Import pypar without the initial output
     23#------------------------------------------
     24class NullStream:
     25    def write(self,text):
     26        pass
     27sys.stdout = NullStream()
    1628import pypar
    17 
    18 import numpy as num
    19 
    20 
    21 
     29sys.stdout = sys.__stdout__
     30
     31
     32#------------------------------------------
     33# anuga imports
     34#------------------------------------------
    2235
    2336from anuga.utilities.numerical_tools import ensure_numeric
     
    3548
    3649
    37 from anuga_parallel.interface import distribute, myid, numprocs, finalize
     50from anuga_parallel import distribute, myid, numprocs, finalize
    3851
    3952
     
    164177class Test_parallel_distribute_domain(unittest.TestCase):
    165178    def test_parallel_distribute_domain(self):
    166         print "Expect this test to fail if not run from the parallel directory."
     179        #print "Expect this test to fail if not run from the parallel directory."
    167180        result = os.system("mpirun -np %d python test_parallel_distribute_domain.py" % nprocs)
    168181        assert_(result == 0)
Note: See TracChangeset for help on using the changeset viewer.