From patchwork Wed Mar 20 10:16:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ales Musil X-Patchwork-Id: 1914033 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=X4xHV58J; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (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 4V04Hh5RZQz23r9 for ; Wed, 20 Mar 2024 21:16:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id DFB5C40BC3; Wed, 20 Mar 2024 10:16:14 +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 ngYJq4Xb8xAx; Wed, 20 Mar 2024 10:16:14 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org D1E5540134 Authentication-Results: smtp2.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=X4xHV58J Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id D1E5540134; Wed, 20 Mar 2024 10:16:13 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 995B7C007C; Wed, 20 Mar 2024 10:16:13 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id D23FFC0037 for ; Wed, 20 Mar 2024 10:16:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id CD60C40844 for ; Wed, 20 Mar 2024 10:16:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jwFAfG-we_ta for ; Wed, 20 Mar 2024 10:16:10 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=amusil@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 94B414083C Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 94B414083C Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=X4xHV58J Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id 94B414083C for ; Wed, 20 Mar 2024 10:16:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710929769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qPndz6C9cr35RoVPtlbVi5ZWYKuNKAE22BZro964VyQ=; b=X4xHV58JRRKyv+gOCy8YJfGgCfG7w3UUcLP2grkQE7hWM1P1GIXb0mzHK/28UpdGNUPfjo 6C1q0Y0VGfyQMUvs8Y9z/B72syYoufchXliQZ3uIUCc2nQIvCw43yF2Vjx+fOlHIzZUF4m 4AzgMwr9I+1hDbOa/XcfpBe8b5g4FvY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-303-i6NeaF5QPhivrL0z3x5PEQ-1; Wed, 20 Mar 2024 06:16:08 -0400 X-MC-Unique: i6NeaF5QPhivrL0z3x5PEQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id D060E101A56C for ; Wed, 20 Mar 2024 10:16:07 +0000 (UTC) Received: from amusil.brq.redhat.com (unknown [10.43.17.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45CCC1C060A4; Wed, 20 Mar 2024 10:16:07 +0000 (UTC) From: Ales Musil To: dev@openvswitch.org Date: Wed, 20 Mar 2024 11:16:05 +0100 Message-ID: <20240320101605.554684-2-amusil@redhat.com> In-Reply-To: <20240320101605.554684-1-amusil@redhat.com> References: <20240320101605.554684-1-amusil@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: Dumitru Ceara Subject: [ovs-dev] [PATCH ovn branch-23.09 2/2] tests: Address netcat 7.94 changes. 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" Fedora received an update of netcat to version 7.94, this version brings ability for UDP to accept multiple connections without closing (-k/--keep-open) [0]. That had negative impact on the tests as the UDP netcat server was closing sooner that expected. Make sure that the server is alive when we expect it to and avoid checking kill of server that might be already finished. [0] https://github.com/nmap/nmap/issues/1223 Signed-off-by: Ales Musil Signed-off-by: Dumitru Ceara (cherry picked from commit 0a35824093ddcd774544ec696dc8fe8c279fb603) --- tests/system-ovn-kmod.at | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/system-ovn-kmod.at b/tests/system-ovn-kmod.at index 254a4b0a0..86c5e01ab 100644 --- a/tests/system-ovn-kmod.at +++ b/tests/system-ovn-kmod.at @@ -804,8 +804,7 @@ wait_for_ports_up check ovn-nbctl --wait=hv sync # Create service that listens for TCP and UDP -NETNS_DAEMONIZE([vm2], [nc -l -u 1234], [nc0.pid]) -NETNS_DAEMONIZE([vm2], [nc -l -k 1235], [nc1.pid]) +NETNS_DAEMONIZE([vm2], [nc -l -k 1235], [nc0.pid]) test_icmp() { # Make sure that a ping works as expected @@ -829,7 +828,9 @@ icmp,orig=(src=173.0.1.2,dst=172.16.0.102,id=,type=8,code=0),reply=(src } test_udp() { + NETNS_DAEMONIZE([vm2], [nc -l -u 1234], [nc1.pid]) NS_CHECK_EXEC([vm1], [nc -u 30.0.0.1 1234 -p 1222 -z]) + kill $(cat nc1.pid) AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(30.0.0.1) | \ sed -e 's/zone=[[0-9]]*/zone=/'], [0], [dnl