python-bugzilla
diff --git a/‎bugzilla/_session.py‎
Lines changed: 12 additions & 0 deletions b/‎bugzilla/_session.py‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎tests/utils.py‎
Lines changed: 2 additions & 10 deletions b/‎tests/utils.py‎
Lines changed: 2 additions & 10 deletions
@@ -3,6 +3,7 @@
 
 from logging import getLogger
 
+import os
 import requests
 
 from ._compatimports import urlparse
@@ -43,6 +44,14 @@ def __init__(self, url, user_agent,
         self._session.params["Bugzilla_api_key"] = self._api_key
         self._set_tokencache_param()
 
+    def _get_timeout(self):
+        # Default to 5 minutes. This is longer than bugzilla.redhat.com's
+        # apparent 3 minute timeout so shouldn't affect legitimate usage,
+        # but saves us from indefinite hangs
+        DEFAULT_TIMEOUT = 300
+        envtimeout = os.environ.get("PYTHONBUGZILLA_REQUESTS_TIMEOUT")
+        return float(envtimeout or DEFAULT_TIMEOUT)
+
     def get_user_agent(self):
         return self._user_agent
     def get_scheme(self):
@@ -77,4 +86,7 @@ def get_requests_session(self):
         return self._session
 
     def request(self, *args, **kwargs):
+        timeout = self._get_timeout()
+        if "timeout" not in kwargs:
+            kwargs["timeout"] = timeout
         return self._session.request(*args, **kwargs)
@@ -47,16 +47,8 @@ def open_functional_bz(bzclass, url, kwargs):
     if kwargs.get("force_xmlrpc", False):
         assert bz.is_xmlrpc() is True
 
-    # Set a session timeout of 30 seconds
-    session = bz.get_requests_session()
-    origrequest = session.request
-
-    def fake_request(*args, **kwargs):
-        if "timeout" not in kwargs:
-            kwargs["timeout"] = 60
-        return origrequest(*args, **kwargs)
-
-    session.request = fake_request
+    # Set a request timeout of 60 seconds
+    os.environ["PYTHONBUGZILLA_REQUESTS_TIMEOUT"] = "60"
     return bz