Changeset 81cd2a2 in sasmodels

Timestamp:

Apr 19, 2016 5:13:59 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:

e1454ab, abdd01c

Parents:

3434240

Message:

fix test runner patch

File:

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

sasmodels/model_test.py

@@ -235 +235 @@
     """
     try:
-        import xmlrunner
-        runner = xmlrunner.XMLTestRunner(output='logs', verbosity=verbosity)
-    except:
-        runner = unittest.TextTestRunner()
+        from xmlrunner import XMLTestRunner as TestRunner
+        test_args = { 'output': 'logs' }
+    except ImportError:
+        from unittest import TextTestRunner as TestRunner
+        test_args = { }
 
     models = sys.argv[1:]
@@ -277 +278 @@
         return 1
 
+    runner = TestRunner(verbosity=verbosity, **test_args)
     result = runner.run(make_suite(loaders, models))
     return 1 if result.failures or result.errors else 0