From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F407E158091 for ; Sun, 12 Jun 2022 20:36:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53FF3E0961; Sun, 12 Jun 2022 20:36:55 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 091EBE0961 for ; Sun, 12 Jun 2022 20:36:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 smtp.gentoo.org (Postfix) with ESMTPS id E5B1F34188D for ; Sun, 12 Jun 2022 20:36:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 331DE506 for ; Sun, 12 Jun 2022 20:36:51 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1655066198.6869d1ac8aa4ad0d4e9ce69066cb179ce3346f50.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/redis/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/redis/redis-6.0.16.ebuild dev-db/redis/redis-6.2.6.ebuild dev-db/redis/redis-6.2.7-r1.ebuild dev-db/redis/redis-7.0.0-r1.ebuild dev-db/redis/redis-7.0.0.ebuild dev-db/redis/redis-7.0.1.ebuild X-VCS-Directories: dev-db/redis/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6869d1ac8aa4ad0d4e9ce69066cb179ce3346f50 X-VCS-Branch: master Date: Sun, 12 Jun 2022 20:36:51 +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: 889802b1-3cae-48e9-8128-2c9f2cfa8a0e X-Archives-Hash: 735ff7acde0a5a4be123eab489e889dd commit: 6869d1ac8aa4ad0d4e9ce69066cb179ce3346f50 Author: Petr Vaněk atlas cz> AuthorDate: Fri Jun 10 16:28:18 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jun 12 20:36:38 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6869d1ac dev-db/redis: skip oom-score-adj related tests for some FEATURES oom-score-adj related unit tests fail when usersandbox or -userpriv FEATURES are set, therefore let's skip them. They were introduced as unit/oom-score-adj tests in 6.2.0 but they were backported to 6.0.7. Later, "CONFIG SET rollback on apply error" test was added in version 7.0.0 which also tries to adjust OOM score. Closes: https://bugs.gentoo.org/756382 Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/25831 Signed-off-by: Sam James gentoo.org> dev-db/redis/redis-6.0.16.ebuild | 10 ++++++---- dev-db/redis/redis-6.2.6.ebuild | 10 ++++++---- dev-db/redis/redis-6.2.7-r1.ebuild | 10 ++++++---- dev-db/redis/redis-7.0.0-r1.ebuild | 16 ++++++++++++---- dev-db/redis/redis-7.0.0.ebuild | 16 ++++++++++++---- dev-db/redis/redis-7.0.1.ebuild | 16 ++++++++++++---- 6 files changed, 54 insertions(+), 24 deletions(-) diff --git a/dev-db/redis/redis-6.0.16.ebuild b/dev-db/redis/redis-6.0.16.ebuild index 557648cfd6f1..f59c867797b2 100644 --- a/dev-db/redis/redis-6.0.16.ebuild +++ b/dev-db/redis/redis-6.0.16.ebuild @@ -140,10 +140,12 @@ src_test() { --skiptest "Active defrag edge case" ) - # Known to fail with FEATURES=usersandbox - if has usersandbox ${FEATURES}; then - ewarn "You are emerging ${P} with 'usersandbox' enabled." \ - "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" + if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then + ewarn "unit/oom-score-adj test will be skipped." \ + "It is known to fail with FEATURES usersandbox or -userpriv. See bug #756382." + + # unit/oom-score-adj was introduced in version 6.2.0 and it was later backported to 6.0.7 + runtestargs+=( --skipunit unit/oom-score-adj ) # see bug #756382 fi if use ssl; then diff --git a/dev-db/redis/redis-6.2.6.ebuild b/dev-db/redis/redis-6.2.6.ebuild index f1a8a0d2cc41..2fe6b97c0f65 100644 --- a/dev-db/redis/redis-6.2.6.ebuild +++ b/dev-db/redis/redis-6.2.6.ebuild @@ -134,10 +134,12 @@ src_test() { --clients "$(makeopts_jobs)" # see bug #649868 ) - # Known to fail with FEATURES=usersandbox - if has usersandbox ${FEATURES}; then - ewarn "You are emerging ${P} with 'usersandbox' enabled." \ - "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" + if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then + ewarn "unit/oom-score-adj test will be skipped." \ + "It is known to fail with FEATURES usersandbox or -userpriv. See bug #756382." + + # unit/oom-score-adj was introduced in version 6.2.0 + runtestargs+=( --skipunit unit/oom-score-adj ) # see bug #756382 fi if use ssl; then diff --git a/dev-db/redis/redis-6.2.7-r1.ebuild b/dev-db/redis/redis-6.2.7-r1.ebuild index 7c3fb2239fa5..a15818f6a3db 100644 --- a/dev-db/redis/redis-6.2.7-r1.ebuild +++ b/dev-db/redis/redis-6.2.7-r1.ebuild @@ -136,10 +136,12 @@ src_test() { --clients "$(makeopts_jobs)" # see bug #649868 ) - # Known to fail with FEATURES=usersandbox - if has usersandbox ${FEATURES}; then - ewarn "You are emerging ${P} with 'usersandbox' enabled." \ - "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" + if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then + ewarn "unit/oom-score-adj test will be skipped." \ + "It is known to fail with FEATURES usersandbox or -userpriv. See bug #756382." + + # unit/oom-score-adj was introduced in version 6.2.0 + runtestargs+=( --skipunit unit/oom-score-adj ) # see bug #756382 fi if use ssl; then diff --git a/dev-db/redis/redis-7.0.0-r1.ebuild b/dev-db/redis/redis-7.0.0-r1.ebuild index 0de72a51722e..180394de9ee9 100644 --- a/dev-db/redis/redis-7.0.0-r1.ebuild +++ b/dev-db/redis/redis-7.0.0-r1.ebuild @@ -117,10 +117,18 @@ src_test() { --clients "$(makeopts_jobs)" # see bug #649868 ) - # Known to fail with FEATURES=usersandbox - if has usersandbox ${FEATURES}; then - ewarn "You are emerging ${P} with 'usersandbox' enabled." \ - "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" + if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then + ewarn "oom-score-adj related tests will be skipped." \ + "They are known to fail with FEATURES usersandbox or -userpriv. See bug #756382." + + runtestargs+=( + # unit/oom-score-adj was introduced in version 6.2.0 + --skipunit unit/oom-score-adj # see bug #756382 + + # Following test was added in version 7.0.0 to unit/introspection. + # It also tries to adjust OOM score. + --skiptest "CONFIG SET rollback on apply error" + ) fi if use ssl; then diff --git a/dev-db/redis/redis-7.0.0.ebuild b/dev-db/redis/redis-7.0.0.ebuild index 8fc30b963227..617c6726205d 100644 --- a/dev-db/redis/redis-7.0.0.ebuild +++ b/dev-db/redis/redis-7.0.0.ebuild @@ -136,10 +136,18 @@ src_test() { --clients "$(makeopts_jobs)" # see bug #649868 ) - # Known to fail with FEATURES=usersandbox - if has usersandbox ${FEATURES}; then - ewarn "You are emerging ${P} with 'usersandbox' enabled." \ - "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" + if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then + ewarn "oom-score-adj related tests will be skipped." \ + "They are known to fail with FEATURES usersandbox or -userpriv. See bug #756382." + + runtestargs+=( + # unit/oom-score-adj was introduced in version 6.2.0 + --skipunit unit/oom-score-adj # see bug #756382 + + # Following test was added in version 7.0.0 to unit/introspection. + # It also tries to adjust OOM score. + --skiptest "CONFIG SET rollback on apply error" + ) fi if use ssl; then diff --git a/dev-db/redis/redis-7.0.1.ebuild b/dev-db/redis/redis-7.0.1.ebuild index 0de72a51722e..180394de9ee9 100644 --- a/dev-db/redis/redis-7.0.1.ebuild +++ b/dev-db/redis/redis-7.0.1.ebuild @@ -117,10 +117,18 @@ src_test() { --clients "$(makeopts_jobs)" # see bug #649868 ) - # Known to fail with FEATURES=usersandbox - if has usersandbox ${FEATURES}; then - ewarn "You are emerging ${P} with 'usersandbox' enabled." \ - "Expect some test failures or emerge with 'FEATURES=-usersandbox'!" + if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then + ewarn "oom-score-adj related tests will be skipped." \ + "They are known to fail with FEATURES usersandbox or -userpriv. See bug #756382." + + runtestargs+=( + # unit/oom-score-adj was introduced in version 6.2.0 + --skipunit unit/oom-score-adj # see bug #756382 + + # Following test was added in version 7.0.0 to unit/introspection. + # It also tries to adjust OOM score. + --skiptest "CONFIG SET rollback on apply error" + ) fi if use ssl; then