From: Otto <otto.moerbeek@open-xchange.com>
Date: Wed, 10 Nov 2021 12:34:04 +0000 (+0100)
Subject: Disable bulk test with TSAN for now and add some debug code to api test
X-Git-Tag: dnsdist-1.7.0-beta1~7^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e8f4675038f384febdb1007612a4991241fa79e;p=thirdparty%2Fpdns.git

Disable bulk test with TSAN for now and add some debug code to api test
---

diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml
index d9fd887d50..513c456a1f 100644
--- a/.github/workflows/build-and-test-all.yml
+++ b/.github/workflows/build-and-test-all.yml
@@ -330,7 +330,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        sanitizers: [ubsan+asan, tsan]
+        sanitizers: [ubsan+asan]
         threads: [1, 2, 3, 4, 8, 16]
         mthreads: [2048, 4096]
         shards: [1, 2, 1028]
diff --git a/regression-tests.api/runtests.py b/regression-tests.api/runtests.py
index 956047e993..3c2463d5c3 100755
--- a/regression-tests.api/runtests.py
+++ b/regression-tests.api/runtests.py
@@ -5,6 +5,7 @@
 from __future__ import print_function
 import os
 import requests
+from requests.exceptions import HTTPError
 import shutil
 import subprocess
 import sys
@@ -229,13 +230,17 @@ serverproc = subprocess.Popen(servercmd, close_fds=True)
 
 print("Waiting for webserver port to become available...")
 available = False
+time.sleep(0.5)
 for try_number in range(0, 10):
     try:
         res = requests.get('http://127.0.0.1:%s/' % WEBPORT)
         available = True
         break
-    except:
-        time.sleep(0.5)
+    except HTTPError as http_err:
+      print(f'HTTP error occurred: {http_err}')
+    except Exception as err:
+      print(f'Other error occurred: {err}')
+    time.sleep(0.5)
 
 if not available:
     print("Webserver port not reachable after 10 tries, giving up.")