The test: `1827. ovsdb-server.at:490: testing SSL db: implementation ...` is hanging on Windows because the returned in the case the client failed to connect is "Unknown error" vs the normal "Protocol error".
Update the test to accommodate for this. Signed-off-by: Alin Gabriel Serdean <aserd...@ovn.org> --- tests/ovsdb-server.at | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index 968356781..7d94e1c71 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -569,11 +569,19 @@ AT_CHECK( [stderr], [test ! -e pid || kill `cat pid`]) 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`]) +if test "$IS_WIN32" = "yes"; then + AT_CHECK_UNQUOTED( + [grep "failed to connect" output], [0], + [ovsdb-client: failed to connect to "ssl:127.0.0.1:$SSL_PORT" (Unknown error) +], + [ignore], [test ! -e pid || kill `cat pid`]) +else + 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`]) +fi # Check that when ciphers are not compatible, that a negotiation # failure occurs. AT_CHECK( @@ -593,11 +601,19 @@ AT_CHECK( [stderr], [test ! -e pid || kill `cat pid`]) 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`]) +if test "$IS_WIN32" = "yes"; then + AT_CHECK_UNQUOTED( + [grep "failed to connect" output], [0], + [ovsdb-client: failed to connect to "ssl:127.0.0.1:$SSL_PORT" (Unknown error) +], + [ignore], [test ! -e pid || kill `cat pid`]) +else + 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`]) +fi # 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( -- 2.16.1.windows.1 _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev