From patchwork Fri Dec 23 21:34:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 708525 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tlhVb1t8pz9sxN for ; Sat, 24 Dec 2016 08:34:31 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 295EE982; Fri, 23 Dec 2016 21:34:28 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 9EF11504 for ; Fri, 23 Dec 2016 21:34:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 8E0F1212 for ; Fri, 23 Dec 2016 21:34:25 +0000 (UTC) Received: from mfilter41-d.gandi.net (mfilter41-d.gandi.net [217.70.178.173]) by relay6-d.mail.gandi.net (Postfix) with ESMTP id EAC35FB89F; Fri, 23 Dec 2016 22:34:23 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter41-d.gandi.net Received: from relay6-d.mail.gandi.net ([IPv6:::ffff:217.70.183.198]) by mfilter41-d.gandi.net (mfilter41-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id 9RvJkhIY3O1I; Fri, 23 Dec 2016 22:34:22 +0100 (CET) X-Originating-IP: 208.91.2.3 Received: from sigabrt.benpfaff.org (unknown [208.91.2.3]) (Authenticated sender: blp@ovn.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 7D991FB87D; Fri, 23 Dec 2016 22:34:21 +0100 (CET) From: Ben Pfaff To: dev@openvswitch.org Date: Fri, 23 Dec 2016 13:34:14 -0800 Message-Id: <20161223213414.4426-1-blp@ovn.org> X-Mailer: git-send-email 2.10.2 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ben Pfaff Subject: [ovs-dev] [PATCH] tests: Fix race in "ovn -- vtep: 3 HVs, 1 VIFs/HV, 1 GW, 1 LS". X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org The 1-second sleep to wait for the bind to occur is not long enough on slow mips machines. This fixes the problem. Reported-at: https://buildd.debian.org/status/fetch.php?pkg=openvswitch&arch=mipsel&ver=2.6.2%7Epre%2Bgit20161223-1&stamp=1482523419&file=log Signed-off-by: Ben Pfaff Acked-by: Justin Pettit --- tests/ovn.at | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index 557b2ca..b7cb4cb 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -1773,9 +1773,7 @@ vtep-ctl add-ls lsw0 start_daemon ovs-vtep br-vtep start_daemon ovn-controller-vtep --vtep-db=unix:"$ovs_base"/vtep/db.sock --ovnsb-db=unix:"$ovs_base"/ovn-sb/ovn-sb.sock -sleep 1 - -vtep-ctl bind-ls br-vtep br-vtep_n2 0 lsw0 +OVS_WAIT_UNTIL([vtep-ctl bind-ls br-vtep br-vtep_n2 0 lsw0]) OVS_WAIT_UNTIL([test -n "`as vtep vtep-ctl get-replication-mode lsw0 | grep -- source`"])