Changeset d6adfbe in sasmodels

Timestamp:

Mar 3, 2015 7:07:11 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

12c810f

Parents:

e819f71

Message:

make sure test failure raises an error; support nosetests as test driver

Files:

• .gitignore (modified) (1 diff)
• sasmodels/model_test.py (modified) (4 diffs)

.gitignore

@@ -12 +12 @@
 .mplconfig
 /pylint_violations.txt
+/coverage.xml
+/.coverage

sasmodels/model_test.py

@@ -29 +29 @@
 
         [ {parameters}, (qx, qy), I(qx, Iqy)],
-        [ {parameters}, [(qx1, qy1), (qx2, qy2), ...], [I(qx1,qy1), I(qx2,qy2), ...],
+        [ {parameters}, [(qx1, qy1), (qx2, qy2), ...],
+                        [I(qx1,qy1), I(qx2,qy2), ...]],
 
         [ {parameters}, 'ER', ER(pars) ],
@@ -80 +81 @@
 def suite(loaders, models):
 
+    ModelTestCase = _hide_model_case_from_nosetests()
     suite = unittest.TestSuite()
 
@@ -127 +129 @@
     return suite
 
-class ModelTestCase(unittest.TestCase):
-    
-    def __init__(self, test_name, definition, loader, tests):
-        unittest.TestCase.__init__(self)
-        
-        self.test_name = test_name
-        self.definition = definition
-        self.loader = loader
-        self.tests = tests
-
-    def runTest(self):
-        #print "running", self.test_name
-        try:
-            model = self.loader(self.definition)
-            for test in self.tests:
-                pars, Q, I = test
-
-                if not isinstance(I, list):
-                    I = [I]
-                if not isinstance(Q, list):
-                    Q = [Q]
-
-                self.assertEqual(len(I), len(Q))
-
-                if Q[0] == 'ER':
-                    Iq = [call_ER(kernel, pars)]
-                elif Q[0] == 'VR':
-                    Iq = [call_VR(kernel, pars)]
-                elif isinstance(Q[0], tuple):
-                    Qx,Qy = zip(*Q)
-                    Q_vectors = [np.array(Qx), np.array(Qy)]
-                    kernel = make_kernel(model, Q_vectors)
-                    Iq = call_kernel(kernel, pars)
-                else:
-                    Q_vectors = [np.array(Q)]
-                    kernel = make_kernel(model, Q_vectors)
-                    Iq = call_kernel(kernel, pars)
-            
-                self.assertGreater(len(Iq), 0)    
-                self.assertEqual(len(I), len(Iq))              
-                
-                for q, i, iq in zip(Q, I, Iq):
-                    if i is None:
-                        # smoke test --- make sure it runs and produces a value
-                        self.assertTrue(np.isfinite(iq), 'q:%s; not finite; actual:%s' % (q, iq))
+def _hide_model_case_from_nosetests():
+    class ModelTestCase(unittest.TestCase):
+        def __init__(self, test_name, definition, loader, tests):
+            unittest.TestCase.__init__(self)
+
+            self.test_name = test_name
+            self.definition = definition
+            self.loader = loader
+            self.tests = tests
+
+        def runTest(self):
+            try:
+                model = self.loader(self.definition)
+                for test in self.tests:
+                    pars, Q, I = test
+
+                    if not isinstance(I, list):
+                        I = [I]
+                    if not isinstance(Q, list):
+                        Q = [Q]
+
+                    self.assertEqual(len(I), len(Q))
+
+                    if Q[0] == 'ER':
+                        Iq = [call_ER(kernel, pars)]
+                    elif Q[0] == 'VR':
+                        Iq = [call_VR(kernel, pars)]
+                    elif isinstance(Q[0], tuple):
+                        Qx,Qy = zip(*Q)
+                        Q_vectors = [np.array(Qx), np.array(Qy)]
+                        kernel = make_kernel(model, Q_vectors)
+                        Iq = call_kernel(kernel, pars)
                     else:
-                        err = abs(i - iq)
-                        nrm = abs(i)
-                        self.assertLess(err * 10**5, nrm, 'q:%s; expected:%s; actual:%s' % (q, i, iq))
-                    
-        except Exception,exc: 
-            annotate_exception(exc, self.test_name)
-            raise
+                        Q_vectors = [np.array(Q)]
+                        kernel = make_kernel(model, Q_vectors)
+                        Iq = call_kernel(kernel, pars)
+
+                    self.assertGreater(len(Iq), 0)
+                    self.assertEqual(len(I), len(Iq))
+
+                    for q, i, iq in zip(Q, I, Iq):
+                        if i is None:
+                            # smoke test --- make sure it runs and produces a value
+                            self.assertTrue(np.isfinite(iq), 'q:%s; not finite; actual:%s' % (q, iq))
+                        else:
+                            err = abs(i - iq)
+                            nrm = abs(i)
+                            self.assertLess(err * 10**5, nrm, 'q:%s; expected:%s; actual:%s' % (q, i, iq))
+
+            except Exception,exc:
+                annotate_exception(exc, self.test_name)
+                raise
+
+    return ModelTestCase
+
+
+# let nosetests sniff out the tests
+def model_tests():
+    tests = suite(['opencl','dll'],['all'])
+    for test_i in tests:
+        yield test_i.runTest
 
 def main():
-
     models = sys.argv[1:]
     if models and models[0] == 'opencl':
         if load_model_cl is None:
             print >>sys.stderr, "opencl is not available"
-            sys.exit(1)
+            return 1
         loaders = ['opencl']
         models = models[1:]
@@ -197 +206 @@
         if load_model_cl is None:
             print >>sys.stderr, "opencl is not available"
-            sys.exit(1)
+            return 1
         loaders = ['opencl', 'dll']
         models = models[1:]
     else:
         loaders = ['opencl', 'dll']
-    if models:
-        runner = unittest.TextTestRunner()
-        runner.run(suite(loaders, models))
-    else:
+    if not models:
         print >>sys.stderr, "usage: python -m sasmodels.model_test [opencl|dll|opencl_and_dll] model1 model2 ..."
         print >>sys.stderr, "if model1 is 'all', then all except the remaining models will be tested"
+        return 1
+
+    #run_tests(loaders, models)
+    runner = unittest.TextTestRunner()
+    result = runner.run(suite(loaders, models))
+    return 1 if result.failures or result.errors else 0
 
 if __name__ == "__main__":
-    main()
+    sys.exit(main())