File 0022-TEST-21-SYSUSERS-adapt-for-SUSE-openQA.patch of Package systemd-v244-testsuite

From 7f47916f00ed9659d543722619a26c2e56d49081 Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Thu, 19 Dec 2019 09:05:08 +0100
Subject: [PATCH 22/24] TEST-21-SYSUSERS: adapt for SUSE openQA

---
 test/TEST-21-SYSUSERS/test-2.expected-group  | 6 +++---
 test/TEST-21-SYSUSERS/test-2.expected-passwd | 6 +++---
 test/TEST-21-SYSUSERS/test-2.input           | 6 +++---
 test/TEST-21-SYSUSERS/test.sh                | 6 +++++-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/test/TEST-21-SYSUSERS/test-2.expected-group b/test/TEST-21-SYSUSERS/test-2.expected-group
index 8fcc03f4e9..e35df54933 100644
--- a/test/TEST-21-SYSUSERS/test-2.expected-group
+++ b/test/TEST-21-SYSUSERS/test-2.expected-group
@@ -1,4 +1,4 @@
 u1:x:SYSTEM_UID_MAX:
-u2:x:777:
-u3:x:778:
-u4:x:779:
+u2:x:477:
+u3:x:478:
+u4:x:479:
diff --git a/test/TEST-21-SYSUSERS/test-2.expected-passwd b/test/TEST-21-SYSUSERS/test-2.expected-passwd
index af8068813b..00ec78e8ae 100644
--- a/test/TEST-21-SYSUSERS/test-2.expected-passwd
+++ b/test/TEST-21-SYSUSERS/test-2.expected-passwd
@@ -1,4 +1,4 @@
 u1:x:SYSTEM_UID_MAX:SYSTEM_UID_MAX:some gecos:/random/dir:NOLOGIN
-u2:x:777:777:some gecos:/random/dir:/bin/zsh
-u3:x:778:778::/random/dir2:/bin/bash
-u4:x:779:779::/:/bin/csh
+u2:x:477:477:some gecos:/random/dir:/bin/zsh
+u3:x:478:478::/random/dir2:/bin/bash
+u4:x:479:479::/:/bin/csh
diff --git a/test/TEST-21-SYSUSERS/test-2.input b/test/TEST-21-SYSUSERS/test-2.input
index cedea9e401..45ac842fa7 100644
--- a/test/TEST-21-SYSUSERS/test-2.input
+++ b/test/TEST-21-SYSUSERS/test-2.input
@@ -3,6 +3,6 @@
 #
 #Type Name ID  GECOS        homedir      shell
 u     u1   -   "some gecos" /random/dir  -
-u     u2   777 "some gecos" /random/dir  /bin/zsh
-u     u3   778 -            /random/dir2 /bin/bash
-u     u4   779 -            -            /bin/csh
+u     u2   477 "some gecos" /random/dir  /bin/zsh
+u     u3   478 -            /random/dir2 /bin/bash
+u     u4   479 -            -            /bin/csh
diff --git a/test/TEST-21-SYSUSERS/test.sh b/test/TEST-21-SYSUSERS/test.sh
index a1a2e62ab1..1b88cae741 100755
--- a/test/TEST-21-SYSUSERS/test.sh
+++ b/test/TEST-21-SYSUSERS/test.sh
@@ -2,6 +2,7 @@
 set -e
 TEST_DESCRIPTION="Sysuser-related tests"
 
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
 . $TEST_BASE_DIR/test-functions
 
 test_setup() {
@@ -22,7 +23,7 @@ preprocess() {
     # see meson.build how to extract this. gcc -E was used before to
     # get this value from config.h, however the autopkgtest fails with
     # it
-    SYSTEM_UID_MAX=$(awk 'BEGIN { uid=999 } /^\s*SYS_UID_MAX\s+/ { uid=$2 } END { print uid }' /etc/login.defs)
+    SYSTEM_UID_MAX=$(awk 'BEGIN { uid=999 } /^\s*SYS_UID_MAX\s+/ { uid=$2 } END { print uid }' /usr/etc/login.defs)
 
     # we can't rely on config.h to get the nologin path, as autopkgtest
     # uses pre-compiled binaries, so extract it from the systemd-sysusers
@@ -121,6 +122,9 @@ test_run() {
             exit 1
         fi
     done
+
+    systemctl --state=failed --no-pager > /failed
+    echo SUSEtest OK > /testok
 }
 
 do_test "$@"
-- 
2.16.4