Skip to content

Commit d1be739

Browse files
committed
Test fixes
1 parent 3ed89c6 commit d1be739

File tree

2 files changed

+14
-24
lines changed

2 files changed

+14
-24
lines changed

reportportal_client/core/rp_responses.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,7 @@ def _get_json(data):
7171
:param data: requests.Response object
7272
:return: dict
7373
"""
74-
if not data.text:
75-
return {}
76-
try:
77-
return data.json()
78-
except ValueError as error:
79-
logger.warning('Invalid response: {0}: {1}'
80-
.format(error, data.text),
81-
exc_info=error)
82-
return {}
74+
return data.json()
8375

8476
@property
8577
def id(self):

tests/test_client.py

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
from six.moves import mock
1818

1919
from reportportal_client.helpers import timestamp
20-
from reportportal_client.static.defines import NOT_FOUND
2120

2221

2322
def connection_error(*args, **kwargs):
@@ -40,31 +39,30 @@ def invalid_response(*args, **kwargs):
4039

4140

4241
@pytest.mark.parametrize(
43-
'requests_method, client_method, client_params, expected_result',
42+
'requests_method, client_method, client_params',
4443
[
45-
('put', 'finish_launch', [timestamp()], NOT_FOUND),
46-
('put', 'finish_test_item', ['test_item_id', timestamp()], NOT_FOUND),
47-
('get', 'get_item_id_by_uuid', ['test_item_uuid'], NOT_FOUND),
48-
('get', 'get_launch_info', [], {}),
49-
('get', 'get_launch_ui_id', [], None),
50-
('get', 'get_launch_ui_url', [], None),
51-
('get', 'get_project_settings', [], {}),
52-
('post', 'start_launch', ['Test Launch', timestamp()], NOT_FOUND),
53-
('post', 'start_test_item', ['Test Item', timestamp(), 'STEP'],
54-
NOT_FOUND),
55-
('put', 'update_test_item', ['test_item_id'], NOT_FOUND)
44+
('put', 'finish_launch', [timestamp()]),
45+
('put', 'finish_test_item', ['test_item_id', timestamp()]),
46+
('get', 'get_item_id_by_uuid', ['test_item_uuid']),
47+
('get', 'get_launch_info', []),
48+
('get', 'get_launch_ui_id', []),
49+
('get', 'get_launch_ui_url', []),
50+
('get', 'get_project_settings', []),
51+
('post', 'start_launch', ['Test Launch', timestamp()]),
52+
('post', 'start_test_item', ['Test Item', timestamp(), 'STEP']),
53+
('put', 'update_test_item', ['test_item_id'])
5654
]
5755
)
5856
def test_connection_errors(rp_client, requests_method, client_method,
59-
client_params, expected_result):
57+
client_params):
6058
rp_client.launch_id = 'test_launch_id'
6159
getattr(rp_client.session, requests_method).side_effect = connection_error
6260
result = getattr(rp_client, client_method)(*client_params)
6361
assert result is None
6462

6563
getattr(rp_client.session, requests_method).side_effect = response_error
6664
result = getattr(rp_client, client_method)(*client_params)
67-
assert result == expected_result
65+
assert result is None
6866

6967

7068
@pytest.mark.parametrize(

0 commit comments

Comments
 (0)