From 2ae090fba0cb30f95ba406b62e5da150577bd538 Mon Sep 17 00:00:00 2001 From: Andreas Guldstrand Date: Mon, 6 Feb 2017 12:24:28 +0100 Subject: t/ useradd/groupadd in README change from 200 to 199 to not conflict with possible postfix install --- t/11-git.t | 10 +++++----- t/12-readme.t | 2 +- t/31-template.t | 4 ++-- t/LO-multilib/multilibsbowithcommandinreadme/README | 4 ++-- t/LO-readme/commandinreadme/README | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/t/11-git.t b/t/11-git.t index 73b7050..3f57f46 100755 --- a/t/11-git.t +++ b/t/11-git.t @@ -46,9 +46,9 @@ END if (defined $ENV{TRAVIS} and $ENV{TRAVIS} eq 'true') { capture_merged { system(<<"END"); }; -groupadd -g 200 test -useradd -u 200 -g 200 -d /tmp test -chown -R 200:200 $RealBin/gitrepo +groupadd -g 199 test +useradd -u 199 -g 199 -d /tmp test +chown -R 199:199 $RealBin/gitrepo END } @@ -64,8 +64,8 @@ SKIP: { my @fnames = glob "$RealBin/gitrepo/.git/objects/*/*"; my @stat = stat shift @fnames; - is ($stat[4], 200, "Correct owner uid for $RealBin/gitrepo"); - is ($stat[5], 200, "Correct owner gid for $RealBin/gitrepo"); + is ($stat[4], 199, "Correct owner uid for $RealBin/gitrepo"); + is ($stat[5], 199, "Correct owner gid for $RealBin/gitrepo"); } # make a conflict diff --git a/t/12-readme.t b/t/12-readme.t index eb472d2..d95c7cf 100755 --- a/t/12-readme.t +++ b/t/12-readme.t @@ -66,7 +66,7 @@ SKIP: { skip "Only run useradd/groupadd commands under Travis CI", 2 unless (defined $ENV{TRAVIS} and $ENV{TRAVIS} eq 'true'); skip "Only run useradd/groupadd commands if there is no test user/group", 2, if (defined getgrnam('test') or defined getpwnam('test')); - sboinstall 'commandinreadme', { input => "y\ny\ny", expected => qr{It looks like this slackbuild requires the following command\(s\) to be run first:.*groupadd -g 200 test.*useradd -u 200 -g 200 -d /tmp test.*Shall I run them prior to building.*}s }; + sboinstall 'commandinreadme', { input => "y\ny\ny", expected => qr{It looks like this slackbuild requires the following command\(s\) to be run first:.*groupadd -g 199 test.*useradd -u 199 -g 199 -d /tmp test.*Shall I run them prior to building.*}s }; sboremove 'commandinreadme', { input => "y\ny", test => 0 }; sboinstall 'commandinreadme', { input => "y\ny\ny", expected => qr/groupadd.*exited non-zero/ }; diff --git a/t/31-template.t b/t/31-template.t index 982c08f..dacb801 100755 --- a/t/31-template.t +++ b/t/31-template.t @@ -143,8 +143,8 @@ SKIP: { ], "commands" : { "commandinreadme" : [ - "groupadd -g 200 test", - "useradd -u 200 -g 200 -d /tmp test" + "groupadd -g 199 test", + "useradd -u 199 -g 199 -d /tmp test" ] }, "options" : { diff --git a/t/LO-multilib/multilibsbowithcommandinreadme/README b/t/LO-multilib/multilibsbowithcommandinreadme/README index 6e51784..db5d140 100644 --- a/t/LO-multilib/multilibsbowithcommandinreadme/README +++ b/t/LO-multilib/multilibsbowithcommandinreadme/README @@ -1,4 +1,4 @@ This doesn't exist! - groupadd -g 200 test - useradd -u 200 -g 200 -d /tmp test + groupadd -g 199 test + useradd -u 199 -g 199 -d /tmp test diff --git a/t/LO-readme/commandinreadme/README b/t/LO-readme/commandinreadme/README index 6e51784..db5d140 100644 --- a/t/LO-readme/commandinreadme/README +++ b/t/LO-readme/commandinreadme/README @@ -1,4 +1,4 @@ This doesn't exist! - groupadd -g 200 test - useradd -u 200 -g 200 -d /tmp test + groupadd -g 199 test + useradd -u 199 -g 199 -d /tmp test -- cgit v1.2.3