Changes in / [711d8e2:6ea6902] in sasmodels

File:

• sasmodels/model_test.py (modified) (4 diffs)

sasmodels/model_test.py

@@ -66 +66 @@
     args = exc.args
     if not args:
-        exc.args = (msg,)
+        arg0 = msg
     else:
-        try:
-            arg0 = " ".join((args[0],msg))
-            exc.args = tuple([arg0] + list(args[1:]))
-        except:
-            exc.args = (" ".join((str(exc),msg)),)
+        arg0 = " ".join((args[0],msg))
+    exc.args = tuple([arg0] + list(args[1:]))
     
 def suite():
@@ -86 +83 @@
 
         model = getattr(module, model_name, None)
-        smoke_tests = [[{},0.1,None],[{},(0.1,0.1),None]]
-        tests = smoke_tests + getattr(model, 'tests', [])
+        tests = getattr(model, 'tests', [])
         
         if tests:
@@ -124 +120 @@
                     
                 if isinstance(Q[0], tuple):
-                    Qx,Qy = zip(*Q)
-                    Q_vectors = [np.array(Qx), np.array(Qy)]
+                    npQ = [np.array([Qi[d] for Qi in Q]) for d in xrange(len(Q[0]))]
                 else:
-                    Q_vectors = [np.array(Q)]
+                    npQ = [np.array(Q)]
 
-                self.assertEqual(len(I), len(Q))
+                self.assertTrue(Q)
+                self.assertEqual(len(I), len(Q))    
             
-                Iq = eval_kernel(self.kernel, Q_vectors, params)
+                Iq = eval_kernel(self.kernel, npQ, params)
             
                 self.assertGreater(len(Iq), 0)    
@@ -137 +133 @@
                 
                 for q, i, iq in zip(Q, I, Iq):
-                    if i is None: continue # smoke test --- make sure it runs
                     err = np.abs(i - iq)
                     nrm = np.abs(i)