dnsdist: Disable 'IncludeDir' tests on GH actions

diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml
index 1312b1e8cc6635096013cdb3f57ad6e13d9ba1d5..d889006bfe232f317d9a3cede641dd52b5597b19 100644 (file)
--- a/.github/workflows/build-and-test-all.yml
+++ b/.github/workflows/build-and-test-all.yml
@@ -300,6 +300,8 @@ jobs:
       UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=${{ github.workspace }}/build-scripts/UBSan.supp"
       ASAN_OPTIONS: detect_leaks=0
       TSAN_OPTIONS: "halt_on_error=1:suppressions=${{ github.workspace }}/pdns/dnsdistdist/dnsdist-tsan.supp"
+      # IncludeDir tests are disabled because of a weird interaction between TSAN and these tests which ever only happens on GH actions
+      SKIP_INCLUDEDIR_TESTS: yes
     steps:
       - uses: actions/checkout@v2.3.4
         with:

diff --git a/regression-tests.dnsdist/test_Advanced.py b/regression-tests.dnsdist/test_Advanced.py
index 26308b4cf35c0c5d106a0c9c533155f7db71a1da..28643298fec76d7d75413c9ae862edafdf426f6f 100644 (file)
--- a/regression-tests.dnsdist/test_Advanced.py
+++ b/regression-tests.dnsdist/test_Advanced.py
@@ -4,6 +4,7 @@ from datetime import datetime, timedelta
 import os
 import string
 import time
+import unittest
 import dns
 import clientsubnetoption
 import cookiesoption
@@ -976,6 +977,7 @@ class TestAdvancedWireLengthRule(DNSDistTest):
             (_, receivedResponse) = sender(query, response=None, useQueue=False)
             self.assertEqual(receivedResponse, expectedResponse)
 
+@unittest.skipIf('SKIP_INCLUDEDIR_TESTS' in os.environ, 'IncludeDir tests are disabled')
 class TestAdvancedIncludeDir(DNSDistTest):
 
     _config_template = """