diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-07 19:49:47 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-07 19:49:55 -0500 |
| commit | 2cb2eba61b1f709164f96b5dbbd268c28d2cafb6 (patch) | |
| tree | e06e4a8bbb52a9a2a1f0586d6e83505a4b39c228 /src/test/test-install-root.c | |
| parent | 0698b674920aa8a56dbd6a625729a35e5ae9c5df (diff) | |
Revert "fix handling of templates instantiated in /usr/lib (#5263)"
This reverts commit 0698b674920aa8a56dbd6a625729a35e5ae9c5df.
It was supposed to be merged, not squashed.
Diffstat (limited to 'src/test/test-install-root.c')
| -rw-r--r-- | src/test/test-install-root.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c index 575401cb91..d0bc8004f3 100644 --- a/src/test/test-install-root.c +++ b/src/test/test-install-root.c @@ -736,28 +736,6 @@ static void test_preset_order(const char *root) { assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, root, "prefix-2.service", &state) >= 0 && state == UNIT_FILE_DISABLED); } -static void test_static_instance(const char *root) { - UnitFileState state; - const char *p; - - assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, root, "static-instance@.service", &state) == -ENOENT); - assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, root, "static-instance@foo.service", &state) == -ENOENT); - - p = strjoina(root, "/usr/lib/systemd/system/static-instance@.service"); - assert_se(write_string_file(p, - "[Install]\n" - "WantedBy=multi-user.target\n", WRITE_STRING_FILE_CREATE) >= 0); - - assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, root, "static-instance@.service", &state) >= 0 && state == UNIT_FILE_DISABLED); - assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, root, "static-instance@foo.service", &state) >= 0 && state == UNIT_FILE_DISABLED); - - p = strjoina(root, "/usr/lib/systemd/system/static-instance@foo.service"); - assert_se(symlink("static-instance@.service", p) >= 0); - - assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, root, "static-instance@.service", &state) >= 0 && state == UNIT_FILE_DISABLED); - assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, root, "static-instance@foo.service", &state) >= 0 && state == UNIT_FILE_STATIC); -} - int main(int argc, char *argv[]) { char root[] = "/tmp/rootXXXXXX"; const char *p; @@ -788,7 +766,6 @@ int main(int argc, char *argv[]) { test_preset_and_list(root); test_preset_order(root); test_revert(root); - test_static_instance(root); assert_se(rm_rf(root, REMOVE_ROOT|REMOVE_PHYSICAL) >= 0); |