diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-12-19 16:59:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-19 16:59:48 +0100 |
| commit | ff13d4d288e09564553458098890bb4345c5d0cf (patch) | |
| tree | b9ccf8b35db8fc99ceb7fd06708086b2dc2e2000 | |
| parent | ccb260c0971f1621a581158e4933727edfea034a (diff) | |
| parent | c2d84b03d6fad1795349d357ee301f02aa645dc0 (diff) | |
| download | vyos-1x-ff13d4d288e09564553458098890bb4345c5d0cf.tar.gz vyos-1x-ff13d4d288e09564553458098890bb4345c5d0cf.zip | |
Merge pull request #4244 from indrajitr/ddclient-smoketest-20241219
T5791: Modify ddclient smoketest for reliability
| -rwxr-xr-x | smoketest/scripts/cli/test_service_dns_dynamic.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/smoketest/scripts/cli/test_service_dns_dynamic.py b/smoketest/scripts/cli/test_service_dns_dynamic.py index c39d4467a..3e14976fc 100755 --- a/smoketest/scripts/cli/test_service_dns_dynamic.py +++ b/smoketest/scripts/cli/test_service_dns_dynamic.py @@ -22,11 +22,10 @@ from base_vyostest_shim import VyOSUnitTestSHIM from vyos.configsession import ConfigSessionError from vyos.utils.process import cmd -from vyos.utils.process import process_running +from vyos.utils.process import process_named_running DDCLIENT_SYSTEMD_UNIT = '/run/systemd/system/ddclient.service.d/override.conf' DDCLIENT_CONF = '/run/ddclient/ddclient.conf' -DDCLIENT_PID = '/run/ddclient/ddclient.pid' DDCLIENT_PNAME = 'ddclient' base_path = ['service', 'dns', 'dynamic'] @@ -46,14 +45,14 @@ class TestServiceDDNS(VyOSUnitTestSHIM.TestCase): def tearDown(self): # Check for running process - self.assertTrue(process_running(DDCLIENT_PID)) + self.assertTrue(process_named_running(DDCLIENT_PNAME)) # Delete DDNS configuration self.cli_delete(base_path) self.cli_commit() - # PID file must no londer exist after process exited - self.assertFalse(os.path.exists(DDCLIENT_PID)) + # Check for process not running anymore + self.assertFalse(process_named_running(DDCLIENT_PNAME)) # IPv4 standard DDNS service configuration def test_01_dyndns_service_standard(self): |