Changeset b3af1c2 in sasmodels

Timestamp:

Feb 1, 2018 5:49:11 AM (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:

3221de0

Parents:

0e7611b

Message:

conftest.py cleanup

File:

• conftest.py (modified) (5 diffs)

conftest.py

@@ -1 +1 @@
 """
-py.test hooks for sasmodels
+pytest hooks for sasmodels
 
-Hooks for running sasmodels tests via py.test.
+Hooks for running sasmodels tests via pytest.
 
 *pytest_collection_modifyitems* adds the test description to the end of
@@ -9 +9 @@
 "model_tests::[3]" becomes "model_tests::[3]::bcc_paracrystal-dll".  Need to
 leave the "::[3]" in the name since that is the way you can indicate this
-test specifically from the py.test command line. [This is perhaps because
+test specifically from the pytest command line. [This is perhaps because
 the modifyitems hook is only called after test selection.]
 
@@ -74 +74 @@
     """
     for item in items:
-        #print(item.nodeid, type(item))
-        #for attr in dir(item): not attr.startswith('__') and print(attr, getattr(item, attr))
         if isinstance(item, pytest.Function):
             if isinstance(item, TestCaseFunction):
@@ -93 +91 @@
             # yield args for the description
             if not description and getattr(item, '_args', ()):
-                description = str(item._args) if len(item._args) > 1 else str(item._args[0])
-            #print(item.nodeid, description, item._args)
+                description = (str(item._args) if len(item._args) > 1
+                               else str(item._args[0]))
 
+            # Set the description as part of the node identifier.
             if description:
                 # Strip spaces from start and end and strip dots from end
@@ -102 +101 @@
                 # Join multi-line descriptions into a single line
                 if '\n' in description:
-                    description = " ".join(line.strip() for line in description.split('\n'))
+                    description = " ".join(line.strip()
+                                           for line in description.split('\n'))
 
-            # Set the description as part of the node identifier.
-            if description:
-                #print(type(item), dir(item))
-                #print(item.nodeid, description)
-                #print(item.location, item.name, item.nodeid, item.originalname)
                 # Note: leave the current name mostly as-is since the prefix
                 # is needed to specify the nth test from a list of tests.
-                #print("updating with", description)
                 item.name += "::" + description
-            #print("=>", item.nodeid)