From patchwork Wed Jun 17 08:38:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Numan Siddique X-Patchwork-Id: 1311055 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49mz4S2Vhxz9sSf for ; Wed, 17 Jun 2020 18:38:47 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BFBE9204C0; Wed, 17 Jun 2020 08:38:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5oaWkvqOuD6d; Wed, 17 Jun 2020 08:38:43 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id 134F5203FF; Wed, 17 Jun 2020 08:38:43 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id E256DC0863; Wed, 17 Jun 2020 08:38:42 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3769EC016E for ; Wed, 17 Jun 2020 08:38:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 24FB48867F for ; Wed, 17 Jun 2020 08:38:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tE0I1PjQyN7V for ; Wed, 17 Jun 2020 08:38:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id 03B8B88518 for ; Wed, 17 Jun 2020 08:38:39 +0000 (UTC) X-Originating-IP: 27.7.88.231 Received: from nusiddiq.home.org.home.org (unknown [27.7.88.231]) (Authenticated sender: numans@ovn.org) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 7302160002; Wed, 17 Jun 2020 08:38:37 +0000 (UTC) From: numans@ovn.org To: dev@openvswitch.org Date: Wed, 17 Jun 2020 14:08:32 +0530 Message-Id: <20200617083832.526221-1-numans@ovn.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [ovs-dev] [PATCH ovn] Fix the test case "80. ovn -- 4 HV, 1 LS, 1 LR, packet test with HA distributed router gateway port" X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Numan Siddique This test case is failing intermittently in my local setup. *********************** rcv_n=3 exp_n=2 ovn.at:12: wait succeeded immediately ../../tests/ovn.at:9473: sort $rcv_text Acked-by: Mark Michelson --- expout 2020-06-17 10:57:23.467337249 +0530 +++ tests/testsuite.dir/at-groups/80/stdout 2020-06-17 10:57:23.469337182 +0530 @@ -1,2 +1,3 @@ f0000001020400000201020308004500001c000000003f110100c0a80102ac1001030035111100080000 ffffffffffff00000201020308060001080006040001000002010203ac100101000000000000ac100101 +ffffffffffff00000201020308060001080006040001000002010203ac100101000000000000ac100101 ******************* Before calling 'OVN_CHECK_PACKETS', there is a sleep of 1 second. This is not required, and looks like this sleep is causing an extra ARP packet to be received. This patch deletes this sleep. The macro OVN_CHECK_PACKETS will anyway wait for the expected packets to be received. Signed-off-by: Numan Siddique --- tests/ovn.at | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index 7e1ace556..1987b8062 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -9468,8 +9468,6 @@ grep actions=mod_dl_dst:f0:00:00:01:02:04 | wc -l` -eq 1 # Resend packet from foo1 to outside1 as hv1 ovs-appctl netdev-dummy/receive hv1-vif1 $packet - sleep 1 - OVN_CHECK_PACKETS([ext1/vif1-tx.pcap], [ext1-vif1.expected]) $PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" $active_gw/br-phys_n1-tx.pcap > packets cat packets | grep $expected > exp