Changeset 012cd34 in sasmodels

Timestamp:

Jul 20, 2018 4:46:06 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

c11d09f

Parents:

1d9998c

Message:

Shuffle tests to circumvent Qt5 unittest issue

File:

• sasmodels/model_test.py (modified) (3 diffs, 1 prop)

sasmodels/model_test.py

@@ -376 +376 @@
         stream.writeln(traceback.format_exc())
         return
-    # Run the test suite
-    suite.run(result)
-
-    # Print the failures and errors
-    for _, tb in result.errors:
-        stream.writeln(tb)
-    for _, tb in result.failures:
-        stream.writeln(tb)
 
     # Warn if there are no user defined tests.
@@ -393 +385 @@
     # iterator since we don't have direct access to the list of tests in the
     # test suite.
+    # In Qt5 suite.run() will clear all tests in the suite after running
+    # with no way of retaining them for the test below, so let's check
+    # for user tests before running the suite.
     for test in suite:
         if not test.info.tests:
@@ -399 +394 @@
     else:
         stream.writeln("Note: no test suite created --- this should never happen")
+
+    # Run the test suite
+    suite.run(result)
+
+    # Print the failures and errors
+    for _, tb in result.errors:
+        stream.writeln(tb)
+    for _, tb in result.failures:
+        stream.writeln(tb)
 
     output = stream.getvalue()