diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-12-23 13:35:00 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-12-23 13:39:57 +0100 |
| commit | 702a60a8de28963146cbe77f3247d89a326cff3a (patch) | |
| tree | e8e8a013cff6dd5347b8a38cb6aece7ad170e242 | |
| parent | c9febcc4c53d0bce09ce6b62d6fba12ea017d3f1 (diff) | |
| download | vyos-1x-702a60a8de28963146cbe77f3247d89a326cff3a.tar.gz vyos-1x-702a60a8de28963146cbe77f3247d89a326cff3a.zip | |
smoketest: T6746: wait after commit() until frr-reload is no longer running
This extends commit 90e9aa9df ("frr: T6746: add guard time after cli_commit()
and before getFRRconfig()").
| -rw-r--r-- | smoketest/scripts/cli/base_vyostest_shim.py | 4 |
1 files changed, 4 insertions, 0 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() |