--- a/Allura/allura/tests/test_helpers.py
+++ b/Allura/allura/tests/test_helpers.py
@@ -354,12 +354,12 @@
def test_no_error(self, urllib2):
r = h.urlopen('myurl')
self.assertEqual(r, urllib2.urlopen.return_value)
- urllib2.urlopen.assert_called_once_with('myurl')
+ urllib2.urlopen.assert_called_once_with('myurl', timeout=None)
@patch('allura.lib.helpers.urllib2.urlopen')
def test_socket_timeout(self, urlopen):
import socket
- def side_effect(url):
+ def side_effect(url, timeout=None):
raise socket.timeout()
urlopen.side_effect = side_effect
self.assertRaises(socket.timeout, h.urlopen, 'myurl')
@@ -368,7 +368,7 @@
@patch('allura.lib.helpers.urllib2.urlopen')
def test_handled_http_error(self, urlopen):
from urllib2 import HTTPError
- def side_effect(url):
+ def side_effect(url, timeout=None):
raise HTTPError('url', 408, 'timeout', None, None)
urlopen.side_effect = side_effect
self.assertRaises(HTTPError, h.urlopen, 'myurl')
@@ -377,7 +377,7 @@
@patch('allura.lib.helpers.urllib2.urlopen')
def test_unhandled_http_error(self, urlopen):
from urllib2 import HTTPError
- def side_effect(url):
+ def side_effect(url, timeout=None):
raise HTTPError('url', 404, 'timeout', None, None)
urlopen.side_effect = side_effect
self.assertRaises(HTTPError, h.urlopen, 'myurl')