Skip to content

Commit 136d261

Browse files
committed
Fix tests
1 parent 5f5cadf commit 136d261

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

tests/unit/test_plugin.py

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313

1414
"""This module includes unit tests for the plugin."""
1515

16-
from _pytest.config.argparsing import Parser
17-
import pytest
18-
from delayed_assert import expect, assert_expectations
19-
from requests.exceptions import RequestException
2016
# noinspection PyUnresolvedReferences
2117
from unittest import mock
2218

19+
import pytest
20+
from _pytest.config.argparsing import Parser
21+
from delayed_assert import expect, assert_expectations
2322
from reportportal_client.errors import ResponseError
23+
from requests.exceptions import RequestException
2424

2525
from pytest_reportportal.config import AgentConfig
2626
from pytest_reportportal.plugin import (
@@ -258,10 +258,8 @@ def test_pytest_sessionstart(mocked_session):
258258
:param mocked_session: pytest fixture
259259
"""
260260
mocked_session.config.pluginmanager.hasplugin.return_value = True
261-
mocked_session.config._reporter_config = mock.Mock(
262-
spec=AgentConfig(mocked_session.config))
261+
mocked_session.config._reporter_config = mock.Mock(spec=AgentConfig(mocked_session.config))
263262
mocked_session.config._reporter_config.rp_launch_attributes = []
264-
mocked_session.config._reporter_config.rp_launch_id = None
265263
mocked_session.config.py_test_service = mock.Mock()
266264
pytest_sessionstart(mocked_session)
267265
expect(lambda: mocked_session.config.py_test_service.init_service.called)
@@ -298,22 +296,20 @@ def test_pytest_sessionstart_launch_wait_fail(mocked_log, mocked_session):
298296
)
299297

300298

301-
@mock.patch('pytest_reportportal.plugin.is_control', mock.Mock())
302299
@mock.patch('pytest_reportportal.plugin.wait_launch', mock.Mock())
303-
def test_pytest_sessionstart_with_launch_id(mocked_session):
304-
"""Test session configuration if RP launch ID is set via command-line.
300+
def test_pytest_sessionstart_xdist(mocked_session):
301+
"""Test session configuration if it's worker xdist node.
305302
306303
:param mocked_session: pytest fixture
307304
"""
308305
mocked_session.config.pluginmanager.hasplugin.return_value = True
309-
mocked_session.config._reporter_config = mock.Mock(
310-
spec=AgentConfig(mocked_session.config))
306+
mocked_session.config._reporter_config = mock.Mock(spec=AgentConfig(mocked_session.config))
311307
mocked_session.config._reporter_config.rp_launch_attributes = []
312308
mocked_session.config._reporter_config.rp_launch_id = 1
309+
mocked_session.config.workerinput = 1
313310
mocked_session.config.py_test_service = mock.Mock()
314311
pytest_sessionstart(mocked_session)
315-
expect(lambda: mocked_session.config.py_test_service.start_launch.
316-
assert_not_called())
312+
expect(lambda: mocked_session.config.py_test_service.start_launch.assert_not_called())
317313
assert_expectations()
318314

319315

0 commit comments

Comments
 (0)