The tests were killing $(cat pid) on failure but needed to kill $(cat ovsdb-server.pid).
Reported-by: Alin Gabriel Serdean <[email protected]> Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2018-March/344951.html Signed-off-by: Ben Pfaff <[email protected]> --- tests/ovsdb-server.at | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index 968356781604..d75cbb488a29 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -521,6 +521,7 @@ AT_CHECK( "ssl_protocols": "'"TLSv1.2,TLSv1.1"'", "ssl_ciphers": "'"HIGH:!aNULL:!MD5:!ECDHE-ECDSA-AES256-GCM-SHA384"'"}}]']], [0], [ignore], [ignore]) +on_exit 'kill `cat *.pid`' AT_CHECK( [ovsdb-server --log-file --detach --no-chdir --pidfile \ --private-key=db:mydb,SSL,private_key \ @@ -544,12 +545,12 @@ AT_CHECK( "table": "SSL", "where": [], "columns": ["private_key"]}]']], - [0], [stdout], [ignore], [test ! -e pid || kill `cat pid`]) + [0], [stdout], [ignore]) cat stdout >> output AT_CHECK_UNQUOTED( [cat output], [0], [[@<:@{"rows":@<:@{"private_key":"$PKIDIR/testpki-privkey2.pem"}@:>@}@:>@ -]], [ignore], [test ! -e pid || kill `cat pid`]) +]], [ignore]) # Check that when the server has TLSv1.1+ and the client has # TLSv1 that the connection fails. AT_CHECK( @@ -566,14 +567,13 @@ AT_CHECK( "where": [], "columns": ["private_key"]}]']], [1], [stdout], - [stderr], - [test ! -e pid || kill `cat pid`]) + [stderr]) cat stderr > output AT_CHECK_UNQUOTED( [grep "failed to connect" output], [0], [ovsdb-client: failed to connect to "ssl:127.0.0.1:$SSL_PORT" (Protocol error) ], - [ignore], [test ! -e pid || kill `cat pid`]) + [ignore]) # Check that when ciphers are not compatible, that a negotiation # failure occurs. AT_CHECK( @@ -590,20 +590,19 @@ AT_CHECK( "where": [], "columns": ["private_key"]}]']], [1], [stdout], - [stderr], - [test ! -e pid || kill `cat pid`]) + [stderr]) cat stderr > output AT_CHECK_UNQUOTED( [grep "failed to connect" output], [0], [ovsdb-client: failed to connect to "ssl:127.0.0.1:$SSL_PORT" (Protocol error) ], - [ignore], [test ! -e pid || kill `cat pid`]) + [ignore]) # The error message for being unable to negotiate a shared ciphersuite # is 'sslv3 alert handshake failure'. This is not the clearest message. AT_CHECK_UNQUOTED( [grep "sslv3 alert handshake failure" output], [0], [stdout], - [ignore], [test ! -e pid || kill `cat pid`]) + [ignore]) OVSDB_SERVER_SHUTDOWN AT_CLEANUP -- 2.16.1 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
