| Message ID | 20200923112247.738-1-aserdean@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,v2] tests: Queue for termination all OVSDB IDL pids | expand |
On 9/23/20 1:22 PM, Alin Gabriel Serdean wrote: > 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 <aserdean@ovn.org> > --- > v2: Address Ilya's comments > --- > tests/ovsdb-idl.at | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Thanks! Applied to master and backported down to 2.12. Best regards, Ilya Maximets. > > diff --git a/tests/ovsdb-idl.at b/tests/ovsdb-idl.at > index 261f4f323..b46258591 100644 > --- a/tests/ovsdb-idl.at > +++ b/tests/ovsdb-idl.at > @@ -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} \ >
diff --git a/tests/ovsdb-idl.at b/tests/ovsdb-idl.at index 261f4f323..b46258591 100644 --- a/tests/ovsdb-idl.at +++ b/tests/ovsdb-idl.at @@ -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} \
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 <aserdean@ovn.org> --- v2: Address Ilya's comments --- tests/ovsdb-idl.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)