From nobody Wed Apr 9 01:03:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1735814024; cv=none; d=zohomail.com; s=zohoarc; b=dgzcoVEb1d9Uc1nKBLlooxE+JgY8eXk7SeFoN259WCbG10v3+sBlLix44ujkQ/vQdTtMAH/Cn6ceOGzDYdjrJOHrEwreKr5Fk1dy0rKolGC84QVJ9m+lajcqvi4CBJ14iCkue1EoaiYAYKf2h/SeArNFsIBCEfvRO9CdtuPgwhM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735814024; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2rHxQa1PhAoahuKgtDYSw/InvDF8l5Ykbk+lLRlrRRo=; b=TI2Kzhqutt0RDUFpRq4DwkBZdlQal+sOft5IUTPOshMmEuNxPqcLU8JaP95zwDbpDrr4LlRJjBUCjI8ZwN8gYTd8RJ+csnhz/IyNfOX47TnFGyMvyDoheI0VVkjKbzU8FtIISQeFFZSOFn0YPQRDCMVzDKZzjOW3VCYBV+vzZwY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1735814024223581.7471766056705; Thu, 2 Jan 2025 02:33:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTIUp-0003tr-9Z; Thu, 02 Jan 2025 05:32:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tTIUn-0003tC-AA for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:32:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tTIUl-0005rB-GW for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:32:05 -0500 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-364-shSA59nFPhm9eKC6_LCR2w-1; Thu, 02 Jan 2025 05:31:59 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3301F19560A3 for ; Thu, 2 Jan 2025 10:31:58 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.39]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 989891956052; Thu, 2 Jan 2025 10:31:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1735813922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2rHxQa1PhAoahuKgtDYSw/InvDF8l5Ykbk+lLRlrRRo=; b=f0KNnKXMHgIK3uBxqxyx8bpO1HICIaC6gGs6HUJ9UNRIE/NYI06JFSblwiNZcTyKE2rpjD gZAkPQT/2tLdPBKt/X13xPY1fB0C5jMXulsG2YbWZ897GbrlSVrTAkWhuGlC9/VG18M2ns yTYiRiVG5RtjzsMgQ93PLhk3SEadM6A= X-MC-Unique: shSA59nFPhm9eKC6_LCR2w-1 X-Mimecast-MFC-AGG-ID: shSA59nFPhm9eKC6_LCR2w From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi Subject: [PULL 05/10] tests/functional: Extract the find_free_ports() function into a helper file Date: Thu, 2 Jan 2025 11:31:33 +0100 Message-ID: <20250102103138.354618-6-thuth@redhat.com> In-Reply-To: <20250102103138.354618-1-thuth@redhat.com> References: <20250102103138.354618-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.186, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1735814025529019100 Content-Type: text/plain; charset="utf-8" We'll need this functionality in other functional tests, too, so let's extract it into the qemu_test module. Also add an __enter__ and __exit__ function that can be used for using this functionality in a locked context, so that tests that are running in parallel don't try to compete for the same ports later. Also make sure to only use ports in the "Dynamic Ports" range (see https://www.rfc-editor.org/rfc/rfc6335) and "randomize" the start of the probed range with the PID of the test process to further avoid possible clashes with other competing processes. Message-ID: <20241218131439.255841-5-thuth@redhat.com> Signed-off-by: Thomas Huth --- tests/functional/qemu_test/ports.py | 56 +++++++++++++++++++++++++++++ tests/functional/test_vnc.py | 36 +++++-------------- 2 files changed, 64 insertions(+), 28 deletions(-) create mode 100644 tests/functional/qemu_test/ports.py diff --git a/tests/functional/qemu_test/ports.py b/tests/functional/qemu_te= st/ports.py new file mode 100644 index 0000000000..cc39939d48 --- /dev/null +++ b/tests/functional/qemu_test/ports.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python3 +# +# Simple functional tests for VNC functionality +# +# Copyright 2018, 2024 Red Hat, Inc. +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +import fcntl +import os +import socket +import sys +import tempfile + +from .config import BUILD_DIR +from typing import List + +class Ports(): + + PORTS_ADDR =3D '127.0.0.1' + PORTS_RANGE_SIZE =3D 1024 + PORTS_START =3D 49152 + ((os.getpid() * PORTS_RANGE_SIZE) % 16384) + PORTS_END =3D PORTS_START + PORTS_RANGE_SIZE + + def __enter__(self): + lock_file =3D os.path.join(BUILD_DIR, "tests", "functional", "port= _lock") + self.lock_fh =3D os.open(lock_file, os.O_CREAT) + fcntl.flock(self.lock_fh, fcntl.LOCK_EX) + return self + + def __exit__(self, exc_type, exc_value, traceback): + fcntl.flock(self.lock_fh, fcntl.LOCK_UN) + os.close(self.lock_fh) + + def check_bind(self, port: int) -> bool: + with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock: + try: + sock.bind((self.PORTS_ADDR, port)) + except OSError: + return False + + return True + + def find_free_ports(self, count: int) -> List[int]: + result =3D [] + for port in range(self.PORTS_START, self.PORTS_END): + if self.check_bind(port): + result.append(port) + if len(result) >=3D count: + break + assert len(result) =3D=3D count + return result + + def find_free_port(self) -> int: + return self.find_free_ports(1)[0] diff --git a/tests/functional/test_vnc.py b/tests/functional/test_vnc.py index e600d75234..1916be0103 100755 --- a/tests/functional/test_vnc.py +++ b/tests/functional/test_vnc.py @@ -14,22 +14,9 @@ from typing import List =20 from qemu_test import QemuSystemTest - +from qemu_test.ports import Ports =20 VNC_ADDR =3D '127.0.0.1' -VNC_PORT_START =3D 32768 -VNC_PORT_END =3D VNC_PORT_START + 1024 - - -def check_bind(port: int) -> bool: - with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock: - try: - sock.bind((VNC_ADDR, port)) - except OSError: - return False - - return True - =20 def check_connect(port: int) -> bool: with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock: @@ -40,18 +27,6 @@ def check_connect(port: int) -> bool: =20 return True =20 - -def find_free_ports(count: int) -> List[int]: - result =3D [] - for port in range(VNC_PORT_START, VNC_PORT_END): - if check_bind(port): - result.append(port) - if len(result) >=3D count: - break - assert len(result) =3D=3D count - return result - - class Vnc(QemuSystemTest): =20 def test_no_vnc_change_password(self): @@ -85,8 +60,7 @@ def test_change_password(self): self.vm.cmd('change-vnc-password', password=3D'new_password') =20 - def test_change_listen(self): - a, b, c =3D find_free_ports(3) + def do_test_change_listen(self, a, b, c): self.assertFalse(check_connect(a)) self.assertFalse(check_connect(b)) self.assertFalse(check_connect(c)) @@ -108,5 +82,11 @@ def test_change_listen(self): self.assertTrue(check_connect(b)) self.assertTrue(check_connect(c)) =20 + def test_change_listen(self): + with Ports() as ports: + a, b, c =3D ports.find_free_ports(3) + self.do_test_change_listen(a, b, c) + + if __name__ =3D=3D '__main__': QemuSystemTest.main() --=20 2.47.1