From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Thu, 31 Oct 2019 20:41:04 +0000 (+0100)
Subject: sys-fs/cryfs: Disable hanging tests
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bdc5fe9844e7008398befa52f8187849d9014b7d;p=gentoo.git

sys-fs/cryfs: Disable hanging tests

Closes: https://bugs.gentoo.org/699044
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---

diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild
index 56ffbdfc5458..b305bf454db5 100644
--- a/sys-fs/cryfs/cryfs-0.10.2.ebuild
+++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild
@@ -57,6 +57,10 @@ src_prepare() {
 	# remove tests that require internet access to comply with Gentoo policy
 	sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \
 		-i test/cpp-utils/CMakeLists.txt || die
+
+	# /dev/fuse access denied
+	sed -e "/CliTest_IntegrityCheck/d" \
+		-i test/cryfs-cli/CMakeLists.txt || die
 }
 
 src_configure() {
@@ -74,16 +78,13 @@ src_configure() {
 
 src_test() {
 	local TMPDIR="${T}"
-	addread /dev/fuse
-	addwrite /dev/fuse
 	local tests_failed=()
 
-	for i in gitversion cpp-utils parallelaccessstore blockstore blobstore fspp cryfs cryfs-cli ; do
+	# fspp fuse tests hang, bug # 699044
+	for i in gitversion cpp-utils parallelaccessstore blockstore blobstore cryfs cryfs-cli ; do
 		"${BUILD_DIR}"/test/${i}/${i}-test || tests_failed+=( "${i}" )
 	done
 
-	adddeny /dev/fuse
-
 	if [[ -n ${tests_failed[@]} ]] ; then
 		eerror "The following tests failed:"
 		eerror "${tests_failed[@]}"
diff --git a/sys-fs/cryfs/cryfs-9999.ebuild b/sys-fs/cryfs/cryfs-9999.ebuild
index d401918aecc4..5cd7961f3996 100644
--- a/sys-fs/cryfs/cryfs-9999.ebuild
+++ b/sys-fs/cryfs/cryfs-9999.ebuild
@@ -53,6 +53,10 @@ src_prepare() {
 	# remove tests that require internet access to comply with Gentoo policy
 	sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \
 		-i test/cpp-utils/CMakeLists.txt || die
+
+	# /dev/fuse access denied
+	sed -e "/CliTest_IntegrityCheck/d" \
+		-i test/cryfs-cli/CMakeLists.txt || die
 }
 
 src_configure() {
@@ -69,16 +73,13 @@ src_configure() {
 
 src_test() {
 	local TMPDIR="${T}"
-	addread /dev/fuse
-	addwrite /dev/fuse
 	local tests_failed=()
 
-	for i in gitversion cpp-utils parallelaccessstore blockstore blobstore fspp cryfs cryfs-cli ; do
+	# fspp fuse tests hang, bug # 699044
+	for i in gitversion cpp-utils parallelaccessstore blockstore blobstore cryfs cryfs-cli ; do
 		"${BUILD_DIR}"/test/${i}/${i}-test || tests_failed+=( "${i}" )
 	done
 
-	adddeny /dev/fuse
-
 	if [[ -n ${tests_failed[@]} ]] ; then
 		eerror "The following tests failed:"
 		eerror "${tests_failed[@]}"