summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-02-16 10:17:46 +0100
committerSven Eden <yamakuzure@gmx.net>2018-05-30 07:58:59 +0200
commited5faeef2ccf4bc8343ec96c6115add96ded195c (patch)
tree6961612c600595841b15e066991c309775df5213 /src/test
parent39154d61478a7440b1527f02afeff5b6ffb541ce (diff)
pid1: do not initialize join_controllers by default
We're moving towards unified cgroup hierarchy where this is not necessary. This makes main.c a bit simpler.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test-conf-parser.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
index fc6847954..30ca7a8e7 100644
--- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c
@@ -260,7 +260,9 @@ static void test_config_parse_join_controllers(void) {
/* Test special case of no mounted controllers */
r = config_parse_join_controllers(NULL, "example.conf", 12, "Section", 10, "JoinControllers", 0, "", &c, NULL);
assert_se(r == 0);
- assert_se(c == NULL);
+ assert_se(c);
+ assert_se(strv_equal(c[0], STRV_MAKE_EMPTY));
+ assert_se(c[1] == NULL);
/* Test merging of overlapping lists */
r = config_parse_join_controllers(NULL, "example.conf", 13, "Section", 10, "JoinControllers", 0, "a,b b,c", &c, NULL);