Skip to content

Commit d4677dd

Browse files
committed
Make the fix for config used for testdir simpler
- taken from ftobia/pytest-ordering#76
1 parent dbae93a commit d4677dd

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

pytest_order/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,7 @@ def mark_binning(item, keys, start, end, before, after, dep, unordered, alias):
146146

147147
if "order" in keys:
148148
mark = item.get_closest_marker("order")
149-
order = mark.args[0] if mark.args else None
150-
if order is None:
151-
order = mark.kwargs.get("index")
149+
order = mark.args[0] if mark.args else mark.kwargs.get("index")
152150
before_mark = mark.kwargs.get("before")
153151
after_mark = mark.kwargs.get("after")
154152
if order is not None:

tests/conftest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77

88
@pytest.fixture
9-
def item_names_for(request, testdir):
9+
def item_names_for(testdir):
1010
def _item_names_for(tests_content):
1111
items = testdir.getitems(tests_content)
12-
hook = request.config.hook
12+
hook = items[0].config.hook
1313
hook.pytest_collection_modifyitems(session=items[0].session,
14-
config=request.config, items=items)
14+
config=items[0].config, items=items)
1515
return [item.name for item in items]
1616

1717
return _item_names_for

0 commit comments

Comments
 (0)