Skip to content

Commit 4590229

Browse files
simonartxavierdceara
authored andcommitted
tests: fixed "ovn-nbctl - daemon retry connection"
"kill pid" does not wait for process to be terminated. Wait for ovsdb-server termination before restarting it. Signed-off-by: Xavier Simonart <[email protected]> Signed-off-by: Dumitru Ceara <[email protected]> (cherry picked from commit 8b65cbd)
1 parent 0f273fb commit 4590229

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Diff for: tests/ovn-nbctl.at

+3-1
Original file line numberDiff line numberDiff line change
@@ -2695,7 +2695,9 @@ dnl ---------------------------------------------------------------------
26952695

26962696
AT_SETUP([ovn-nbctl - daemon retry connection])
26972697
OVN_NBCTL_TEST_START daemon
2698-
AT_CHECK([kill `cat ovsdb-server.pid`])
2698+
pid=$(cat ovsdb-server.pid)
2699+
AT_CHECK([kill $pid])
2700+
OVS_WAIT_WHILE([kill -0 $pid 2>/dev/null])
26992701
AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/ovnnb_db.sock ovn-nb.db], [0], [], [stderr])
27002702
AT_CHECK([ovn-nbctl show], [0], [ignore])
27012703
OVN_NBCTL_TEST_STOP "/terminating with signal 15/d"

0 commit comments

Comments
 (0)