From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F1A0C1581CA for ; Sat, 14 Jun 2025 08:52:41 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id DB8F4342476 for ; Sat, 14 Jun 2025 08:52:41 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id D00951104DB; Sat, 14 Jun 2025 08:52:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id C16931104DB for ; Sat, 14 Jun 2025 08:52:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6DA5B342476 for ; Sat, 14 Jun 2025 08:52:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 17AAF29A4 for ; Sat, 14 Jun 2025 08:52:39 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1749891148.6f0dfdd5bb28cfebee81442cb5b0864b5c46233a.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/puma/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/puma/puma-6.5.0.ebuild www-servers/puma/puma-6.6.0.ebuild X-VCS-Directories: www-servers/puma/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 6f0dfdd5bb28cfebee81442cb5b0864b5c46233a X-VCS-Branch: master Date: Sat, 14 Jun 2025 08:52:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4cc5c328-bd2d-4ad3-8cc2-a089c72a2620 X-Archives-Hash: 406aa466d6d1069982365f481e9e2a56 commit: 6f0dfdd5bb28cfebee81442cb5b0864b5c46233a Author: Hans de Graaff gentoo org> AuthorDate: Sat Jun 14 08:51:44 2025 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sat Jun 14 08:52:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f0dfdd5 www-servers/puma: fix tests with systemd present Closes: https://bugs.gentoo.org/954180 Signed-off-by: Hans de Graaff gentoo.org> www-servers/puma/puma-6.5.0.ebuild | 7 ++++++- www-servers/puma/puma-6.6.0.ebuild | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/www-servers/puma/puma-6.5.0.ebuild b/www-servers/puma/puma-6.5.0.ebuild index 6c9ad836c512..065bf98cd467 100644 --- a/www-servers/puma/puma-6.5.0.ebuild +++ b/www-servers/puma/puma-6.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -67,6 +67,11 @@ all_ruby_prepare() { #sed -e '/test_systemd_notify_usr1_phased_restart_cluster/askip "Flaky test"' \ # -i test/test_plugin_systemd.rb || die + # Avoid a test that fails on systemd systems due to the pluging + # getting autoloaded there, bug #954180 + sed -e '/test_plugins/askip "Fails on a systemd system"' \ + -i test/test_cli.rb || die + # Tries to call 'rackup' directly sed -i -e '/def test_bin/,/^ end/ s:^:#:' test/test_rack_handler.rb || die diff --git a/www-servers/puma/puma-6.6.0.ebuild b/www-servers/puma/puma-6.6.0.ebuild index e84339cb2b91..afcdd7dc3e30 100644 --- a/www-servers/puma/puma-6.6.0.ebuild +++ b/www-servers/puma/puma-6.6.0.ebuild @@ -66,6 +66,11 @@ all_ruby_prepare() { #sed -e '/test_systemd_notify_usr1_phased_restart_cluster/askip "Flaky test"' \ # -i test/test_plugin_systemd.rb || die + # Avoid a test that fails on systemd systems due to the pluging + # getting autoloaded there, bug #954180 + sed -e '/test_plugins/askip "Fails on a systemd system"' \ + -i test/test_cli.rb || die + # Tries to call 'rackup' directly sed -i -e '/def test_bin/,/^ end/ s:^:#:' test/test_rack_handler.rb || die @@ -76,6 +81,7 @@ all_ruby_prepare() { each_ruby_test() { einfo "Running test suite" + MT_NO_PLUGINS=true ${RUBY} -Ilib:.:test \ -e "require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{require _1}" || die }