Make the tests pass without FEATURES=-userpriv (bug #176201).

Package-Manager: portage-2.1.2.7

4 files changed, 61 insertions, 14 deletions

diff --git a/dev-python/logilab-common/ChangeLog b/dev-python/logilab-common/ChangeLog
index 58fcdaa4f6b0..9be92b93be3e 100644
--- a/dev-python/logilab-common/ChangeLog
+++ b/dev-python/logilab-common/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/logilab-common
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.32 2007/03/02 00:30:16 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.33 2007/05/14 21:39:28 marienz Exp $
+
+  14 May 2007; Marien Zwart <marienz@gentoo.org>
+  +files/logilab-common-0.21.2-disable-access-tests-as-root.patch,
+  logilab-common-0.21.2.ebuild:
+  Make the tests pass without FEATURES=-userpriv (bug #176201).
 
 *logilab-common-0.21.2 (02 Mar 2007)
 
diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest
index 4e6fd06b5bca..186f8595f270 100644
--- a/dev-python/logilab-common/Manifest
+++ b/dev-python/logilab-common/Manifest
@@ -5,6 +5,10 @@ AUX logilab-common-0.14.0-remove-broken-modutils-test.patch 760 RMD160 5a3aa1745
 MD5 bbf57c9fbfa420a2945ded153b5d4065 files/logilab-common-0.14.0-remove-broken-modutils-test.patch 760
 RMD160 5a3aa174592a14df5d8a2c1cb0c929a50279459d files/logilab-common-0.14.0-remove-broken-modutils-test.patch 760
 SHA256 de9210bea8acae9306d6ec3f60b297ca721c7db3f571dbfa9c2da87125ca4ae1 files/logilab-common-0.14.0-remove-broken-modutils-test.patch 760
+AUX logilab-common-0.21.2-disable-access-tests-as-root.patch 1235 RMD160 f0db83d132957637d0bc1042201d035369141e47 SHA1 2395c781bf5a6c56e49f6a249aec697db1a985ff SHA256 6b8185b71a72b4d4d24c8966f5c6c66957c4fbd95f03caf136853230a1ce766a
+MD5 59022b57c498bd61bedb57416283015b files/logilab-common-0.21.2-disable-access-tests-as-root.patch 1235
+RMD160 f0db83d132957637d0bc1042201d035369141e47 files/logilab-common-0.21.2-disable-access-tests-as-root.patch 1235
+SHA256 6b8185b71a72b4d4d24c8966f5c6c66957c4fbd95f03caf136853230a1ce766a files/logilab-common-0.21.2-disable-access-tests-as-root.patch 1235
 AUX logilab-common-0.21.2-remove-broken-tests.patch 916 RMD160 f0ec4be70ef6828ee8bbf1e1f356235f4dbf5d96 SHA1 38d62f07d30e3fffb6a946cc92d52e2500525812 SHA256 9272dc65490f7b9c82705b1b74f081a69fd01aea28ca278a592fd17a43de9333
 MD5 689ec7c9f586558a34eebd9f689d6144 files/logilab-common-0.21.2-remove-broken-tests.patch 916
 RMD160 f0ec4be70ef6828ee8bbf1e1f356235f4dbf5d96 files/logilab-common-0.21.2-remove-broken-tests.patch 916
@@ -30,18 +34,18 @@ EBUILD logilab-common-0.21.0.ebuild 1198 RMD160 39afa6ae7b37e2dc9aeca39a7767f91c
 MD5 8b15453465a2cd9d77b74cea3d5cbdd5 logilab-common-0.21.0.ebuild 1198
 RMD160 39afa6ae7b37e2dc9aeca39a7767f91c683370c4 logilab-common-0.21.0.ebuild 1198
 SHA256 ff4fe355b209c84f076a68af7675221d2cd936cfb76387c6d57a526e4539f658 logilab-common-0.21.0.ebuild 1198
-EBUILD logilab-common-0.21.2.ebuild 1578 RMD160 028110a38fe4e240f8dce3c12bad2341217217b8 SHA1 7969e3a4b17622ab85687039af498d9544b5cf11 SHA256 d2e6002f49c245724e6697425f8234d83e05ecc531f4d9a7a34ee5f564833384
-MD5 037d31718dceb7bba57442f68f8f9f66 logilab-common-0.21.2.ebuild 1578
-RMD160 028110a38fe4e240f8dce3c12bad2341217217b8 logilab-common-0.21.2.ebuild 1578
-SHA256 d2e6002f49c245724e6697425f8234d83e05ecc531f4d9a7a34ee5f564833384 logilab-common-0.21.2.ebuild 1578
+EBUILD logilab-common-0.21.2.ebuild 1691 RMD160 5bd920bebe5e8d23d8ecf1ac506cea0a0500dcb5 SHA1 26262b65ed5870a34f9310f0cc45011c32f6bcc8 SHA256 cef617b12455089a8464d6344fad5fcbfa50a5587663068bd0dc25ad8f10b51f
+MD5 c68beb7cf004cfecd5c5a7fd8558201a logilab-common-0.21.2.ebuild 1691
+RMD160 5bd920bebe5e8d23d8ecf1ac506cea0a0500dcb5 logilab-common-0.21.2.ebuild 1691
+SHA256 cef617b12455089a8464d6344fad5fcbfa50a5587663068bd0dc25ad8f10b51f logilab-common-0.21.2.ebuild 1691
 EBUILD logilab-common-0.9.3.ebuild 807 RMD160 8ed2d828926ea08609391c3c33ccbac6f3280d8a SHA1 fe4e1eb341f6b34511a19061f274703b54fe0fc9 SHA256 f9f1b622987e3cdc166693822e6568c52d6133594ac2cab44422e4a0c526764e
 MD5 73f8ccc1541ec595ba6ba19efef21eee logilab-common-0.9.3.ebuild 807
 RMD160 8ed2d828926ea08609391c3c33ccbac6f3280d8a logilab-common-0.9.3.ebuild 807
 SHA256 f9f1b622987e3cdc166693822e6568c52d6133594ac2cab44422e4a0c526764e logilab-common-0.9.3.ebuild 807
-MISC ChangeLog 5457 RMD160 b6ecde7ab966d66c5b174c970d9a2b18c61504cd SHA1 edaacc4284aa93bd3852fef9510aaaea70006c2e SHA256 0240b0a022606452a776056b287a777f10c40342096502faa96ddad86d22a71f
-MD5 b70591783828797e40ef976de857b296 ChangeLog 5457
-RMD160 b6ecde7ab966d66c5b174c970d9a2b18c61504cd ChangeLog 5457
-SHA256 0240b0a022606452a776056b287a777f10c40342096502faa96ddad86d22a71f ChangeLog 5457
+MISC ChangeLog 5670 RMD160 b169106c46dd2f2641201f5b974f51bf10b6eac0 SHA1 7709a9e3f1e6da7d982439c2253a8aff3d7e63f4 SHA256 d51845a7cc648c61373b185737262f247d0da47ef05bacc4ff3dd9f87cde4315
+MD5 967f30675be20a875cbbe9688d581ced ChangeLog 5670
+RMD160 b169106c46dd2f2641201f5b974f51bf10b6eac0 ChangeLog 5670
+SHA256 d51845a7cc648c61373b185737262f247d0da47ef05bacc4ff3dd9f87cde4315 ChangeLog 5670
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -62,9 +66,9 @@ MD5 e2267579c2d4b9b2de4904840e9426a3 files/digest-logilab-common-0.9.3 238
 RMD160 8b0d8a67d51053dafb60b350a8d7fbc4d18603d0 files/digest-logilab-common-0.9.3 238
 SHA256 884bbd4d867f675457c45148373d28eb305c977e1c240e76a59bda75d9b7b1b1 files/digest-logilab-common-0.9.3 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFF53A5UElL7eJpfEQRAmFbAKCJ6LFpwrjsr6HmknJ3AM2MU1gm+QCgrv79
-3KVyjXnzvboWC5lCi19+JVI=
-=WPQb
+iD8DBQFGSNdJUElL7eJpfEQRAq+8AJ9eu3h0fyBmyGSExQNWCx9FOlYrDQCdHepN
+FsFOeugmZFYADon8ZRCT0is=
+=jN9l
 -----END PGP SIGNATURE-----
diff --git a/dev-python/logilab-common/files/logilab-common-0.21.2-disable-access-tests-as-root.patch b/dev-python/logilab-common/files/logilab-common-0.21.2-disable-access-tests-as-root.patch
new file mode 100644
index 000000000000..dc282ccb9a36
--- /dev/null
+++ b/dev-python/logilab-common/files/logilab-common-0.21.2-disable-access-tests-as-root.patch
@@ -0,0 +1,31 @@
+=== modified file 'test/unittest_fileutils.py'
+--- test/unittest_fileutils.py	2007-05-14 21:26:45 +0000
++++ test/unittest_fileutils.py	2007-05-14 21:36:23 +0000
+@@ -74,6 +74,8 @@
+ 
+     def test_mode_change(self):
+         """tests that mode is changed when needed"""
++        if not os.geteuid():
++            self.skip('this test fails with root privs')
+         # test on non-writable file
+         self.assert_(not os.access(self.rpath, os.W_OK))
+         wp_file = ProtectedFile(self.rpath, 'w')
+@@ -85,6 +87,8 @@
+ 
+     def test_restore_on_close(self):
+         """tests original mode is restored on close"""
++        if not os.geteuid():
++            self.skip('this test fails with root privs')
+         # test on non-writable file
+         self.assert_(not os.access(self.rpath, os.W_OK))
+         ProtectedFile(self.rpath, 'w').close()
+@@ -96,6 +100,8 @@
+ 
+     def test_mode_change_on_append(self):
+         """tests that mode is changed when file is opened in 'a' mode"""
++        if not os.geteuid():
++            self.skip('this test fails with root privs')
+         self.assert_(not os.access(self.rpath, os.W_OK))
+         wp_file = ProtectedFile(self.rpath, 'a')
+         self.assert_(os.access(self.rpath, os.W_OK))
+
diff --git a/dev-python/logilab-common/logilab-common-0.21.2.ebuild b/dev-python/logilab-common/logilab-common-0.21.2.ebuild
index 09f72da79f80..104fee7e3ec0 100644
--- a/dev-python/logilab-common/logilab-common-0.21.2.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.21.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.21.2.ebuild,v 1.1 2007/03/02 00:30:16 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.21.2.ebuild,v 1.2 2007/05/14 21:39:28 marienz Exp $
 
 inherit distutils eutils
 
@@ -19,6 +19,13 @@ DEPEND="|| ( >=dev-python/optik-1.4 >=dev-lang/python-2.3 )
 PYTHON_MODNAME="logilab"
 
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-0.21.2-disable-access-tests-as-root.patch"
+}
+
 src_test() {
 	# Install temporarily.
 	local spath="test/lib/python"