Skip to content

fixes #300 : RemovedInPytest4Warning #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sseliverstov merged 1 commit into from
Nov 19, 2018
Merged

fixes #300 : RemovedInPytest4Warning #306

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions allure-pytest/src/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@


def get_marker_value(item, keyword):
marker = item.keywords.get(keyword)
marker = item.get_closest_marker(keyword)
return marker.args[0] if marker and marker.args else None


Expand All @@ -42,7 +42,7 @@ def allure_description_html(item):
def allure_labels(item):
for keyword in item.keywords.keys():
if keyword.startswith(ALLURE_LABEL_PREFIX):
marker = item.get_marker(keyword)
marker = item.get_closest_marker(keyword)
label_type = marker.kwargs['label_type']
if label_type in ALLURE_UNIQUE_LABELS:
yield (label_type, marker.args[0])
Expand All @@ -54,7 +54,7 @@ def allure_labels(item):
def allure_links(item):
for keyword in item.keywords.keys():
if keyword.startswith(ALLURE_LINK_PREFIX):
marker = item.get_marker(keyword)
marker = item.get_closest_marker(keyword)
link_type = marker.kwargs['link_type']
url = marker.args[0]
name = marker.kwargs['name']
Expand Down