Skip to content

Commit a2dadcc

Browse files
committed
Client version update, property rename.
1 parent 24c8d1e commit a2dadcc

5 files changed

Lines changed: 15 additions & 10 deletions

File tree

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+
### Changed
5+
- Client version updated to [5.6.6](https://github.com/reportportal/client-Python/releases/tag/5.6.6), by @HardNorth
6+
### Fixed
7+
- Some configuration parameter names, which are different in the client, by @HardNorth
48

59
## [5.5.2]
610
### Fixed

pytest_reportportal/config.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class AgentConfig:
5353
rp_tests_attributes: Optional[List[str]]
5454
rp_launch_description: str
5555
rp_log_batch_size: int
56-
rp_log_batch_payload_size: int
56+
rp_log_batch_payload_limit: int
5757
rp_log_level: Optional[int]
5858
rp_log_format: Optional[str]
5959
rp_mode: str
@@ -100,11 +100,11 @@ def __init__(self, pytest_config: Config) -> None:
100100
self.rp_tests_attributes = self.find_option(pytest_config, "rp_tests_attributes")
101101
self.rp_launch_description = self.find_option(pytest_config, "rp_launch_description")
102102
self.rp_log_batch_size = int(self.find_option(pytest_config, "rp_log_batch_size"))
103-
batch_payload_size = self.find_option(pytest_config, "rp_log_batch_payload_size")
104-
if batch_payload_size:
105-
self.rp_log_batch_payload_size = int(batch_payload_size)
103+
batch_payload_size_limit = self.find_option(pytest_config, "rp_log_batch_payload_limit")
104+
if batch_payload_size_limit:
105+
self.rp_log_batch_payload_limit = int(batch_payload_size_limit)
106106
else:
107-
self.rp_log_batch_payload_size = MAX_LOG_BATCH_PAYLOAD_SIZE
107+
self.rp_log_batch_payload_limit = MAX_LOG_BATCH_PAYLOAD_SIZE
108108
self.rp_log_level = get_actual_log_level(pytest_config, "rp_log_level")
109109
self.rp_log_format = self.find_option(pytest_config, "rp_log_format")
110110
self.rp_thread_logging = to_bool(self.find_option(pytest_config, "rp_thread_logging") or False)

pytest_reportportal/plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ def add_shared_option(name, help_str, default=None, action="store"):
617617
parser.addini("rp_tests_attributes", type="args", help="Attributes for all tests items, e.g. Smoke")
618618
parser.addini("rp_log_batch_size", default="20", help="Size of batch log requests in async mode")
619619
parser.addini(
620-
"rp_log_batch_payload_size",
620+
"rp_log_batch_payload_limit",
621621
default=str(MAX_LOG_BATCH_PAYLOAD_SIZE),
622622
help="Maximum payload size in bytes of async batch log requests",
623623
)

pytest_reportportal/service.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ def _create_leaf(
285285
286286
:param leaf_type: the leaf type
287287
:param parent_item: parent pytest.Item of the current leaf
288-
:param item: leaf's pytest.Item
288+
:param item: the leaf's pytest.Item
289289
:return: a leaf
290290
"""
291291
return {
@@ -1126,7 +1126,8 @@ def start_bdd_scenario(self, feature: Feature, scenario: Scenario) -> None:
11261126
root_leaf = self._bdd_tree
11271127
if not root_leaf:
11281128
self._bdd_tree = root_leaf = self._create_leaf(LeafType.ROOT, None, None, item_id=self.parent_item_id)
1129-
children_leafs = root_leaf["children"]
1129+
# noinspection PyTypeChecker
1130+
children_leafs: Dict[Any, Any] = root_leaf["children"]
11301131
if feature in children_leafs:
11311132
feature_leaf = children_leafs[feature]
11321133
else:
@@ -1392,7 +1393,7 @@ def start(self) -> None:
13921393
retries=self._config.rp_api_retries,
13931394
verify_ssl=self._config.rp_verify_ssl,
13941395
launch_uuid=launch_id,
1395-
log_batch_payload_size=self._config.rp_log_batch_payload_size,
1396+
log_batch_payload_limit=self._config.rp_log_batch_payload_limit,
13961397
launch_uuid_print=self._config.rp_launch_uuid_print,
13971398
print_output=self._config.rp_launch_uuid_print_output,
13981399
http_timeout=self._config.rp_http_timeout,

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dill>=0.3.6
22
pytest>=4.6.10
3-
reportportal-client~=5.6.4
3+
reportportal-client~=5.6.6
44
aenum>=3.1.0

0 commit comments

Comments
 (0)