sbotools2

commit 2ae090fba0cb30f95ba406b62e5da150577bd538
parent 0dcba316a80cb8b4283965c2dee217e9c6955fc1
Author: Andreas Guldstrand <andreas.guldstrand@gmail.com>
Date:   Mon,  6 Feb 2017 12:24:28 +0100

t/ useradd/groupadd in README change from 200 to 199 to not conflict with possible postfix install

Diffstat:
M
t/11-git.t
 | 
10
+++++-----
M
t/12-readme.t
 | 
2
+-
M
t/31-template.t
 | 
4
++--
M
t/LO-multilib/multilibsbowithcommandinreadme/README
 | 
4
++--
M
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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