From patchwork Mon Apr 8 21:24:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frode Nordahl X-Patchwork-Id: 1921069 X-Patchwork-Delegate: i.maximets@samsung.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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 4VD2Cv0VP9z1yYd for ; Tue, 9 Apr 2024 07:24:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 657B060B95; Mon, 8 Apr 2024 21:24:23 +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 kCXBZPj5bdMI; Mon, 8 Apr 2024 21:24:22 +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 smtp3.osuosl.org 80BE660772 Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 80BE660772; Mon, 8 Apr 2024 21:24:22 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 60D6BC0DCE; Mon, 8 Apr 2024 21:24:22 +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 BD1B2C008E for ; Mon, 8 Apr 2024 21:24:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id A21B2813CE for ; Mon, 8 Apr 2024 21:24:20 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id AG_5vIs7X2Ih for ; Mon, 8 Apr 2024 21:24:19 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=209.85.167.43; helo=mail-lf1-f43.google.com; envelope-from=frode.nordahl@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 33CB58135B Authentication-Results: smtp1.osuosl.org; dmarc=fail (p=none dis=none) header.from=ubuntu.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 33CB58135B Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by smtp1.osuosl.org (Postfix) with ESMTPS id 33CB58135B for ; Mon, 8 Apr 2024 21:24:19 +0000 (UTC) Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-516cdb21b34so6224897e87.1 for ; Mon, 08 Apr 2024 14:24:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712611456; x=1713216256; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qMkZPsX1v0JG3YdjCGE3Sa3BUNBGIKjJww1g8pL2KF4=; b=O7HOlXHf86XoPKK4JBIp1cmUxzKFu4UT7c2wXqBputWl0Jl8NUwqqY1b/kzwv44Syc cUzvqk/oI1xrIHt7j+teUM6dU7MfJLfBn7fDC6GLiTf/gKYMY8TiRbRB7rtKEA1OkPNz 9fXwPOYpiUQrSuFH7/A9JctIj9ZYWT/gFGzsDuMwivoZlJ4sytIqMZb7meK7cTMCsa0Y 0GYDJI13Zr42J/Nw80rlmWW6hdZwJj1CkCM3Fa7dLXd0uPHo3/nnHcOwGjKs6Bvv6FOM pN7FPMgZTHmUy+isK8eF3Ekk0s/fgcb0I3vigwY3tfBfV97jMJt8USXAgX0LThFoGO2v OobA== X-Gm-Message-State: AOJu0YzRdOvupzTv2EytxcQyY3RtUJqiCJmCXecyBSs4WCPV3eyS0oht 6+pFjd1gaXpHzdeUWzx2rNTCzWfrSHvPEKJRiPhRCWp6PtoUxKnjNN7OZE0MPhE= X-Google-Smtp-Source: AGHT+IFtDXQawmfR0qdJy++Bx+GcFKJAa0u8+h1mQks1+JxC8IDr7WfghxXlv60OlZlq6EDKDLQfYA== X-Received: by 2002:a05:6512:280c:b0:516:fe8c:ef9b with SMTP id cf12-20020a056512280c00b00516fe8cef9bmr3451317lfb.57.1712611456196; Mon, 08 Apr 2024 14:24:16 -0700 (PDT) Received: from frode-730QED.lan ([2001:4643:d087:0:ede0:d9e1:bc8e:72ab]) by smtp.gmail.com with ESMTPSA id i28-20020a198c5c000000b00515bf6ba7bdsm1339906lfj.285.2024.04.08.14.24.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 14:24:15 -0700 (PDT) From: Frode Nordahl To: dev@openvswitch.org Date: Mon, 8 Apr 2024 23:24:14 +0200 Message-ID: <20240408212414.16704-1-fnordahl@ubuntu.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <529de1a6-7898-4f6a-bda5-8b12b11cb987@ovn.org> References: <529de1a6-7898-4f6a-bda5-8b12b11cb987@ovn.org> MIME-Version: 1.0 Cc: Ilya Maximets Subject: [ovs-dev] [PATCH v2] tests: Fix compatibility issue with Python 3.13 in vlog.at. 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 vlog - Python3 test makes use of output from Python Tracebacks in its test assertion. In Python 3.13 a line with tophat (``^``) markers is added below Tracebacks from calls to assert [0], which makes the test fail. This change of behavior is also backported to the Python 3.12 and 3.11 stable branches [1]. Strip lines containing one or more occurence of the ``^`` character from the output before performing the test assertions. 0: https://github.com/python/cpython/pull/105935 1: https://github.com/python/cpython/issues/116034 Reported-at: https://launchpad.net/bugs/2060434 Signed-off-by: Frode Nordahl --- tests/vlog.at | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/vlog.at b/tests/vlog.at index 785014956..efe91479a 100644 --- a/tests/vlog.at +++ b/tests/vlog.at @@ -8,6 +8,7 @@ AT_CHECK([$PYTHON3 $srcdir/test-vlog.py --log-file log_file \ AT_CHECK([sed -e 's/.*-.*-.*T..:..:..Z |//' \ -e 's/File ".*", line [[0-9]][[0-9]]*,/File , line ,/' \ +-e '/\^\+/d' \ stderr_log], [0], [dnl 0 | module_0 | EMER | emergency 1 | module_0 | ERR | error