Skip to content

Commit d537e44

Browse files
authored
Merge pull request #363 from reportportal/develop
Release
2 parents 51fe2ca + 9af636d commit d537e44

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
# Changelog
22

33
## [Unreleased]
4+
### Fixed
5+
- Issue [#362](https://github.com/reportportal/agent-python-pytest/issues/362): Debug mode passing, by @HardNorth
6+
7+
## [5.4.0]
48
### Added
59
- Pytest version >= 8 support, by @HardNorth
610
### Removed
7-
- `Packege` and `Dir` item types processing on test collection. This is done to preserve backward compatibility and improve name consistency, by @HardNorth
11+
- `Package` and `Dir` item types processing on test collection. This is done to preserve backward compatibility and improve name consistency, by @HardNorth
812
### Changed
913
- `rp_issue_system_url` renamed to `rp_bts_issue_url` to be consistent with other agents, by @HardNorth
1014

pytest_reportportal/service.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
from .config import AgentConfig
3333

3434
try:
35+
# noinspection PyProtectedMember
3536
from pytest import Instance
3637
except ImportError:
3738
# in pytest >= 7.0 this type was removed
@@ -196,7 +197,6 @@ def _build_start_launch_rq(self):
196197
'name': self._config.rp_launch,
197198
'start_time': timestamp(),
198199
'description': self._config.rp_launch_description,
199-
'mode': self._config.rp_mode,
200200
'rerun': self._config.rp_rerun,
201201
'rerun_of': self._config.rp_rerun_of
202202
}
@@ -897,7 +897,8 @@ def start(self) -> None:
897897
log_batch_payload_size=self._config.rp_log_batch_payload_size,
898898
launch_uuid_print=self._config.rp_launch_uuid_print,
899899
print_output=self._config.rp_launch_uuid_print_output,
900-
http_timeout=self._config.rp_http_timeout
900+
http_timeout=self._config.rp_http_timeout,
901+
mode=self._config.rp_mode
901902
)
902903
if hasattr(self.rp, "get_project_settings"):
903904
self.project_settings = self.rp.get_project_settings()

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from setuptools import setup
1919

2020

21-
__version__ = '5.4.0'
21+
__version__ = '5.4.1'
2222

2323

2424
def read_file(fname):

tests/integration/test_debug_mode.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,8 @@ def test_launch_mode(mock_client_init, mode, expected_mode):
4040
variables=variables)
4141
assert int(result) == 0, 'Exit code should be 0 (no errors)'
4242

43-
mock_client = mock_client_init.return_value
44-
assert mock_client.start_launch.call_count == 1, \
45-
'"start_launch" method was not called'
43+
assert mock_client_init.call_count == 1, "client wasn't initialized"
4644

47-
call_args = mock_client.start_launch.call_args_list
48-
start_launch_kwargs = call_args[0][1]
49-
assert start_launch_kwargs['mode'] == expected_mode
45+
init_kwargs = mock_client_init.call_args_list[0][1]
46+
assert 'mode' in init_kwargs
47+
assert init_kwargs['mode'] == expected_mode

0 commit comments

Comments
 (0)