[debhelper-devel] [Git][debian/debhelper][master] t: Remove some uid_0_test_is_ok guards

[Niels Thykier]

Niels Thykier pushed to branch master at Debian / debhelper


Commits:
7d1eb239 by Niels Thykier at 2018-01-31T21:20:34+00:00
t: Remove some uid_0_test_is_ok guards

Signed-off-by: Niels Thykier <niels at thykier.net>

- - - - -


6 changed files:

- t/dh_installdocs/dh_installdocs.t
- t/dh_installinit/dh_installinit.t
- t/dh_installsystemd/dh_installsystemd.t
- t/dh_installsystemd/dh_installsystemd_tmpfiles.t
- t/dh_installsystemd/dh_systemd.t
- t/maintscript.t


Changes:

=====================================
t/dh_installdocs/dh_installdocs.t
=====================================
--- a/t/dh_installdocs/dh_installdocs.t
+++ b/t/dh_installdocs/dh_installdocs.t
@@ -16,11 +16,8 @@ our @TEST_DH_EXTRA_TEMPLATE_FILES = (qw(
     debian/copyright
 ));
 
-if (uid_0_test_is_ok()) {
-	plan(tests => 5);
-} else {
-	plan skip_all => 'fakeroot required';
-}
+plan(tests => 5);
+
 
 my $NODOC_PROFILE = {
 	'env' => {


=====================================
t/dh_installinit/dh_installinit.t
=====================================
--- a/t/dh_installinit/dh_installinit.t
+++ b/t/dh_installinit/dh_installinit.t
@@ -14,11 +14,7 @@ our @TEST_DH_EXTRA_TEMPLATE_FILES = (qw(
     debian/foo.service
 ));
 
-if (uid_0_test_is_ok()) {
-	plan(tests => 2);
-} else {
-	plan skip_all => 'fakeroot required';
-}
+plan(tests => 2);
 
 each_compat_up_to_and_incl_subtest(10, sub {
 	make_path(qw(debian/foo debian/bar debian/baz));


=====================================
t/dh_installsystemd/dh_installsystemd.t
=====================================
--- a/t/dh_installsystemd/dh_installsystemd.t
+++ b/t/dh_installsystemd/dh_installsystemd.t
@@ -15,11 +15,7 @@ our @TEST_DH_EXTRA_TEMPLATE_FILES = (qw(
     debian/foo2.service
 ));
 
-if (uid_0_test_is_ok()) {
-	plan(tests => 1);
-} else {
-	plan skip_all => 'fakeroot required';
-}
+plan(tests => 1);
 
 sub unit_is_enabled {
 	my ($package, $unit, $num_enables, $num_masks) = @_;


=====================================
t/dh_installsystemd/dh_installsystemd_tmpfiles.t
=====================================
--- a/t/dh_installsystemd/dh_installsystemd_tmpfiles.t
+++ b/t/dh_installsystemd/dh_installsystemd_tmpfiles.t
@@ -15,11 +15,7 @@ our @TEST_DH_EXTRA_TEMPLATE_FILES = (qw(
     debian/foo.init
 ));
 
-if (uid_0_test_is_ok()) {
-	plan(tests => 1);
-} else {
-	plan skip_all => 'fakeroot required';
-}
+plan(tests => 1);
 
 # Units are installed and enabled
 each_compat_from_and_above_subtest(11, sub {


=====================================
t/dh_installsystemd/dh_systemd.t
=====================================
--- a/t/dh_installsystemd/dh_systemd.t
+++ b/t/dh_installsystemd/dh_systemd.t
@@ -15,11 +15,7 @@ our @TEST_DH_EXTRA_TEMPLATE_FILES = (qw(
     debian/foo2.service
 ));
 
-if (uid_0_test_is_ok()) {
-	plan(tests => 1);
-} else {
-	plan skip_all => 'fakeroot required';
-}
+plan(tests => 1);
 
 sub unit_is_enabled {
 	my ($package, $unit, $num_enables, $num_masks) = @_;


=====================================
t/maintscript.t
=====================================
--- a/t/maintscript.t
+++ b/t/maintscript.t
@@ -9,11 +9,7 @@ use lib dirname(__FILE__);
 use Test::DH;
 use Debian::Debhelper::Dh_Lib qw(!dirname);
 
-if (uid_0_test_is_ok()) {
-	plan(tests => 2);
-} else {
-	plan skip_all => 'fakeroot required';
-}
+plan(tests => 2);
 
 each_compat_up_to_and_incl_subtest(10, sub {
 	my @scripts = qw{postinst preinst prerm postrm};



View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/7d1eb239f37c4f4d6e8899ed3fcd66533a7fa4e8

---
View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/7d1eb239f37c4f4d6e8899ed3fcd66533a7fa4e8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debhelper-devel/attachments/20180131/ae13cef3/attachment-0001.html>