From 7a18854fe735ddccc1de2a53e531f306491e6567 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 11 Nov 2017 21:41:05 +0900 Subject: [PATCH] test-execute: update test for SystemCallErrorNumber= --- src/test/test-execute.c | 6 ++++-- test/meson.build | 3 ++- ...er.service => exec-systemcallerrornumber-name.service} | 2 +- .../exec-systemcallerrornumber-number.service | 8 ++++++++ 4 files changed, 15 insertions(+), 4 deletions(-) rename test/test-execute/{exec-systemcallerrornumber.service => exec-systemcallerrornumber-name.service} (57%) create mode 100644 test/test-execute/exec-systemcallerrornumber-number.service diff --git a/src/test/test-execute.c b/src/test/test-execute.c index c86e074e9d4..998724189f7 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -270,8 +270,10 @@ static void test_exec_systemcallfilter(Manager *m) { static void test_exec_systemcallerrornumber(Manager *m) { #if HAVE_SECCOMP - if (is_seccomp_available()) - test(m, "exec-systemcallerrornumber.service", 1, CLD_EXITED); + if (!is_seccomp_available()) + return; + test(m, "exec-systemcallerrornumber-name.service", errno_from_name("EACCES"), CLD_EXITED); + test(m, "exec-systemcallerrornumber-number.service", 255, CLD_EXITED); #endif } diff --git a/test/meson.build b/test/meson.build index 941878dea4f..69d6c758b0a 100644 --- a/test/meson.build +++ b/test/meson.build @@ -100,7 +100,8 @@ test_data_files = ''' test-execute/exec-supplementarygroups-single-group-user.service test-execute/exec-supplementarygroups-single-group.service test-execute/exec-supplementarygroups.service - test-execute/exec-systemcallerrornumber.service + test-execute/exec-systemcallerrornumber-name.service + test-execute/exec-systemcallerrornumber-number.service test-execute/exec-systemcallfilter-failing.service test-execute/exec-systemcallfilter-failing2.service test-execute/exec-systemcallfilter-not-failing.service diff --git a/test/test-execute/exec-systemcallerrornumber.service b/test/test-execute/exec-systemcallerrornumber-name.service similarity index 57% rename from test/test-execute/exec-systemcallerrornumber.service rename to test/test-execute/exec-systemcallerrornumber-name.service index ff7da3c1a49..229b862794d 100644 --- a/test/test-execute/exec-systemcallerrornumber.service +++ b/test/test-execute/exec-systemcallerrornumber-name.service @@ -2,7 +2,7 @@ Description=Test for SystemCallErrorNumber [Service] -ExecStart=/bin/sh -x -c 'uname -a' +ExecStart=/bin/python3 -c 'import os\ntry: os.uname()\nexcept Exception as e: exit(e.errno)' Type=oneshot SystemCallFilter=~uname SystemCallErrorNumber=EACCES diff --git a/test/test-execute/exec-systemcallerrornumber-number.service b/test/test-execute/exec-systemcallerrornumber-number.service new file mode 100644 index 00000000000..2e13f08bf5a --- /dev/null +++ b/test/test-execute/exec-systemcallerrornumber-number.service @@ -0,0 +1,8 @@ +[Unit] +Description=Test for SystemCallErrorNumber + +[Service] +ExecStart=/bin/python3 -c 'import os\ntry: os.uname()\nexcept Exception as e: exit(e.errno)' +Type=oneshot +SystemCallFilter=~uname +SystemCallErrorNumber=255