From patchwork Wed Mar 20 10:59:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ales Musil X-Patchwork-Id: 1914076 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=KIFTuG6S; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.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 4V05GP2F7wz23r9 for ; Wed, 20 Mar 2024 22:00:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id D848D60BA1; Wed, 20 Mar 2024 11:00:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CZ9ZXZCsQiKL; Wed, 20 Mar 2024 11:00:07 +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 B94CA6066E Authentication-Results: smtp3.osuosl.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=KIFTuG6S Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id B94CA6066E; Wed, 20 Mar 2024 11:00:07 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6EB7BC007C; Wed, 20 Mar 2024 11:00:07 +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 13F57C0037 for ; Wed, 20 Mar 2024 11:00:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 0E3B84049A for ; Wed, 20 Mar 2024 11:00:05 +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 lpout_LZBXEi for ; Wed, 20 Mar 2024 11:00:02 +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 smtp2.osuosl.org 6CEA140124 Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 6CEA140124 Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=KIFTuG6S 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 6CEA140124 for ; Wed, 20 Mar 2024 11:00:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710932401; 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=mgcR09WO/x4eWZmNZHy+eEmRbcs5MD5BDF02E5KUYo4=; b=KIFTuG6SGcWO3wxISAz5RhSEEedV+3tv24ma5Hf+YxOLsYT3a2v1Pk9p+gt0BCFGFWRxk6 bvgZqBK2Dwbs3YnQTCIR/jAPmdci/VtDlzYgVWaOOpoPP77EzYScEUtxpbcc1G87ek6srt ckc2LWhV2kFdDrDSt6qYBs31HMsZ6K0= 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-345-sw3PmbazPuCWETFmsVSwyw-1; Wed, 20 Mar 2024 06:59:59 -0400 X-MC-Unique: sw3PmbazPuCWETFmsVSwyw-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 33BEA8007A4 for ; Wed, 20 Mar 2024 10:59:59 +0000 (UTC) Received: from amusil.brq.redhat.com (unknown [10.43.17.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99D5B492BD3; Wed, 20 Mar 2024 10:59:58 +0000 (UTC) From: Ales Musil To: dev@openvswitch.org Date: Wed, 20 Mar 2024 11:59:56 +0100 Message-ID: <20240320105956.566508-2-amusil@redhat.com> In-Reply-To: <20240320105956.566508-1-amusil@redhat.com> References: <20240320105956.566508-1-amusil@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: Dumitru Ceara Subject: [ovs-dev] [PATCH ovn branch-23.06 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 66028992d..65016b84f 100644 --- a/tests/system-ovn-kmod.at +++ b/tests/system-ovn-kmod.at @@ -1023,8 +1023,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 @@ -1048,7 +1047,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