--- trunk/escript/py_src/test_util_unary_no_tagged_data.py 2005/12/21 22:43:48 399 +++ trunk/escript/py_src/test_util_unary_no_tagged_data.py 2005/12/21 23:13:39 400 @@ -225,9 +225,10 @@ arg=numarray.array(-15.0739210922) res=wherePositive(arg) ref=numarray.array(0.0) - if not isinstance(res,float): - self.failUnless(isinstance(res,numarray.NumArray),"wrong type of result.") + if isinstance(res,numarray.NumArray): self.failUnlessEqual(res.shape,(),"wrong shape of result.") + else: + self.failUnless(isinstance(res,float),"wrong type of result.") self.failUnless(Lsup(res-ref)<=self.RES_TOL*Lsup(ref),"wrong result") #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ def test_wherePositive_array_rank1(self):