Changeset 479d0f3 in sasmodels

Timestamp:

Oct 10, 2016 11:17:15 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

8f93522, e77872e

Parents:

3c852d4

Message:

run_one() uses dll if OpenCL is not available. Fixes #706.

File:

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

sasmodels/model_test.py

@@ -121 +121 @@
 
             # test using dll if desired
-            if 'dll' in loaders:
+            if 'dll' in loaders or not core.HAVE_OPENCL:
                 test_name = "Model: %s, Kernel: dll"%model_name
                 test_method_name = "test_%s_dll" % model_info.id
@@ -270 +270 @@
 
     # Build a test suite containing just the model
-    loaders = ['opencl']
+    loaders = ['opencl'] if core.HAVE_OPENCL else ['dll']
     models = [model]
     try:
@@ -334 +334 @@
         models = models[1:]
     elif models and models[0] == 'opencl_and_dll':
-        loaders = ['opencl', 'dll']
+        loaders = ['opencl', 'dll'] if core.HAVE_OPENCL else ['dll']
         models = models[1:]
     else:
-        loaders = ['opencl', 'dll']
+        loaders = ['opencl', 'dll'] if core.HAVE_OPENCL else ['dll']
     if not models:
         print("""\
@@ -366 +366 @@
     Run "nosetests sasmodels" on the command line to invoke it.
     """
-    tests = make_suite(['opencl', 'dll'], ['all'])
+    loaders = ['opencl', 'dll'] if core.HAVE_OPENCL else ['dll']
+    tests = make_suite(loaders, ['all'])
     for test_i in tests:
-        yield test_i.run_all
+        # In order for nosetest to see the correct test name, need to set
+        # the description attribute of the returned function.  Since we
+        # can't do this for the returned instance, wrap it in a lambda and
+        # set the description on the lambda.  Otherwise we could just do:
+        #    yield test_i.run_all
+        L = lambda: test_i.run_all()
+        L.description = test_i.test_name
+        yield L