From 9fe42298535d9eb5b1e85e748cf4362ba2b702f7 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Wed, 3 Nov 2021 17:13:14 +0100 Subject: [PATCH] dnsdist: Disable 'IncludeDir' tests on GH actions --- .github/workflows/build-and-test-all.yml | 2 ++ regression-tests.dnsdist/test_Advanced.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml index 1312b1e8cc..d889006bfe 100644 --- 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 26308b4cf3..28643298fe 100644 --- 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 = """ -- 2.47.2