From patchwork Thu Jul 10 15:33:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Simonart X-Patchwork-Id: 2109429 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=WZvyN/hM; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4bdJm03sGRz1xqg for ; Fri, 11 Jul 2025 01:33:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3FC30612D6; Thu, 10 Jul 2025 15:34:02 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 49yrtBXJ1W2L; Thu, 10 Jul 2025 15:34:00 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.9.56; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org D92D260F04 Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=WZvyN/hM Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id D92D260F04; Thu, 10 Jul 2025 15:33:59 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6800BC0014; Thu, 10 Jul 2025 15:33:59 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 028E7C0011 for ; Thu, 10 Jul 2025 15:33:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 1A37D40A15 for ; Thu, 10 Jul 2025 15:33:52 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id SdTZMlixfv0d for ; Thu, 10 Jul 2025 15:33:51 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=xsimonar@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 6E11240A0C Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 6E11240A0C Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=WZvyN/hM Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp2.osuosl.org (Postfix) with ESMTPS id 6E11240A0C for ; Thu, 10 Jul 2025 15:33:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752161630; 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: in-reply-to:in-reply-to:references:references; bh=UZ389J6cDBQTHfRj4CxKniFRCHIqczwHXaYsCSmD2ss=; b=WZvyN/hMHBT221dUCRTHom473kATsXZWOkIkb0XD09kBguRmokHfbleACfsx+MPhS6vsF8 TyKus3qRTQ1KqnePcT/pUSpDh9AjRJgTDMgiGrQDL0V9mn4kw6fD/l8k7tRivOg5SvsEE2 v/q77R5CNI95TxvDA+XUNe4vUDJH+wE= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-77-SDnJM6AONB2yIDHwuGHe2w-1; Thu, 10 Jul 2025 11:33:49 -0400 X-MC-Unique: SDnJM6AONB2yIDHwuGHe2w-1 X-Mimecast-MFC-AGG-ID: SDnJM6AONB2yIDHwuGHe2w_1752161628 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6BA7E1801210 for ; Thu, 10 Jul 2025 15:33:48 +0000 (UTC) Received: from wsfd-netdev90.anl.eng.rdu2.dc.redhat.com (wsfd-netdev90.anl.eng.rdu2.dc.redhat.com [10.6.38.135]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E02DD180035E; Thu, 10 Jul 2025 15:33:47 +0000 (UTC) To: xsimonar@redhat.com, dev@openvswitch.org Date: Thu, 10 Jul 2025 11:33:35 -0400 Message-ID: <20250710153345.104954-3-xsimonar@redhat.com> In-Reply-To: <20250710153345.104954-1-xsimonar@redhat.com> References: <20250710153345.104954-1-xsimonar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: GsUcywy4bERtmiz2_OhZ_OOu7bD2bLiTR8_dQ2r540Y_1752161628 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 02/11] tests: Avoid unloading not existing modules. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Xavier Simonart via dev From: Xavier Simonart Reply-To: Xavier Simonart Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Do not try to remove a module if it failed to load. This caused errors in logs when running tests. Signed-off-by: Xavier Simonart --- tests/system-kmod-macros.at | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index 41a8b7914..7771146f0 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -64,8 +64,7 @@ m4_define([CONFIGURE_VETH_OFFLOADS], m4_define([CHECK_CONNTRACK], m4_foreach([mod], [[nf_conntrack_ipv4], [nf_conntrack_ipv6], [nf_nat_ftp], [nf_nat_tftp]], - [modprobe mod || echo "Module mod not loaded." - on_exit 'modprobe -r mod' + [modprobe mod && on_exit 'modprobe -r mod' || echo "Module mod not loaded." ]) sysctl -w net.netfilter.nf_conntrack_helper=0 on_exit "${ovs_builddir}/tests/ovstest test-netlink-conntrack flush"