Skip to content

Commit 86c1922

Browse files
committed
fix(session-keywords): timeout could be a touple #344
1 parent e560999 commit 86c1922

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

src/RequestsLibrary/SessionKeywords.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,14 @@ def _check_status(expected_status, resp, msg=None):
581581
msg = "{}Url: {} Expected status".format(msg, resp.url)
582582
assert_equal(resp.status_code, expected_status, msg)
583583

584-
def _get_timeout(self, timeout):
585-
return float(timeout) if timeout is not None else self.timeout
584+
def _get_timeout(self, timeout):
585+
result = timeout if timeout is not None else self.timeout
586+
587+
if result is None:
588+
return None
589+
if type(result) is tuple:
590+
return (float(result[0]), float(result[1]))
591+
return float(result)
586592

587593
def _capture_output(self):
588594
if self.debug >= 1:

utests/test_RequestsOnSessionKeywords.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,13 @@ def test_common_request_with_float_timeout_override():
7777
session, m_common_request = build_mocked_session_common_request(timeout=None)
7878
m_common_request('get', session, '/', timeout=123.4)
7979
session.get.assert_called_with('http://mocking.rules/', timeout=123.4, cookies={})
80+
81+
def test_common_request_with_touple_timeout():
82+
session, m_common_request = build_mocked_session_common_request(timeout=(123.4, 432.1))
83+
m_common_request('get', session, '/')
84+
session.get.assert_called_with('http://mocking.rules/', timeout=(123.4, 432.1), cookies={})
85+
86+
def test_common_request_with_touple_timeout_override():
87+
session, m_common_request = build_mocked_session_common_request(timeout=None)
88+
m_common_request('get', session, '/', timeout=(123.4, 432.1))
89+
session.get.assert_called_with('http://mocking.rules/', timeout=(123.4, 432.1), cookies={})

0 commit comments

Comments
 (0)