netlink-socket: Fix log message for subscribe/unsubscribe on Windows.

[cascardo/ovs.git] / tests / ovn-sbctl.at

diff --git a/tests/ovn-sbctl.at b/tests/ovn-sbctl.at
index 9986d9a..755c1f6 100644 (file)
--- a/tests/ovn-sbctl.at
+++ b/tests/ovn-sbctl.at
@@ -3,6 +3,7 @@ AT_BANNER([ovn-sbctl])
 # OVN_SBCTL_TEST_START
 m4_define([OVN_SBCTL_TEST_START],
   [dnl Create databases (ovn-nb, ovn-sb).
+   AT_KEYWORDS([ovn])
    for daemon in ovn-nb ovn-sb; do
       AT_CHECK([ovsdb-tool create $daemon.db $abs_top_srcdir/${daemon%%-*}/${daemon}.ovsschema])
    done
@@ -25,7 +26,15 @@ m4_define([OVN_SBCTL_TEST_START],
 
 # OVN_SBCTL_TEST_STOP
 m4_define([OVN_SBCTL_TEST_STOP],
-  [AT_CHECK([check_logs $1])
+  [# removes all 'Broken pipe' warning logs from ovsdb-server.log.  this is in
+   # that *ctl command (e.g. ovn-nbctl) exits right after committing the change
+   # to database.  however, in reaction, some daemon (e.g. ovn-controller-vtep)
+   # may immediately update the database.  this later update may cause database
+   # sending update back to *ctl command if *ctl has not proceeded to exit yet.
+   # and if *ctl command exits before database calling send, the send from
+   # database will fail with 'Broken pipe' error.
+   AT_CHECK([check_logs "$1
+/Broken pipe/d"])
    AT_CHECK([ovs-appctl -t ovn-northd exit])
    AT_CHECK([ovs-appctl -t ovsdb-server exit])])