Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Changelog

## [Unreleased]
### Fixed
- Issue [#397](https://github.com/reportportal/agent-python-pytest/issues/397) pytest launch stuck with xdist, by @HardNorth

## [5.5.1]
### Added
- Too long BDD Step name truncation on reporting, by @HardNorth
- `use_index` parameter for `@pytest.mark.parametrize` decorator, which replaces parameter values with their indexes in the list, by @ramir-dn
Expand Down
6 changes: 4 additions & 2 deletions pytest_reportportal/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -433,12 +433,14 @@ def _merge_code(self, test_tree: Dict[str, Any]) -> None:
self._merge_code_with_separator(test_tree, "::")

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

@check_rp_enabled
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
test=pytest

[metadata]
description_file = README.rst
description_file = README.md

[sdist]
formats=gztar
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from setuptools import setup

__version__ = "5.5.1"
__version__ = "5.5.2"


def read_file(fname):
Expand Down