tests: add tests for lxc.cgroup.dir

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 730ea1d240bc6906b8301c39459d9be5c9398824..62337289e9b4a84e3aa117d507a270895e2ef673 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -4419,6 +4419,8 @@ int lxc_list_subkeys(struct lxc_conf *conf, const char *key, char *retv,
        if (!strcmp(key, "lxc.apparmor")) {
                strprint(retv, inlen, "allow_incomplete\n");
                strprint(retv, inlen, "profile\n");
+       } else if (!strcmp(key, "lxc.cgroup")) {
+               strprint(retv, inlen, "dir\n");
        } else if (!strcmp(key, "lxc.selinux")) {
                strprint(retv, inlen, "context\n");
        } else if (!strcmp(key, "lxc.mount")) {

diff --git a/src/tests/getkeys.c b/src/tests/getkeys.c
index 6055d917922c2f11fab92d4fafee39ff136163d8..f5923921c8d55c9afe478b5cacd194d0b861277d 100644 (file)
--- a/src/tests/getkeys.c
+++ b/src/tests/getkeys.c
@@ -163,6 +163,14 @@ int main(int argc, char *argv[])
        }
        printf("get_keys returned %d\n%s", ret, v3);
 
+       ret = c->get_keys(c, "lxc.cgroup", v3, 2000);
+       if (ret < 0) {
+               fprintf(stderr, "%d: failed to get keys(%d)\n", __LINE__, ret);
+               ret = 1;
+               goto out;
+       }
+       printf("get_keys returned %d\n%s", ret, v3);
+
        ret = 0;
 
 out:

diff --git a/src/tests/parse_config_file.c b/src/tests/parse_config_file.c
index 79fc2d5ca028ff97ff9aaf39e59ef76e1c1a0bd8..ef03b928587751210949b93a227c0b18f2e35054 100644 (file)
--- a/src/tests/parse_config_file.c
+++ b/src/tests/parse_config_file.c
@@ -1031,6 +1031,12 @@ int main(int argc, char *argv[])
                goto non_test_error;
        }
 
+       if (set_get_compare_clear_save_load(c, "lxc.cgroup.dir", "lxd", tmpf,
+                                           true)) {
+               lxc_error("%s\n", "lxc.cgroup.dir");
+               goto non_test_error;
+       }
+
        if (set_and_clear_complete_netdev(c) < 0) {
                lxc_error("%s\n", "failed to clear whole network");
                goto non_test_error;