Changeset 3434240 in sasmodels

Timestamp:

Apr 19, 2016 7:07:30 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:

81cd2a2

Parents:

f36c1b7

Message:

use unittest test runner if xmlrunner is not available

File:

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

sasmodels/model_test.py

@@ -234 +234 @@
     Returns 0 if success or 1 if any tests fail.
     """
-    import xmlrunner
+    try:
+        import xmlrunner
+        runner = xmlrunner.XMLTestRunner(output='logs', verbosity=verbosity)
+    except:
+        runner = unittest.TextTestRunner()
 
     models = sys.argv[1:]
@@ -273 +277 @@
         return 1
 
-    #runner = unittest.TextTestRunner()
-    runner = xmlrunner.XMLTestRunner(output='logs', verbosity=verbosity)
     result = runner.run(make_suite(loaders, models))
     return 1 if result.failures or result.errors else 0