From a8b70abca177cb41875fe53f5c50d4b2afad6b02 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Thu, 17 Oct 2024 14:26:32 +0200 Subject: [PATCH 1/2] Add with_dnstap mark --- bin/tests/system/isctest/mark.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/tests/system/isctest/mark.py b/bin/tests/system/isctest/mark.py index d0f5751a11..95435dfd3a 100644 --- a/bin/tests/system/isctest/mark.py +++ b/bin/tests/system/isctest/mark.py @@ -33,6 +33,10 @@ def feature_test(feature): return True +def with_dnstap(*args): # pylint: disable=unused-argument + return feature_test("--enable-dnstap") + + def with_tsan(*args): # pylint: disable=unused-argument return feature_test("--tsan") From 0579e0a4299d7d238997486c52c3e3c97ebd977d Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Thu, 17 Oct 2024 14:26:57 +0200 Subject: [PATCH 2/2] xfail upforwd system test if DNSTAP is enabled --- bin/tests/system/upforwd/tests_sh_upforwd.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/tests/system/upforwd/tests_sh_upforwd.py b/bin/tests/system/upforwd/tests_sh_upforwd.py index 35bcc64f34..9b2a26364e 100644 --- a/bin/tests/system/upforwd/tests_sh_upforwd.py +++ b/bin/tests/system/upforwd/tests_sh_upforwd.py @@ -9,6 +9,11 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +import pytest +import isctest.mark + + +@pytest.mark.xfail(reason="GL #4996", condition=isctest.mark.with_dnstap()) def test_upforwd(run_tests_sh): run_tests_sh()