Changeset 8db25bf in sasmodels for sasmodels/model_test.py

Timestamp:

Sep 18, 2017 3:58:10 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

bf09f55

Parents:

9bc4882 (diff), 058460c (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 ticket-776-orientation

File:

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

sasmodels/model_test.py

@@ -201 +201 @@
                 ({}, 'VR', None),
                 ]
-
-            tests = smoke_tests + self.info.tests
+            tests = smoke_tests
+            if self.info.tests is not None:
+                tests += self.info.tests
             try:
                 model = build_model(self.info, dtype=self.dtype,
@@ -371 +372 @@
         stream.writeln(traceback.format_exc())
         return
-
     # Run the test suite
     suite.run(result)