From patchwork Thu May 20 23:32:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 1481947 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.133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (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 4FmQxz28fRz9sW4 for ; Fri, 21 May 2021 09:32:23 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 7ED8F405DF; Thu, 20 May 2021 23:32:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ToZ8xC70Z9tE; Thu, 20 May 2021 23:32:20 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTP id AC28840025; Thu, 20 May 2021 23:32:19 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id CDB81C000F; Thu, 20 May 2021 23:32:18 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6C6E2C000D for ; Thu, 20 May 2021 23:32:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 306CC40025 for ; Thu, 20 May 2021 23:32:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hlrhz_idLv-T for ; Thu, 20 May 2021 23:32:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by smtp2.osuosl.org (Postfix) with ESMTPS id 5E4C3401F2 for ; Thu, 20 May 2021 23:32:16 +0000 (UTC) Received: (Authenticated sender: blp@ovn.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 139101C0002; Thu, 20 May 2021 23:32:13 +0000 (UTC) From: Ben Pfaff To: dev@openvswitch.org Date: Thu, 20 May 2021 16:32:01 -0700 Message-Id: <20210520233201.1048112-4-blp@ovn.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520233201.1048112-1-blp@ovn.org> References: <20210520233201.1048112-1-blp@ovn.org> MIME-Version: 1.0 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH ovn 3/3] tests: Don't define tests that will always be skipped. 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" The "(northbound|southbound) database reconnection" tests had dp-groups=yes variants but they were unconditionally skipped at runtime. There's no point in having them, so this commit drops them. This changes the changes of the tests without datapath groups to have "dp-groups=no" in their names. That seems like an OK change to me, but it can easily be reverted if people don't like it. Signed-off-by: Ben Pfaff Acked-by: Dumitru Ceara --- tests/ovn-macros.at | 26 ++++++++++++-------------- tests/ovn-northd.at | 12 ++---------- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at index 2217131ab234..cd02b6986cc2 100644 --- a/tests/ovn-macros.at +++ b/tests/ovn-macros.at @@ -546,17 +546,15 @@ OVS_END_SHELL_HELPERS m4_define([OVN_POPULATE_ARP], [AT_CHECK(ovn_populate_arp__, [0], [ignore])]) -m4_define([OVN_FOR_EACH_NORTHD], [dnl -m4_pushdef([NORTHD_TYPE], [ovn-northd])dnl -m4_pushdef([NORTHD_USE_DP_GROUPS], [yes])dnl -$1 -m4_popdef([NORTHD_USE_DP_GROUPS])dnl -$1 -m4_popdef([NORTHD_TYPE])dnl -m4_pushdef([NORTHD_TYPE], [ovn-northd-ddlog])dnl -m4_pushdef([NORTHD_USE_DP_GROUPS], [yes])dnl -$1 -m4_popdef([NORTHD_USE_DP_GROUPS])dnl -$1 -m4_popdef([NORTHD_TYPE])dnl -]) +# Defines a versions of a test with all combinations of northd and +# datapath groups. +m4_define([OVN_FOR_EACH_NORTHD], + [m4_foreach([NORTHD_TYPE], [ovn-northd, ovn-northd-ddlog], + [m4_foreach([NORTHD_USE_DP_GROUPS], [yes, no], [$1 +])])]) + +# Some tests aren't prepared for dp groups to be enabled. +m4_define([OVN_FOR_EACH_NORTHD_WITHOUT_DP_GROUPS], + [m4_foreach([NORTHD_TYPE], [ovn-northd, ovn-northd-ddlog], + [m4_foreach([NORTHD_USE_DP_GROUPS], [no], [$1 +])])]) diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index 28a46702cf48..cf7e8a0604ed 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -734,13 +734,9 @@ wait_row_count Datapath_Binding 2 AT_CLEANUP ]) -OVN_FOR_EACH_NORTHD([ +OVN_FOR_EACH_NORTHD_WITHOUT_DP_GROUPS([ AT_SETUP([ovn -- northbound database reconnection]) -dnl This test doesn't take into account flows that are shared between -dnl datapaths when datapath groups are enabled. -AT_SKIP_IF([test NORTHD_USE_DP_GROUPS = yes]) - ovn_start --backup-northd=none # Check that ovn-northd is active, by verifying that it creates and @@ -774,13 +770,9 @@ wait_row_count Logical_Flow $(expr 2 \* $lf) AT_CLEANUP ]) -OVN_FOR_EACH_NORTHD([ +OVN_FOR_EACH_NORTHD_WITHOUT_DP_GROUPS([ AT_SETUP([ovn -- southbound database reconnection]) -dnl This test doesn't take into account flows that are shared between -dnl datapaths when datapath groups are enabled. -AT_SKIP_IF([test NORTHD_USE_DP_GROUPS = yes]) - ovn_start --backup-northd=none # Check that ovn-northd is active, by verifying that it creates and