diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-04-17 15:54:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-17 15:54:10 +0200 |
| commit | 2cb36f7c1e4672df2b47bffab3b7d65216915992 (patch) | |
| tree | b4f0fa07c1cd3ffe34d7624efe27ad98eaa2da82 /src/test/test-cgroup-mask.c | |
| parent | 79a4beb39f16ae47213e42145bda2ea64bee9987 (diff) | |
| parent | 7e4a49b42b2f4fb3a621dc89a4a76e330a9aebe9 (diff) | |
| download | systemd-2cb36f7c1e4672df2b47bffab3b7d65216915992.tar.gz | |
Merge pull request #8575 from keszybz/non-absolute-paths
Do not require absolute paths in ExecStart and friends
Diffstat (limited to 'src/test/test-cgroup-mask.c')
| -rw-r--r-- | src/test/test-cgroup-mask.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c index 1e59bb02bb..90e2cc8edb 100644 --- a/src/test/test-cgroup-mask.c +++ b/src/test/test-cgroup-mask.c @@ -53,16 +53,11 @@ static int test_cgroup_mask(void) { assert_se(manager_startup(m, serial, fdset) >= 0); /* Load units and verify hierarchy. */ - assert_se(manager_load_unit(m, "parent.slice", NULL, NULL, &parent) >= 0); - assert_se(manager_load_unit(m, "son.service", NULL, NULL, &son) >= 0); - assert_se(manager_load_unit(m, "daughter.service", NULL, NULL, &daughter) >= 0); - assert_se(manager_load_unit(m, "grandchild.service", NULL, NULL, &grandchild) >= 0); - assert_se(manager_load_unit(m, "parent-deep.slice", NULL, NULL, &parent_deep) >= 0); - assert_se(parent->load_state == UNIT_LOADED); - assert_se(son->load_state == UNIT_LOADED); - assert_se(daughter->load_state == UNIT_LOADED); - assert_se(grandchild->load_state == UNIT_LOADED); - assert_se(parent_deep->load_state == UNIT_LOADED); + assert_se(manager_load_startable_unit_or_warn(m, "parent.slice", NULL, &parent) >= 0); + assert_se(manager_load_startable_unit_or_warn(m, "son.service", NULL, &son) >= 0); + assert_se(manager_load_startable_unit_or_warn(m, "daughter.service", NULL, &daughter) >= 0); + assert_se(manager_load_startable_unit_or_warn(m, "grandchild.service", NULL, &grandchild) >= 0); + assert_se(manager_load_startable_unit_or_warn(m, "parent-deep.slice", NULL, &parent_deep) >= 0); assert_se(UNIT_DEREF(son->slice) == parent); assert_se(UNIT_DEREF(daughter->slice) == parent); assert_se(UNIT_DEREF(parent_deep->slice) == parent); |