From c27c4460e506a830a35dab99606cb74ac25df5b9 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 7 Mar 2012 14:46:14 -0800 Subject: [PATCH] ovs-ofctl: Make "barrier" output reproducible for testing. The "ofproto - asynchronous message control" test had a race in which the "send: OFPT_BARRIER_REQUEST" message could get printed in different places because there was nothing to ensure that messages from the switch were printed before messages sent to the switch, even though the actual ordering of the messages was predictable. This fixes the problem by not printing a message at all when the barrier request is sent. Bug #10049. Signed-off-by: Ben Pfaff --- tests/ofproto.at | 3 +-- utilities/ovs-ofctl.c | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/ofproto.at b/tests/ofproto.at index 9358a6af0..4565649f3 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -472,8 +472,7 @@ priority:0,tunnel:0,in_port:0000,tci(0) mac(00:26:b9:8c:b0:f9->00:25:83:df:b4:00 AT_FAIL_IF([test X"$1" != X]) ovs-appctl -t ovs-ofctl ofctl/barrier - echo >>expout "send: OFPT_BARRIER_REQUEST: -OFPT_BARRIER_REPLY:" + echo >>expout "OFPT_BARRIER_REPLY:" AT_CHECK( [[sed ' diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index 786221e40..44daa8a4d 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -922,9 +922,6 @@ ofctl_barrier(struct unixctl_conn *conn, int argc OVS_UNUSED, } msg = ofputil_encode_barrier_request(); - fprintf(stderr, "send: "); - ofp_print(stderr, msg->data, msg->size, verbosity); - error = vconn_send_block(aux->vconn, msg); if (error) { ofpbuf_delete(msg); -- 2.47.0