Merge lp:~facundo/ubuntu-rest-scopes/centralized-urlread-timeout into lp:ubuntu-rest-scopes

[Facundo Batista]

Have a timeout in centralized urlread.

Have a timeout in centralized urlread.

Unmerged revisions

462. By Facundo Batista on 2015-04-16

Have a timeout in centralized urlread.

=== modified file 'src/rest_scopes.py'
--- src/rest_scopes.py	2015-04-13 14:09:26 +0000
+++ src/rest_scopes.py	2015-04-16 11:18:18 +0000
@@ -84,7 +84,7 @@
     return transposed
 
 
-def urlread(meter, prefix, url, data=None, headers=None):
+def urlread(meter, prefix, url, data=None, headers=None, timeout=None):
     """Centralized urlopen with extra functionality."""
     if headers is None:
         headers = {}
@@ -121,7 +121,11 @@
     tini = time.time()
     req = urllib2.Request(url, data=data, headers=headers)
     try:
-        u = urllib2.urlopen(req)
+        # can't always pass the timeout, as if it's None we'll override module defaults
+        if timeout is None:
+            u = urllib2.urlopen(req)
+        else:
+            u = urllib2.urlopen(req, timeout=timeout)
         data = u.read()
     except urllib2.HTTPError as exc:
         _inform(str(exc.code), exc.hdrs)

=== modified file 'src/tests/test_rest_scopes.py'
--- src/tests/test_rest_scopes.py	2015-04-13 14:09:26 +0000
+++ src/tests/test_rest_scopes.py	2015-04-16 11:18:18 +0000
@@ -799,6 +799,21 @@
         self.assertEqual(req.data, None)
         self.assertEqual(req.headers, {'A': 3})
 
+    def test_with_timeout(self):
+        netfh = Mock()
+        netfh.read.return_value = 'response'
+        netfh.headers = {}
+
+        with patch.object(urllib2, 'urlopen') as mock_urlopen:
+            mock_urlopen.return_value = netfh
+            resp = rest_scopes.urlread(None, None, 'http://blah/', timeout=123)
+
+        self.assertEqual(resp, 'response')
+        req = mock_urlopen.call_args[0][0]
+        self.assertEqual(req.data, None)
+        kwargs = mock_urlopen.call_args[1]
+        self.assertEqual(kwargs, {'timeout': 123})
+
     def test_metrics_no_prefix(self):
         netfh = Mock()
         netfh.read.return_value = 'response'