From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (unknown [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id CDA6B802E4 for ; Mon, 31 Aug 2026 22:52:59 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 67VMpjWH031041; Tue, 1 Sep 2026 01:51:46 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 67VMpjWH031041 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="mxyb2GVV" Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 67VMpecG031020 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 1 Sep 2026 01:51:40 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 67VMpecG031020 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-482f41ca436so3441132f8f.1 for ; Mon, 31 Aug 2026 15:51:40 -0700 (PDT) X-Gm-Message-State: AFuF++kUFNj1jtZtP2AvxzjVdMbQvA3AvXZmSkiIViX4Aq/SMold6FhU TiGQs3bRMKfMyzWZnUeZzljheSIX0cuejY/E4ZtQijb8gT+QbN0tG0lmTaK6rP9X3phS6WmkvlM NMjdd07s/oNPDKK+nJHWGS/GZUPk+x8aV8Mb0UWepfAbAQEDb7vW0mA== X-Gm-Gg: AYBFou02OVTcNH3HGo9BfgYGZm8bAQTREkmS3ARbESzCPH3Mwiqo7aluYRFUf/ah/Pk GRemicfyd4WISde/si2Im/uVRRlwBF4Vw49uZ9lQOmo8vgXWo84UQzQGFCcbIUye6orUk+kIsL7 mK5o2zESkVnADNV2lFrggLFUhzLJ5EFUptWwxxbwQlBxYWOAJwUXkuo3FutBsqGErvFbRAS04sD Pixgt9af31l3O4P6qH0KOPN0e3MYls10t4pPDEuhKSlE10cSMeodzbWgRNPiLe/IQAzu76iyGKh +eKIR8tD5pISy50BYApJtVGhJELL0ApKYTabWgE9vyB3DWq438TYomyxs/nm8Ee1m36ZhcYTEtm n4KDmAtNAcyzx+FhID1RmjQjRMQ== X-Received: by 2002:a5d:5f52:0:b0:482:e12b:b3be with SMTP id ffacd0b85a97d-482f79db84amr42078817f8f.12.1788216700453; Mon, 31 Aug 2026 15:51:40 -0700 (PDT) X-Received: by 2002:a5d:5f52:0:b0:482:e12b:b3be with SMTP id ffacd0b85a97d-482f79db84amr42078762f8f.12.1788216699978; Mon, 31 Aug 2026 15:51:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1788216699; cv=none; d=google.com; s=arc-20260327; b=CETuF8wvKu3+DrlBw5dXyJQ0g49sjixWDI9D6Jz3zRsnwXoSPXNJCkjVb6Jt48Nkpy ahxTpq2lQHm9/8Gzjc1fjvEz7wAfv4f4UDFNQ4qnS4FWJbpNJwDy4YtcTLLBBt2GKHTA 8W4a0pRRLXmzKH5hhGPbC35+Bq2PLSpyLObS7SxtOzkGb8BKRL8hoKDOajjIR+ONTA+z zQXt+y8/xERfAMvehtBAPYI+mtfQjEKyCiYznOnoXcRJ1GnuAsUf6B0zhGwfoeB8yw8w 3pVgLx0fvjEa+zTIC2Oa9RRerxBeggjpAHlgDcIpLC7aIiEyxG9ijQILOn8UJ9sq8439 w+Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=GU1xCmz9WE5dcqv+3Vur+q3ZeY0jfxVE9ZoHdNgLtfA=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=V1aBkq0kwOcDqR5TlywdzMJp6KAKBE9z1ewus5NE8N4GV/7Cg2K4lTAz8hDqdKWJlk OpiwdqBWMJrJPCSHtqJDN+66NxNMrOp+6163TudiRdqW0/OKkbCoJEIIStSICrwpmr9u fWldh/Q5F3YorknQyvzmr5Bg6ydik8e7O5Dk4lyw5U4YQWV3xu+qw+d1E+P6rLj507P6 ZiQloIlHxn5G8hEcIwqa4TfqVlfaYaDj0C/MWlAfiWLpk32vhfId4XTb1MAQA6C8SPnK qe5jevb91fTB81GzZXDbNf3sySqAPqxBn2gJt5VPtzodjBnkbXwwD34VWSOadOUzPHOK mP3g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=mxyb2GVV; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-48442d80679si766261f8f.342.2026.08.31.15.51.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2026 15:51:39 -0700 (PDT) Received-SPF: pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=mxyb2GVV; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=GU1xCmz9WE5dcqv+3Vur+q3ZeY0jfxVE9ZoHdNgLtfA=; b=mxyb2GVVUBqX 9tK5feihMg41hwQIwUYKFSFpWs2Boxgra6scWwTgtWXylzJ4/XmfTQOC9VtLqKkwPTpX47NR7rdo2 hSVxxnHM12yF+QVXRyybHwkiSqbraEqWjBVGg5MmGF21TZqZi6I3gk+60KmjRWLeNMnjwNPLzYd1l bngf8MShOwArDMA7o38KajTWhJwaOG52zo70opdSeW0fOXDEQoBGW811Gdbn90SBr10U4N9TbaOs2 DDAqB4GXeWQGQ5G02/XUDEoSOkWvk7zIfOfhWZTlSW/rJkaHcMeGUjgwqXqzYmw2b0ddRcFA8MZbn QiVsusiRLNSSjmkVCRfEaA==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=LekKit-T14) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1x1AoS-009n0b-36; Tue, 01 Sep 2026 00:51:30 +0200 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Tue, 1 Sep 2026 01:50:52 +0300 Message-ID: <20260831225137.1642608-2-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260831225137.1642608-1-eva.kurchatova@virtuozzo.com> References: <20260831225137.1642608-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH vz10 2/4] selftests: net: py: add the missing ksft_is() and ksft_not_in() helpers X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org rss_api.py and rss_flow_label.py call ksft_is() and ksft_not_in(), and net/lib/py/__init__.py exports both, but ksft.py never defined them, so importing the library fails and every test of the group goes down with it: ImportError: cannot import name 'ksft_is' from 'net.lib.py' The tests and the export came in with the RHEL10 import, commit 9f055df11343 ("rh10: import RHEL10 kernel-6.12.0-211.16.1.el10"), the helpers did not. Take them from the commits that added them upstream, commit 31eae6d99587 ("selftests: drv-net: test drivers sleeping in ndo_get_stats64") for ksft_is() and commit 4fde8398462f ("selftests: drv-net: improve the use of ksft helpers in XSK queue test") for ksft_not_in(). The tests those commits add are left out. https://virtuozzo.atlassian.net/browse/VSTOR-139651 Feature: fix vz selftests Signed-off-by: Eva Kurchatova --- tools/testing/selftests/net/lib/py/ksft.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/testing/selftests/net/lib/py/ksft.py b/tools/testing/selftests/net/lib/py/ksft.py index 7b50111340bb..61287c203b6e 100644 --- a/tools/testing/selftests/net/lib/py/ksft.py +++ b/tools/testing/selftests/net/lib/py/ksft.py @@ -76,6 +76,16 @@ def ksft_in(a, b, comment=""): _fail("Check failed", a, "not in", b, comment) +def ksft_not_in(a, b, comment=""): + if a in b: + _fail("Check failed", a, "in", b, comment) + + +def ksft_is(a, b, comment=""): + if a is not b: + _fail("Check failed", a, "is not", b, comment) + + def ksft_ge(a, b, comment=""): if a < b: _fail("Check failed", a, "<", b, comment) -- 2.55.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel