[SCM] Debian packaging of libparanoid-perl branch, master, updated. debian/0.31-1

Salvatore Bonaccorso carnil at debian.org
Sat Dec 10 13:18:49 UTC 2011


The following commit has been merged in the master branch:
commit 7208386cd6401e15f026c896310a7b1e28ed871c
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Sat Dec 10 14:08:42 2011 +0100

    Drop tests_as_root.patch
    
    Upstream skips now the two tests.

diff --git a/debian/patches/series b/debian/patches/series
index 4a8c961..7c76b0c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix-pod-spelling.patch
 stop-emailing-in-tests.patch
-tests_as_root.patch
diff --git a/debian/patches/tests_as_root.patch b/debian/patches/tests_as_root.patch
deleted file mode 100644
index c38a5d3..0000000
--- a/debian/patches/tests_as_root.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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' );
- 

-- 
Debian packaging of libparanoid-perl



More information about the Pkg-perl-cvs-commits mailing list