From patchwork Wed Aug 4 09:30:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 1513309 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=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=a2VGh/u7; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GfmgS1N3Pz9sS8 for ; Wed, 4 Aug 2021 19:30:27 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 5B32E83BCC; Wed, 4 Aug 2021 09:30:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BoIkHXBe25yh; Wed, 4 Aug 2021 09:30:24 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 97B3583A6E; Wed, 4 Aug 2021 09:30:23 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6D4C7C0010; Wed, 4 Aug 2021 09:30:23 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7D271C000E for ; Wed, 4 Aug 2021 09:30:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 5976983A6E for ; Wed, 4 Aug 2021 09:30:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Vj5MKws_q97E for ; Wed, 4 Aug 2021 09:30:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 1685D83A6B for ; Wed, 4 Aug 2021 09:30:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628069419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o8SBBp76B5WkAIJvhN4JWCjAgOlXdtQDF8BPcGOFf4A=; b=a2VGh/u79jL+LXbNY227vHyadUI10JGmD9FNZnhzvIfH+DgWBaaNfZ/Rpb9m2Pnzw5zRzG y1DZlZxpsgJytizICh/5p9C/xbz/ZW2z1mPWk/SwS0JnNzo3ecZOCuZJfnYH6Bj0/SdxiU 0/tLKAreqfNJEuxeDS09YGI6Gu4eUrA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-283-4ThV3TrvNBy45pxRpOP7hA-1; Wed, 04 Aug 2021 05:30:18 -0400 X-MC-Unique: 4ThV3TrvNBy45pxRpOP7hA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D3C801940921 for ; Wed, 4 Aug 2021 09:30:17 +0000 (UTC) Received: from wsfd-netdev90.ntdv.lab.eng.bos.redhat.com (wsfd-netdev90.ntdv.lab.eng.bos.redhat.com [10.19.188.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 903AD5C1B4; Wed, 4 Aug 2021 09:30:17 +0000 (UTC) From: Xavier Simonart To: xsimonar@redhat.com, dev@openvswitch.org Date: Wed, 4 Aug 2021 05:30:16 -0400 Message-Id: <20210804093016.2433236-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=xsimonar@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn] system-test: Fix "2 LSs IGMP and MLD" 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" When ADD_NAMESPACES or ADD_VETH were executed with variables within the arguments (e.g. ADD_NAMESPACES(sw1-p$i)), the macros were not expanded properly, resulting in bad on_exit calls. This caused multiples tests (e.g. 2 LSs IGMP and MLD) to be skipped. Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=1858221 Signed-off-by: Xavier Simonart Acked-by: Mark D. Gray --- tests/system-common-macros.at | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at index b742a2cb9..616a87fcf 100644 --- a/tests/system-common-macros.at +++ b/tests/system-common-macros.at @@ -16,7 +16,7 @@ m4_define([ADD_NAMESPACES], [m4_foreach([ns], [$@], [DEL_NAMESPACES(ns) AT_CHECK([ip netns add ns || return 77]) - on_exit 'DEL_NAMESPACES(ns)' + on_exit "DEL_NAMESPACES(ns)" ip netns exec ns sysctl -w net.netfilter.nf_conntrack_helper=0 ]) ] @@ -85,7 +85,7 @@ m4_define([ADD_VETH], if test -n "$6"; then NS_CHECK_EXEC([$2], [ip route add default via $6]) fi - on_exit 'ip link del ovs-$1' + on_exit "ip link del ovs-$1" ] )