From 8a16ab90b27ca28fbc5e8a42a02eb8c7133183ae Mon Sep 17 00:00:00 2001 From: Lance Richardson Date: Fri, 10 Jun 2016 12:17:57 -0400 Subject: tests: Fix issue in use of OVS_APP_EXIT_AND_WAIT. Commit f9b11f2a09b4 introduced a loop to wait for process exit in OVS_APP_EXIT_AND_WAIT after the "exit" command has been sent. Unfortunately, this does not work for cases where a unixctl socket has to be used to send the "exit" command because the process ID cannot be determined from the socket path. OVS_APP_EXIT_AND_WAIT_BY_TARGET has since been introduced to enable graceful termination of daemons via unixctl sockets. This set of changes addresses the problem described above by making OVS_APP_EXIT_AND_WAIT_BY_TARGET take the unixctl socket path and corresponding process ID as separate parameters. In order to better detect issues in this logic in the future, checks have been added to verify that the pidfile exists before using its contents. Tested on a Linux system. Signed-off-by: Lance Richardson Signed-off-by: Ben Pfaff --- tests/ovsdb-server.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/ovsdb-server.at') diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index 0ed7e87c6..9da511d18 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -1,7 +1,7 @@ AT_BANNER([OVSDB -- ovsdb-server transactions (Unix sockets)]) m4_define([OVSDB_SERVER_SHUTDOWN], - [OVS_APP_EXIT_AND_WAIT(["`pwd`"/unixctl])]) + [OVS_APP_EXIT_AND_WAIT_BY_TARGET([`pwd`/unixctl], [`pwd`/pid])]) # OVSDB_CHECK_EXECUTION(TITLE, SCHEMA, TRANSACTIONS, OUTPUT, [KEYWORDS]) # -- cgit v1.2.1