commit: 6f0dfdd5bb28cfebee81442cb5b0864b5c46233a Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Sat Jun 14 08:51:44 2025 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> 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 <graaff <AT> 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 }
