Merge pull request #4252 from c-po/smoketest-fixes

smoketest: T6746: T5791: additional fixes/logic hardening

2 files changed, 5 insertions, 1 deletions

diff --git a/smoketest/scripts/cli/base_vyostest_shim.py b/smoketest/scripts/cli/base_vyostest_shim.py
index d95071d1a..9cf6a653a 100644
--- a/smoketest/scripts/cli/base_vyostest_shim.py
+++ b/smoketest/scripts/cli/base_vyostest_shim.py
@@ -27,6 +27,7 @@ from vyos import ConfigError
 from vyos.defaults import commit_lock
 from vyos.utils.process import cmd
 from vyos.utils.process import run
+from vyos.utils.process import process_named_running
 
 save_config = '/tmp/vyos-smoketest-save'
 
@@ -88,6 +89,9 @@ class VyOSUnitTestSHIM:
             # during a commit there is a process opening commit_lock, and run() returns 0
             while run(f'sudo lsof -nP {commit_lock}') == 0:
                 sleep(0.250)
+            # wait for FRR reload to be complete
+            while process_named_running('frr-reload.py'):
+                sleep(0.250)
             # reset getFRRconfig() guard timer
             self.commit_guard = time()
 
diff --git a/smoketest/scripts/cli/test_service_dns_dynamic.py b/smoketest/scripts/cli/test_service_dns_dynamic.py
index 3ce459e44..28380f6d4 100755
--- a/smoketest/scripts/cli/test_service_dns_dynamic.py
+++ b/smoketest/scripts/cli/test_service_dns_dynamic.py
@@ -44,7 +44,7 @@ class TestServiceDDNS(VyOSUnitTestSHIM.TestCase):
 
     def tearDown(self):
         # Check for running process
-        self.assertTrue(process_named_running(DDCLIENT_PNAME))
+        self.assertTrue(process_named_running(DDCLIENT_PNAME, timeout=5))
 
         # Delete DDNS configuration
         self.cli_delete(base_path)