summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorAdrian Szyndela <adrian.s@samsung.com>2020-06-12 15:06:54 +0200
committerHyotaek Shim <hyotaek.shim@samsung.com>2020-06-17 08:38:44 +0000
commit3739c25dc9e61f45fc538a4ebc2f38a38cedcc0d (patch)
tree63d74820e7e3f2138036cdede2b9cb1ae2ad58b8 /src/test
parent08178b2bddf3b2e03eee907414155f4217fa6191 (diff)
downloadsystemd-3739c25dc9e61f45fc538a4ebc2f38a38cedcc0d.tar.gz
systemd-3739c25dc9e61f45fc538a4ebc2f38a38cedcc0d.tar.bz2
systemd-3739c25dc9e61f45fc538a4ebc2f38a38cedcc0d.zip
Revert "test: add test for prefix unit loading"submit/tizen/20200617.084905
This reverts commit 7ce49e656b1377713ade999dfe381807a78313cd. The previous revert (6927aa2bc09726ff1f071770a8ce0c2ea6430b6b) reverts more than it is described within its description. As it is a base for some of subsequent commits in the upstream, they are silently removed, probably because of conflict resolving. Prefix unit loading is a feature that is a victim of such silent removal. Therefore, the feature test is also (temporarily, I hope) removed with this commit. Change-Id: Ie82e5a54852ea08c8b3f0561f304fab6f3434aaf
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test-engine.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/test/test-engine.c b/src/test/test-engine.c
index b8351141fe..9159abf23d 100644
--- a/src/test/test-engine.c
+++ b/src/test/test-engine.c
@@ -15,7 +15,7 @@ int main(int argc, char *argv[]) {
_cleanup_(sd_bus_error_free) sd_bus_error err = SD_BUS_ERROR_NULL;
_cleanup_(manager_freep) Manager *m = NULL;
Unit *a = NULL, *b = NULL, *c = NULL, *d = NULL, *e = NULL, *g = NULL,
- *h = NULL, *i = NULL, *a_conj = NULL, *unit_with_multiple_dashes = NULL;
+ *h = NULL, *i = NULL, *a_conj = NULL;
Job *j;
int r;
@@ -146,10 +146,5 @@ int main(int argc, char *argv[]) {
assert_se(!hashmap_get(a->dependencies[UNIT_PROPAGATES_RELOAD_TO], c));
assert_se(!hashmap_get(c->dependencies[UNIT_RELOAD_PROPAGATED_FROM], a));
- assert_se(manager_load_unit(m, "unit-with-multiple-dashes.service", NULL, NULL, &unit_with_multiple_dashes) >= 0);
-
- assert_se(strv_equal(unit_with_multiple_dashes->documentation, STRV_MAKE("man:test", "man:override2", "man:override3")));
- assert_se(streq_ptr(unit_with_multiple_dashes->description, "override4"));
-
return 0;
}