]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: lets add more tests to cover SupplementaryGroups= cases. 4469/head
authorDjalal Harouni <tixxdz@opendz.org>
Mon, 24 Oct 2016 10:38:53 +0000 (12:38 +0200)
committerDjalal Harouni <tixxdz@opendz.org>
Mon, 24 Oct 2016 10:38:53 +0000 (12:38 +0200)
Makefile.am
src/test/test-execute.c
test/test-execute/exec-supplementarygroups-multiple-groups-default-group-user.service [new file with mode: 0644]
test/test-execute/exec-supplementarygroups-multiple-groups-withgid.service [new file with mode: 0644]
test/test-execute/exec-supplementarygroups-multiple-groups-withuid.service [new file with mode: 0644]

index 04e1b71e9e177d039537c34d11811b4a3f663174..18a5f4a82ad9563470caf00b060c6e00ddbe5173 100644 (file)
@@ -1630,6 +1630,9 @@ EXTRA_DIST += \
        test/test-execute/exec-supplementarygroups.service \
        test/test-execute/exec-supplementarygroups-single-group.service \
        test/test-execute/exec-supplementarygroups-single-group-user.service \
+       test/test-execute/exec-supplementarygroups-multiple-groups-default-group-user.service \
+       test/test-execute/exec-supplementarygroups-multiple-groups-withgid.service \
+       test/test-execute/exec-supplementarygroups-multiple-groups-withuid.service \
        test/test-execute/exec-ignoresigpipe-no.service \
        test/test-execute/exec-ignoresigpipe-yes.service \
        test/test-execute/exec-personality-x86-64.service \
index 1254ef8a05422a29b00d4c8cefb99e802be9a392..404421a2b864c9c8b8354b735b000e972afb6096 100644 (file)
@@ -222,6 +222,9 @@ static void test_exec_supplementary_groups(Manager *m) {
         test(m, "exec-supplementarygroups.service", 0, CLD_EXITED);
         test(m, "exec-supplementarygroups-single-group.service", 0, CLD_EXITED);
         test(m, "exec-supplementarygroups-single-group-user.service", 0, CLD_EXITED);
+        test(m, "exec-supplementarygroups-multiple-groups-default-group-user.service", 0, CLD_EXITED);
+        test(m, "exec-supplementarygroups-multiple-groups-withgid.service", 0, CLD_EXITED);
+        test(m, "exec-supplementarygroups-multiple-groups-withuid.service", 0, CLD_EXITED);
 }
 
 static void test_exec_environment(Manager *m) {
diff --git a/test/test-execute/exec-supplementarygroups-multiple-groups-default-group-user.service b/test/test-execute/exec-supplementarygroups-multiple-groups-default-group-user.service
new file mode 100644 (file)
index 0000000..a49c9d2
--- /dev/null
@@ -0,0 +1,7 @@
+[Unit]
+Description=Test for Supplementary Group with multiple groups without Group and User
+
+[Service]
+ExecStart=/bin/sh -x -c 'test "$$(id -G)" = "0 1 2 3" && test "$$(id -g)" = "0" && test "$$(id -u)" = "0"'
+Type=oneshot
+SupplementaryGroups=1 2 3
diff --git a/test/test-execute/exec-supplementarygroups-multiple-groups-withgid.service b/test/test-execute/exec-supplementarygroups-multiple-groups-withgid.service
new file mode 100644 (file)
index 0000000..5c62c1d
--- /dev/null
@@ -0,0 +1,8 @@
+[Unit]
+Description=Test for Supplementary Group with multiple groups and Group=1
+
+[Service]
+ExecStart=/bin/sh -x -c 'test "$$(id -G)" = "1 2 3" && test "$$(id -g)" = "1" && test "$$(id -u)" = "0"'
+Type=oneshot
+Group=1
+SupplementaryGroups=1 2 3
diff --git a/test/test-execute/exec-supplementarygroups-multiple-groups-withuid.service b/test/test-execute/exec-supplementarygroups-multiple-groups-withuid.service
new file mode 100644 (file)
index 0000000..00523e3
--- /dev/null
@@ -0,0 +1,8 @@
+[Unit]
+Description=Test for Supplementary Group with multiple groups and Uid=1
+
+[Service]
+ExecStart=/bin/sh -x -c 'test "$$(id -G)" = "1 2 3" && test "$$(id -g)" = "1" && test "$$(id -u)" = "1"'
+Type=oneshot
+User=1
+SupplementaryGroups=1 2 3