Changeset 639c4e3 in sasmodels for sasmodels/model_test.py

Timestamp:

Apr 26, 2016 9:43:53 AM (8 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:

ed246ab

Parents:

cebbb5a (diff), fa227d3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into polydisp

Conflicts:

sasmodels/kerneldll.py
sasmodels/models/rpa.c

File:

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

sasmodels/model_test.py

@@ -288 +288 @@
     Returns 0 if success or 1 if any tests fail.
     """
-    import xmlrunner
+    try:
+        from xmlrunner import XMLTestRunner as TestRunner
+        test_args = { 'output': 'logs' }
+    except ImportError:
+        from unittest import TextTestRunner as TestRunner
+        test_args = { }
 
     models = sys.argv[1:]
@@ -327 +332 @@
         return 1
 
-    #runner = unittest.TextTestRunner()
-    runner = xmlrunner.XMLTestRunner(output='logs', verbosity=verbosity)
+    runner = TestRunner(verbosity=verbosity, **test_args)
     result = runner.run(make_suite(loaders, models))
     return 1 if result.failures or result.errors else 0