python-bugzilla
diff --git a/‎tests/test_ro_functional.py‎
Lines changed: 1 addition & 7 deletions b/‎tests/test_ro_functional.py‎
Lines changed: 1 addition & 7 deletions
diff --git a/‎tests/test_rw_functional.py‎
Lines changed: 5 additions & 5 deletions b/‎tests/test_rw_functional.py‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎tests/utils.py‎
Lines changed: 21 additions & 0 deletions b/‎tests/utils.py‎
Lines changed: 21 additions & 0 deletions
@@ -24,13 +24,7 @@
 def _open_bz(url, **kwargs):
     if "use_creds" not in kwargs:
         kwargs["use_creds"] = False
-    bz = bugzilla.Bugzilla(url, **kwargs)
-
-    if kwargs.get("force_rest", False):
-        assert bz.is_rest() is True
-    if kwargs.get("force_xmlrpc", False):
-        assert bz.is_xmlrpc() is True
-    return bz
+    return tests.utils.open_functional_bz(bugzilla.Bugzilla, url, kwargs)
 
 
 def _check(out, mincount, expectstr):
 
@@ -33,7 +33,11 @@ def _split_int(s):
     return [int(i) for i in s.split(",")]
 
 
-if not bugzilla.RHBugzilla(url=RHURL).logged_in:
+def _open_bz(**kwargs):
+    return tests.utils.open_functional_bz(bugzilla.RHBugzilla, RHURL, kwargs)
+
+
+if not _open_bz().logged_in:
     print("\nR/W tests require cached login credentials for url=%s\n" % RHURL)
     sys.exit(1)
 
@@ -50,10 +54,6 @@ def _check_have_admin(bz):
     return ret
 
 
-def _open_bz(**kwargs):
-    return bugzilla.RHBugzilla(url=RHURL, **kwargs)
-
-
 def test0LoggedInNoCreds():
     bz = _open_bz(use_creds=False)
     assert not bz.logged_in
 
@@ -43,6 +43,27 @@ def monkeypatch_getpass(monkeypatch):
             raw_input)  # pylint: disable=undefined-variable
 
 
+def open_functional_bz(bzclass, url, kwargs):
+    bz = bzclass(url, **kwargs)
+
+    if kwargs.get("force_rest", False):
+        assert bz.is_rest() is True
+    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
+    return bz
+
+
 def diff_compare(inputdata, filename):
     """Compare passed string output to contents of filename"""
     filename = tests_path(filename)