Changeset 0e7611b in sasmodels for conftest.py

Timestamp:

Jan 31, 2018 6:03:03 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:

b3af1c2

Parents:

335271e

Message:

pytest: re-enable referencing on yielded tests

File:

• conftest.py (modified) (1 diff)

conftest.py

@@ -49 +49 @@
     """
     if collector.istestfunction(obj, name) and is_generator(obj):
-        tests = [pytest.Function(name, parent=collector, args=yielded[1:], callobj=yielded[0])
-                 for yielded in obj()]
+        tests = []
+        for number, yielded in enumerate(obj()):
+            index, call, args = split_yielded_test(yielded, number)
+            test = pytest.Function(name+index, collector, args=args, callobj=call)
+            tests.append(test)
         return tests
 
+def split_yielded_test(obj, number):
+    if not isinstance(obj, (tuple, list)):
+        obj = (obj,)
+    if not callable(obj[0]):
+        index = "['%s']"%obj[0]
+        obj = obj[1:]
+    else:
+        index = "[%d]"%number
+    call, args = obj[0], obj[1:]
+    return index, call, args
 
 USE_DOCSTRING_AS_DESCRIPTION = True