Skip to content

Commit

Permalink
Merge pull request #4252 from c-po/smoketest-fixes
Browse files Browse the repository at this point in the history
smoketest: T6746: T5791: additional fixes/logic hardening
  • Loading branch information
c-po authored Dec 23, 2024
2 parents c9febcc + e1d34e5 commit 6f6aa04
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions smoketest/scripts/cli/base_vyostest_shim.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
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'

Expand Down Expand Up @@ -88,6 +89,9 @@ def cli_commit(self):
# 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()

Expand Down
2 changes: 1 addition & 1 deletion smoketest/scripts/cli/test_service_dns_dynamic.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def setUp(self):

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)
Expand Down

0 comments on commit 6f6aa04

Please sign in to comment.