From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 3 Mar 2018 13:15:36 +0000 (+0900)
Subject: test-execute: rename tests for AmbientCapabilities=
X-Git-Tag: v238~2^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6dc25eebc1a0061fe62eca206b57ef21b33c154;p=thirdparty%2Fsystemd.git

test-execute: rename tests for AmbientCapabilities=

The unit files for test-execute are named like
`exec-(setting-name-in-lower-character)-(optional-text).service`.
However, test units for AmbientCapabilities= are not following this.
So, let's rename them for the consistency.
This does not change anything in the functionality of the test.
---

diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index d910471d1fe..592b8d4be04 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -538,7 +538,7 @@ static void test_exec_capabilityboundingset(Manager *m) {
         test(m, "exec-capabilityboundingset-invert.service", 0, CLD_EXITED);
 }
 
-static void test_exec_capabilityambientset(Manager *m) {
+static void test_exec_ambientcapabilities(Manager *m) {
         int r;
 
         /* Check if the kernel has support for ambient capabilities. Run
@@ -551,8 +551,8 @@ static void test_exec_capabilityambientset(Manager *m) {
                 return;
         }
 
-        test(m, "exec-capabilityambientset.service", 0, CLD_EXITED);
-        test(m, "exec-capabilityambientset-merge.service", 0, CLD_EXITED);
+        test(m, "exec-ambientcapabilities.service", 0, CLD_EXITED);
+        test(m, "exec-ambientcapabilities-merge.service", 0, CLD_EXITED);
 
         if (!check_nobody_user_and_group()) {
                 log_error_errno(errno, "nobody user/group is not synthesized or may conflict to other entries, skipping remaining tests in %s", __func__);
@@ -564,8 +564,8 @@ static void test_exec_capabilityambientset(Manager *m) {
                 return;
         }
 
-        test(m, "exec-capabilityambientset-" NOBODY_USER_NAME ".service", 0, CLD_EXITED);
-        test(m, "exec-capabilityambientset-merge-" NOBODY_USER_NAME ".service", 0, CLD_EXITED);
+        test(m, "exec-ambientcapabilities-" NOBODY_USER_NAME ".service", 0, CLD_EXITED);
+        test(m, "exec-ambientcapabilities-merge-" NOBODY_USER_NAME ".service", 0, CLD_EXITED);
 }
 
 static void test_exec_privatenetwork(Manager *m) {
@@ -633,8 +633,8 @@ static int run_tests(UnitFileScope scope, const test_function_t *tests) {
 int main(int argc, char *argv[]) {
         _cleanup_(rm_rf_physical_and_freep) char *runtime_dir = NULL;
         static const test_function_t user_tests[] = {
+                test_exec_ambientcapabilities,
                 test_exec_bindpaths,
-                test_exec_capabilityambientset,
                 test_exec_capabilityboundingset,
                 test_exec_cpuaffinity,
                 test_exec_environment,
diff --git a/test/meson.build b/test/meson.build
index ac6a70d38d8..f86cf388e07 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -45,13 +45,13 @@ test_data_files = '''
         sockets.target
         son.service
         sysinit.target
+        test-execute/exec-ambientcapabilities-merge-nfsnobody.service
+        test-execute/exec-ambientcapabilities-merge-nobody.service
+        test-execute/exec-ambientcapabilities-merge.service
+        test-execute/exec-ambientcapabilities-nfsnobody.service
+        test-execute/exec-ambientcapabilities-nobody.service
+        test-execute/exec-ambientcapabilities.service
         test-execute/exec-bindpaths.service
-        test-execute/exec-capabilityambientset-merge-nfsnobody.service
-        test-execute/exec-capabilityambientset-merge-nobody.service
-        test-execute/exec-capabilityambientset-merge.service
-        test-execute/exec-capabilityambientset-nfsnobody.service
-        test-execute/exec-capabilityambientset-nobody.service
-        test-execute/exec-capabilityambientset.service
         test-execute/exec-capabilityboundingset-invert.service
         test-execute/exec-capabilityboundingset-merge.service
         test-execute/exec-capabilityboundingset-reset.service
diff --git a/test/test-execute/exec-capabilityambientset-merge-nfsnobody.service b/test/test-execute/exec-ambientcapabilities-merge-nfsnobody.service
similarity index 100%
rename from test/test-execute/exec-capabilityambientset-merge-nfsnobody.service
rename to test/test-execute/exec-ambientcapabilities-merge-nfsnobody.service
diff --git a/test/test-execute/exec-capabilityambientset-merge-nobody.service b/test/test-execute/exec-ambientcapabilities-merge-nobody.service
similarity index 100%
rename from test/test-execute/exec-capabilityambientset-merge-nobody.service
rename to test/test-execute/exec-ambientcapabilities-merge-nobody.service
diff --git a/test/test-execute/exec-capabilityambientset-merge.service b/test/test-execute/exec-ambientcapabilities-merge.service
similarity index 100%
rename from test/test-execute/exec-capabilityambientset-merge.service
rename to test/test-execute/exec-ambientcapabilities-merge.service
diff --git a/test/test-execute/exec-capabilityambientset-nfsnobody.service b/test/test-execute/exec-ambientcapabilities-nfsnobody.service
similarity index 100%
rename from test/test-execute/exec-capabilityambientset-nfsnobody.service
rename to test/test-execute/exec-ambientcapabilities-nfsnobody.service
diff --git a/test/test-execute/exec-capabilityambientset-nobody.service b/test/test-execute/exec-ambientcapabilities-nobody.service
similarity index 100%
rename from test/test-execute/exec-capabilityambientset-nobody.service
rename to test/test-execute/exec-ambientcapabilities-nobody.service
diff --git a/test/test-execute/exec-capabilityambientset.service b/test/test-execute/exec-ambientcapabilities.service
similarity index 100%
rename from test/test-execute/exec-capabilityambientset.service
rename to test/test-execute/exec-ambientcapabilities.service