From: Mark Andrews <marka@isc.org>
Date: Wed, 2 Jun 2021 06:40:58 +0000 (+1000)
Subject: Add timeout to url get requests
X-Git-Tag: v9.17.14~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02726cb66eb68706080a3ac6b0674ba31d484e4f;p=thirdparty%2Fbind9.git

Add timeout to url get requests

to prevent the system test taking forever on failures.
---

diff --git a/bin/tests/system/statschannel/tests-json.py b/bin/tests/system/statschannel/tests-json.py
index aa6e500d055..fd0284233ee 100755
--- a/bin/tests/system/statschannel/tests-json.py
+++ b/bin/tests/system/statschannel/tests-json.py
@@ -22,7 +22,8 @@ from helper import fmt
 # JSON helper functions
 def fetch_zones_json(statsip, statsport):
 
-    r = requests.get("http://{}:{}/json/v1/zones".format(statsip, statsport))
+    r = requests.get("http://{}:{}/json/v1/zones".format(statsip, statsport),
+                     timeout=600)
     assert r.status_code == 200
 
     data = r.json()
@@ -31,7 +32,8 @@ def fetch_zones_json(statsip, statsport):
 
 def fetch_traffic_json(statsip, statsport):
 
-    r = requests.get("http://{}:{}/json/v1/traffic".format(statsip, statsport))
+    r = requests.get("http://{}:{}/json/v1/traffic".format(statsip, statsport),
+                     timeout=600)
     assert r.status_code == 200
 
     data = r.json()
diff --git a/bin/tests/system/statschannel/tests-xml.py b/bin/tests/system/statschannel/tests-xml.py
index e19397cb4c2..3f1b0d7236c 100755
--- a/bin/tests/system/statschannel/tests-xml.py
+++ b/bin/tests/system/statschannel/tests-xml.py
@@ -23,7 +23,8 @@ from helper import fmt
 # XML helper functions
 def fetch_zones_xml(statsip, statsport):
 
-    r = requests.get("http://{}:{}/xml/v3/zones".format(statsip, statsport))
+    r = requests.get("http://{}:{}/xml/v3/zones".format(statsip, statsport),
+                     timeout=600)
     assert r.status_code == 200
 
     root = ET.fromstring(r.text)
@@ -47,7 +48,8 @@ def fetch_traffic_xml(statsip, statsport):
 
         return out
 
-    r = requests.get("http://{}:{}/xml/v3/traffic".format(statsip, statsport))
+    r = requests.get("http://{}:{}/xml/v3/traffic".format(statsip, statsport),
+                     timeout=600)
     assert r.status_code == 200
 
     root = ET.fromstring(r.text)