Changeset 65314f7 in sasmodels

Timestamp:

Sep 1, 2017 6:47:21 AM (7 years ago)

Author:

lewis

Branches:

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

Children:

61a4bd4

Parents:

bcdd6c9

Message:

Ensure tests for new sum/multi models pass

Location:

sasmodels

Files:

• model_test.py (modified) (2 diffs)
• modelinfo.py (modified) (1 diff)

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)

sasmodels/modelinfo.py

@@ -718 +718 @@
     models when the model is first called, not when the model is loaded.
     """
+    if hasattr(kernel_module, "model_info"):
+        # Custom sum/multi models
+        return kernel_module.model_info
     info = ModelInfo()
     #print("make parameter table", kernel_module.parameters)