diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-02-01 21:32:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-01 21:32:59 +0100 |
| commit | cd4b03898e99b7317d2cbdf614bc14caf2e9bbce (patch) | |
| tree | a7d0846c15c1124c10a639c80a3c71523582a502 /smoketest | |
| parent | 9109a5603963216180f6d6fe09820ee1ba227ade (diff) | |
| parent | 7255115be80ea14dc53bf7d7382da2da831dc300 (diff) | |
| download | vyos-1x-cd4b03898e99b7317d2cbdf614bc14caf2e9bbce.tar.gz vyos-1x-cd4b03898e99b7317d2cbdf614bc14caf2e9bbce.zip | |
Merge pull request #2922 from vyos/mergify/bp/sagitta/pr-2854
dns: T5959: Streamline dns forwarding service (backport #2854)
Diffstat (limited to 'smoketest')
| -rwxr-xr-x | smoketest/scripts/cli/test_service_dns_forwarding.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/smoketest/scripts/cli/test_service_dns_forwarding.py b/smoketest/scripts/cli/test_service_dns_forwarding.py index 85a5f1448..652c4fa7b 100755 --- a/smoketest/scripts/cli/test_service_dns_forwarding.py +++ b/smoketest/scripts/cli/test_service_dns_forwarding.py @@ -24,9 +24,10 @@ from vyos.template import bracketize_ipv6 from vyos.utils.file import read_file from vyos.utils.process import process_named_running -CONFIG_FILE = '/run/powerdns/recursor.conf' -FORWARD_FILE = '/run/powerdns/recursor.forward-zones.conf' -HOSTSD_FILE = '/run/powerdns/recursor.vyos-hostsd.conf.lua' +PDNS_REC_RUN_DIR = '/run/pdns-recursor' +CONFIG_FILE = f'{PDNS_REC_RUN_DIR}/recursor.conf' +FORWARD_FILE = f'{PDNS_REC_RUN_DIR}/recursor.forward-zones.conf' +HOSTSD_FILE = f'{PDNS_REC_RUN_DIR}/recursor.vyos-hostsd.conf.lua' PROCESS_NAME= 'pdns_recursor' base_path = ['service', 'dns', 'forwarding'] @@ -279,7 +280,7 @@ class TestServicePowerDNS(VyOSUnitTestSHIM.TestCase): def test_listening_port(self): # We can listen on a different port compared to '53' but only one at a time - for port in ['1053', '5353']: + for port in ['10053', '10054']: self.cli_set(base_path + ['port', port]) for network in allow_from: self.cli_set(base_path + ['allow-from', network]) |