Skip to content

Commit 9a119c7

Browse files
authored
Merge pull request #401 from reportportal/develop
Release
2 parents 0248163 + 9c4c08f commit 9a119c7

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Changelog
22

33
## [Unreleased]
4+
### Fixed
5+
- Issue [#397](https://github.com/reportportal/agent-python-pytest/issues/397) pytest launch stuck with xdist, by @HardNorth
6+
7+
## [5.5.1]
48
### Added
59
- Too long BDD Step name truncation on reporting, by @HardNorth
610
- `use_index` parameter for `@pytest.mark.parametrize` decorator, which replaces parameter values with their indexes in the list, by @ramir-dn

pytest_reportportal/service.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,12 +433,14 @@ def _merge_code(self, test_tree: Dict[str, Any]) -> None:
433433
self._merge_code_with_separator(test_tree, "::")
434434

435435
def _build_item_paths(self, leaf: Dict[str, Any], path: List[Dict[str, Any]]) -> None:
436-
if "children" in leaf and len(leaf["children"]) > 0:
436+
children = leaf.get("children", {})
437+
all_background_steps = all([isinstance(child, Background) for child in children.keys()])
438+
if len(children) > 0 and not all_background_steps:
437439
path.append(leaf)
438440
for name, child_leaf in leaf["children"].items():
439441
self._build_item_paths(child_leaf, path)
440442
path.pop()
441-
if leaf["type"] != LeafType.ROOT:
443+
elif leaf["type"] != LeafType.ROOT:
442444
self._tree_path[leaf["item"]] = path + [leaf]
443445

444446
@check_rp_enabled

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
test=pytest
33

44
[metadata]
5-
description_file = README.rst
5+
description_file = README.md
66

77
[sdist]
88
formats=gztar

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from setuptools import setup
1919

20-
__version__ = "5.5.1"
20+
__version__ = "5.5.2"
2121

2222

2323
def read_file(fname):

0 commit comments

Comments
 (0)