From 567b1ea7a137757d32d5b187abe744bd4ee27b85 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Wed, 21 Feb 2018 17:56:49 -0300 Subject: [PATCH] Move user_properties to the end of parameter list for backward compatibility --- _pytest/runner.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/_pytest/runner.py b/_pytest/runner.py index e8aac76fcfe..6792387db82 100644 --- a/_pytest/runner.py +++ b/_pytest/runner.py @@ -317,8 +317,7 @@ def pytest_runtest_makereport(item, call): sections.append(("Captured %s %s" % (key, rwhen), content)) return TestReport(item.nodeid, item.location, keywords, outcome, longrepr, when, - item.user_properties, - sections, duration) + sections, duration, user_properties=item.user_properties) class TestReport(BaseReport): @@ -327,8 +326,7 @@ class TestReport(BaseReport): """ def __init__(self, nodeid, location, keywords, outcome, - longrepr, when, user_properties, - sections=(), duration=0, **extra): + longrepr, when, sections=(), duration=0, user_properties=(), **extra): #: normalized collection node id self.nodeid = nodeid