r68414 - in /trunk/libparanoid-perl/debian: changelog patches/series patches/tests_as_root.patch

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Fri Feb 11 23:23:31 2011
New Revision: 68414

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=68414
Log:
New patch tests_as_root.patch: conditionally skip tests that fail when run
as root; thanks to Moritz Muehlenhoff for the bug report
(closes: #612776).

Added:
    trunk/libparanoid-perl/debian/patches/tests_as_root.patch
Modified:
    trunk/libparanoid-perl/debian/changelog
    trunk/libparanoid-perl/debian/patches/series

Modified: trunk/libparanoid-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libparanoid-perl/debian/changelog?rev=68414&op=diff
==============================================================================
--- trunk/libparanoid-perl/debian/changelog (original)
+++ trunk/libparanoid-perl/debian/changelog Fri Feb 11 23:23:31 2011
@@ -1,3 +1,11 @@
+libparanoid-perl (0.27-2) UNRELEASED; urgency=low
+
+  * New patch tests_as_root.patch: conditionally skip tests that fail when run
+    as root; thanks to Moritz Muehlenhoff for the bug report
+    (closes: #612776).
+
+ -- gregor herrmann <gregoa at debian.org>  Sat, 12 Feb 2011 00:21:45 +0100
+
 libparanoid-perl (0.27-1) unstable; urgency=low
 
   [ Jonathan Yu ]

Modified: trunk/libparanoid-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libparanoid-perl/debian/patches/series?rev=68414&op=diff
==============================================================================
--- trunk/libparanoid-perl/debian/patches/series (original)
+++ trunk/libparanoid-perl/debian/patches/series Fri Feb 11 23:23:31 2011
@@ -1,2 +1,3 @@
 fix-pod-spelling.patch
 stop-emailing-in-tests
+tests_as_root.patch

Added: trunk/libparanoid-perl/debian/patches/tests_as_root.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libparanoid-perl/debian/patches/tests_as_root.patch?rev=68414&op=file
==============================================================================
--- trunk/libparanoid-perl/debian/patches/tests_as_root.patch (added)
+++ trunk/libparanoid-perl/debian/patches/tests_as_root.patch Fri Feb 11 23:23:31 2011
@@ -1,0 +1,43 @@
+Description: skip tests that fail when run as root
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/612776
+Forwarded: no
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-02-12
+
+--- a/t/17_filesystem_pmkdir.t
++++ b/t/17_filesystem_pmkdir.t
+@@ -21,8 +21,11 @@
+ foreach (qw(t/test/ab t/test/cd t/test/ef1 t/test/ef2 t/test)) {
+   rmdir $_ };
+ 
+-ok( ! pmkdir( 't/test/{ab,cd,ef{1,2}}', 0555 ), 'pmkdir 2' );
+-rmdir 't/test';
++SKIP: {
++    skip( 'Not as root', 1 ) if $< eq 0;
++    ok( ! pmkdir( 't/test/{ab,cd,ef{1,2}}', 0555 ), 'pmkdir 2' );
++    rmdir 't/test';
++}
+ 
+ $glob = Paranoid::Glob->new(
+     globs   => ['t/test/{ab,cd,ef{1,2}}'], 
+--- a/t/18_filesystem_prm.t
++++ b/t/18_filesystem_prm.t
+@@ -70,10 +70,13 @@
+ ok( ! -d './t/test_rm', 'prmR 3' );
+ 
+ ok( prmR( \%errors, './t/test_rm_not_there'), 'prmR 4' );
+-mkdir './t/test_rm_noperms';
+-mkdir './t/test_rm_noperms/foo';
+-chmod 0400, './t/test_rm_noperms';
+-ok( ! prmR( \%errors, './t/test_rm_noperms/foo'), 'prmR 5' );
++SKIP: {
++    skip( 'Not as root', 1 ) if $< eq 0;
++    mkdir './t/test_rm_noperms';
++    mkdir './t/test_rm_noperms/foo';
++    chmod 0400, './t/test_rm_noperms';
++    ok( ! prmR( \%errors, './t/test_rm_noperms/foo'), 'prmR 5' );
++}
+ chmod 0755, './t/test_rm_noperms';
+ ok( prmR( \%errors, './t/test_rm_noperms'), 'prmR 6' );
+