Fix item collection breaking when non Function items are present (#318)

* Fix item collection breaking when non Function items are present

* Bump version 3.2.1

Author: youtux

CHANGES.rst

@@ -4,6 +4,11 @@ Changelog
 Unreleased
 ----------
 
+3.2.1
+----------
+
+- Fix regression introduced in 3.2.0 where pytest-bdd would break in presence of test items that are not functions.
+
 3.2.0
 ----------
 

pytest_bdd/__init__.py

@@ -3,6 +3,6 @@
 from pytest_bdd.steps import given, when, then
 from pytest_bdd.scenario import scenario, scenarios
 
-__version__ = '3.2.0'
+__version__ = '3.2.1'
 
 __all__ = [given.__name__, when.__name__, then.__name__, scenario.__name__, scenarios.__name__]

pytest_bdd/plugin.py

@@ -101,6 +101,9 @@ def pytest_collection_modifyitems(session, config, items):
     # TODO: Try to only re-sort the items that have __pytest_bdd_counter__, and not the others,
     #  since there may be other hooks that are executed before this and that want to reorder item as well
     def item_key(item):
-        pytest_bdd_counter = getattr(item.function, '__pytest_bdd_counter__', 0)
-        return (item.reportinfo()[:2], pytest_bdd_counter)
+        if isinstance(item, pytest.Function):
+            declaration_order = getattr(item.function, '__pytest_bdd_counter__', 0)
+        else:
+            declaration_order = 0
+        return (item.reportinfo()[:2], declaration_order)
     items.sort(key=item_key)

tests/test_hooks.py

@@ -30,3 +30,26 @@ def test_foo():
 
     assert result.stdout.lines.count('pytest_pyfunc_call hook') == 1
     assert result.stdout.lines.count('pytest_generate_tests hook') == 1
+
+
+def test_item_collection_does_not_break_on_non_function_items(testdir):
+    """Regression test for https://github.com/pytest-dev/pytest-bdd/issues/317"""
+    testdir.makeconftest("""
+    import pytest
+
+    @pytest.mark.tryfirst
+    def pytest_collection_modifyitems(session, config, items):
+        items[:] = [CustomItem(name=item.name, parent=item.parent) for item in items]
+
+    class CustomItem(pytest.Item):
+        def runtest(self):
+            assert True
+    """)
+
+    testdir.makepyfile("""
+    def test_convert_me_to_custom_item_and_assert_true():
+        assert False
+    """)
+
+    result = testdir.runpytest()
+    result.assert_outcomes(passed=1)