Skip to content

Commit

Permalink
Merge branch 'main' into tiledds-improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
Cadair committed Sep 26, 2024
2 parents ec2048f + fb3ca0d commit 795c4b6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog/440.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix mark argument parsing in the new pytest hook.
2 changes: 1 addition & 1 deletion dkist/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,6 @@ def pytest_runtest_call(item):
if ds:
item.funcargs[replace_arg] = load_dataset(ds)
if tds:
item.funcargs[tdsmark.args[0]] = load_dataset(tds)
item.funcargs[replace_arg] = load_dataset(tds)

yield item

0 comments on commit 795c4b6

Please sign in to comment.