summaryrefslogtreecommitdiff
path: root/src/test/test-unit-name.c
diff options
context:
space:
mode:
authorAnita Zhang <the.anitazha@gmail.com>2019-11-04 18:29:55 -0800
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-11-07 08:34:53 +0100
commit3e1db806b0c18fd6138886ce67fac2655f09caef (patch)
tree0591ac7ab4d6261cb2690fe8b4aa17333442180d /src/test/test-unit-name.c
parent8069017a0f5845ea3e6987e29f98546cdd34b24e (diff)
downloadsystemd-3e1db806b0c18fd6138886ce67fac2655f09caef.tar.gz
core: change top-level drop-in from -.service.d to service.d
Discussed in #13743, the -.service semantic conflicts with the existing root mount and slice names, making this feature not uniformly extensible to all types. Change the name to be <type>.d instead. Updating to this format also extends the top-level dropin to unit types.
Diffstat (limited to 'src/test/test-unit-name.c')
-rw-r--r--src/test/test-unit-name.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index c65f6ffe08..c9bbce0d2e 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -353,24 +353,6 @@ static void test_unit_name_build(void) {
free(t);
}
-static void test_service_unit_name_is_valid(void) {
- assert_se(service_unit_name_is_valid("foo.service"));
- assert_se(service_unit_name_is_valid("foo@bar.service"));
- assert_se(service_unit_name_is_valid("foo@bar@bar.service"));
- assert_se(service_unit_name_is_valid("--.service"));
- assert_se(service_unit_name_is_valid(".-.service"));
- assert_se(service_unit_name_is_valid("-foo-bar.service"));
- assert_se(service_unit_name_is_valid("-foo-bar-.service"));
- assert_se(service_unit_name_is_valid("foo-bar-.service"));
-
- assert_se(!service_unit_name_is_valid("-.service"));
- assert_se(!service_unit_name_is_valid(""));
- assert_se(!service_unit_name_is_valid("foo.slice"));
- assert_se(!service_unit_name_is_valid("@.service"));
- assert_se(!service_unit_name_is_valid("@bar.service"));
- assert_se(!service_unit_name_is_valid("-@.service"));
-}
-
static void test_slice_name_is_valid(void) {
assert_se( slice_name_is_valid(SPECIAL_ROOT_SLICE));
assert_se( slice_name_is_valid("foo.slice"));
@@ -856,7 +838,6 @@ int main(int argc, char* argv[]) {
test_unit_prefix_is_valid();
test_unit_name_change_suffix();
test_unit_name_build();
- test_service_unit_name_is_valid();
test_slice_name_is_valid();
test_build_subslice();
test_build_parent_slice();