Merge pull request #375 from MarketSquare/344-inaccurate-timeout-kwarg-description-or-incorrect-handing-of-it

fix(session-keywords): timeout could be a touple #344

Author: lucagiove

src/RequestsLibrary/SessionKeywords.py

@@ -585,8 +585,14 @@ def _check_status(expected_status, resp, msg=None):
             msg = "{}Url: {} Expected status".format(msg, resp.url)
             assert_equal(resp.status_code, expected_status, msg)
 
-    def _get_timeout(self, timeout):
-        return float(timeout) if timeout is not None else self.timeout
+    def _get_timeout(self, timeout):        
+        result = timeout if timeout is not None else self.timeout
+        
+        if result is None:
+            return None
+        if type(result) is tuple:
+            return (float(result[0]), float(result[1]))
+        return float(result)
 
     def _capture_output(self):
         if self.debug >= 1:

src/RequestsLibrary/version.py

@@ -1 +1 @@
-VERSION = '1.0a5'
+VERSION = '1.0a7'

utests/test_RequestsOnSessionKeywords.py

@@ -77,3 +77,13 @@ def test_common_request_with_float_timeout_override():
     session, m_common_request = build_mocked_session_common_request(timeout=None)
     m_common_request('get', session, '/', timeout=123.4)
     session.get.assert_called_with('http://mocking.rules/', timeout=123.4, cookies={})
+
+def test_common_request_with_touple_timeout():
+    session, m_common_request = build_mocked_session_common_request(timeout=(123.4, 432.1))
+    m_common_request('get', session, '/')
+    session.get.assert_called_with('http://mocking.rules/', timeout=(123.4, 432.1), cookies={})
+
+def test_common_request_with_touple_timeout_override():
+    session, m_common_request = build_mocked_session_common_request(timeout=None)
+    m_common_request('get', session, '/', timeout=(123.4, 432.1))
+    session.get.assert_called_with('http://mocking.rules/', timeout=(123.4, 432.1), cookies={})