[ovs-dev] [PATCH 2/2] ovsdb-server: Don't be picky about particular error in test.

Ben Pfaff blp at ovn.org
Wed Mar 7 21:18:40 UTC 2018


On Windows this test reports "Unknown error" instead of "Protocol error",
so disregard the particular error message.

Reported-by: Alin Gabriel Serdean <aserdean at ovn.org>
Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2018-March/344951.html
Signed-off-by: Ben Pfaff <blp at ovn.org>
---
 tests/ovsdb-server.at | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at
index d75cbb488a29..db6db08572f1 100644
--- a/tests/ovsdb-server.at
+++ b/tests/ovsdb-server.at
@@ -570,8 +570,8 @@ AT_CHECK(
   [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)
+  [sed -n "/failed to connect/s/ (.*)//p" output], [0],
+  [ovsdb-client: failed to connect to "ssl:127.0.0.1:$SSL_PORT"
 ], 
   [ignore])
 # Check that when ciphers are not compatible, that a negotiation
@@ -593,8 +593,8 @@ AT_CHECK(
   [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)
+  [sed -n "/failed to connect/s/ (.*)//p" output], [0],
+  [ovsdb-client: failed to connect to "ssl:127.0.0.1:$SSL_PORT"
 ], 
   [ignore])
 # The error message for being unable to negotiate a shared ciphersuite
-- 
2.16.1



More information about the dev mailing list