Skip to content

Commit 41d0296

Browse files
authored
Construct Item object using from_parent for Pytest >= 6.0.0
1 parent 68d8392 commit 41d0296

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

pytest_reportportal/service.py

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -472,9 +472,14 @@ def _add_item_hier_parts_dirs(item, hier_flag, dirs_level, report_parts,
472472
item_dir = dirs_parts[path]
473473
rp_name = ""
474474
else:
475-
item_dir = File(dir_path, nodeid=dir_name,
476-
session=item.session,
477-
config=item.session.config)
475+
if hasattr(Item, "from_parent"):
476+
item_dir = File.from_parent(parent=item,
477+
fspath=dir_path,
478+
nodeid=dir_name)
479+
else:
480+
item_dir = File(dir_path, nodeid=dir_name,
481+
session=item.session,
482+
config=item.session.config)
478483
rp_name += dir_name
479484
item_dir._rp_name = rp_name
480485
dirs_parts[path] = item_dir
@@ -514,9 +519,14 @@ def _add_item_hier_parts_parametrize(item, report_parts, tests_parts,
514519
if test_fullname in tests_parts:
515520
item_test = tests_parts[test_fullname]
516521
else:
517-
item_test = Item(test_fullname, nodeid=test_fullname,
518-
session=item.session,
519-
config=item.session.config)
522+
if hasattr(Item, "from_parent"):
523+
item_test = Item.from_parent(parent=item,
524+
name=test_fullname,
525+
nodeid=test_fullname)
526+
else:
527+
item_test = Item(test_fullname, nodeid=test_fullname,
528+
session=item.session,
529+
config=item.session.config)
520530
item_test._rp_name = rp_name
521531
item_test.obj = item.obj
522532
item_test.keywords = item.keywords

0 commit comments

Comments
 (0)