Skip to content

Commit

Permalink
ovsdb-idl.at: Queue for termination all OVSDB IDL pids.
Browse files Browse the repository at this point in the history
When running OVSDB cluster tests on Windows not all the ovsdb processes
are terminated.  Queue up the pids of the started processes for
termination when the test stops.

Signed-off-by: Alin Gabriel Serdean <[email protected]>
Signed-off-by: Ilya Maximets <[email protected]>
  • Loading branch information
aserdean authored and igsilya committed Oct 8, 2020
1 parent 7b2e999 commit 6edb0dd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/ovsdb-idl.at
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ m4_define([OVSDB_CLUSTER_START_IDLTEST],
AT_CHECK([ovsdb-tool join-cluster s$i.db \
$schema_name unix:s$i.raft unix:s1.raft])
done
on_exit 'kill $(cat s*.pid)'
for i in $(seq $n); do
AT_CHECK([ovsdb-server -vraft -vconsole:warn --detach --no-chdir \
--log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i \
--remote=punix:s$i.ovsdb \
m4_if([$2], [], [], [--remote=$2]) s$i.db])
done
on_exit 'kill $(cat s*.pid)'

for i in $(seq $n); do
OVS_WAIT_UNTIL([ovs-appctl -t $(pwd)/s$i cluster/status ${schema_name} \
Expand Down

0 comments on commit 6edb0dd

Please sign in to comment.