Changeset f6fd413 in sasmodels

Timestamp:

Feb 7, 2018 12:41:04 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:

c11d09f

Parents:

b4272a2

Message:

pytest: is_generator is not part of public api, so reimplement it in conftest

File:

• conftest.py (modified) (2 diffs)

conftest.py

@@ -17 +17 @@
 
 import os.path
+import inspect
 
 import pytest
 from _pytest.unittest import TestCaseFunction
-from _pytest.compat import is_generator
 
 def pytest_pycollect_makeitem(collector, name, obj):
@@ -55 +55 @@
             tests.append(test)
         return tests
+
+def is_generator(func):
+    """
+    Returns True if function has yield.
+    """
+    # Cribbed from _pytest.compat is_generator and iscoroutinefunction; these
+    # may not be available as part of pytest 4.
+    coroutine = (getattr(func, '_is_coroutine', False) or
+                 getattr(inspect, 'iscoroutinefunction', lambda f: False)(func))
+    generator = inspect.isgeneratorfunction(func)
+    return generator and not coroutine
 
 def split_yielded_test(obj, number):