tests: fix get_item tests

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>

diff --git a/src/tests/get_item.c b/src/tests/get_item.c
index 9a9ae599055199afc7072a50ee276e719167c609..9750f312383e2a010187b25232ef914eb1e1d771 100644 (file)
--- a/src/tests/get_item.c
+++ b/src/tests/get_item.c
@@ -32,25 +32,22 @@
 
 int main(int argc, char *argv[])
 {
+       int ret = EXIT_FAILURE;
        struct lxc_container *c;
-       int ret;
        char v1[2], v2[256], v3[2048];
 
        if ((c = lxc_container_new("testxyz", NULL)) == NULL) {
                fprintf(stderr, "%d: error opening lxc_container %s\n", __LINE__, MYNAME);
-               ret = 1;
-               goto out;
+               exit(EXIT_FAILURE);
        }
 
        if (!c->set_config_item(c, "lxc.hook.pre-start", "hi there")) {
                fprintf(stderr, "%d: failed to set hook.pre-start\n", __LINE__);
-               ret = 1;
                goto out;
        }
        ret = c->get_config_item(c, "lxc.hook.pre-start", v2, 255);
        if (ret < 0) {
                fprintf(stderr, "%d: get_config_item(lxc.hook.pre-start) returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        fprintf(stderr, "lxc.hook.pre-start returned %d %s\n", ret, v2);
@@ -58,58 +55,49 @@ int main(int argc, char *argv[])
        ret = c->get_config_item(c, "lxc.network", v2, 255);
        if (ret < 0) {
                fprintf(stderr, "%d: get_config_item returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        fprintf(stderr, "%d: get_config_item(lxc.network) returned %d %s\n", __LINE__, ret, v2);
        if (!c->set_config_item(c, "lxc.tty", "4")) {
                fprintf(stderr, "%d: failed to set tty\n", __LINE__);
-               ret = 1;
                goto out;
        }
        ret = c->get_config_item(c, "lxc.tty", v2, 255);
        if (ret < 0) {
                fprintf(stderr, "%d: get_config_item(lxc.tty) returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        fprintf(stderr, "lxc.tty returned %d %s\n", ret, v2);
 
        if (!c->set_config_item(c, "lxc.arch", "x86")) {
                fprintf(stderr, "%d: failed to set arch\n", __LINE__);
-               ret = 1;
                goto out;
        }
        ret = c->get_config_item(c, "lxc.arch", v2, 255);
        if (ret < 0) {
                fprintf(stderr, "%d: get_config_item(lxc.arch) returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        printf("lxc.arch returned %d %s\n", ret, v2);
 
        if (!c->set_config_item(c, "lxc.init_uid", "100")) {
                fprintf(stderr, "%d: failed to set init_uid\n", __LINE__);
-               ret = 1;
                goto out;
        }
        ret = c->get_config_item(c, "lxc.init_uid", v2, 255);
        if (ret < 0) {
                fprintf(stderr, "%d: get_config_item(lxc.init_uid) returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        printf("lxc.init_uid returned %d %s\n", ret, v2);
 
        if (!c->set_config_item(c, "lxc.init_gid", "100")) {
                fprintf(stderr, "%d: failed to set init_gid\n", __LINE__);
-               ret = 1;
                goto out;
        }
        ret = c->get_config_item(c, "lxc.init_gid", v2, 255);
        if (ret < 0) {
                fprintf(stderr, "%d: get_config_item(lxc.init_gid) returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        printf("lxc.init_gid returned %d %s\n", ret, v2);
@@ -119,7 +107,6 @@ int main(int argc, char *argv[])
        char *alloced;
        if (!c->set_config_item(c, "lxc.utsname", HNAME)) {
                fprintf(stderr, "%d: failed to set utsname\n", __LINE__);
-               ret = 1;
                goto out;
        }
 
@@ -127,7 +114,6 @@ int main(int argc, char *argv[])
        len = c->get_config_item(c, "lxc.utsname", NULL, 0);  // query the size of the string
        if (len < 0) {
                fprintf(stderr, "%d: get_config_item(lxc.utsname) returned %d\n", __LINE__, len);
-               ret = 1;
                goto out;
        }
        printf("lxc.utsname returned %d\n", len);
@@ -136,7 +122,6 @@ int main(int argc, char *argv[])
        alloced = malloc(len+1);
        if (!alloced) {
                fprintf(stderr, "%d: failed to allocate %d bytes for utsname\n", __LINE__, len);
-               ret = 1;
                goto out;
        }
        // now pass in the malloc'd array, and pass in length of string + 1: again
@@ -144,12 +129,10 @@ int main(int argc, char *argv[])
        ret = c->get_config_item(c, "lxc.utsname", alloced, len+1);
        if (ret < 0) {
                fprintf(stderr, "%d: get_config_item(lxc.utsname) returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        if (strcmp(alloced, HNAME) != 0 || ret != len) {
                fprintf(stderr, "lxc.utsname returned wrong value: %d %s not %d %s\n", ret, alloced, len, HNAME);
-               ret = 1;
                goto out;
        }
        printf("lxc.utsname returned %d %s\n", len, alloced);
@@ -157,26 +140,22 @@ int main(int argc, char *argv[])
 
        if (!c->set_config_item(c, "lxc.mount.entry", "hi there")) {
                fprintf(stderr, "%d: failed to set mount.entry\n", __LINE__);
-               ret = 1;
                goto out;
        }
        ret = c->get_config_item(c, "lxc.mount.entry", v2, 255);
        if (ret < 0) {
                fprintf(stderr, "%d: get_config_item(lxc.mount.entry) returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        printf("lxc.mount.entry returned %d %s\n", ret, v2);
 
        if (!c->set_config_item(c, "lxc.aa_profile", "unconfined")) {
                fprintf(stderr, "%d: failed to set aa_profile\n", __LINE__);
-               ret = 1;
                goto out;
        }
        ret = c->get_config_item(c, "lxc.aa_profile", v2, 255);
        if (ret < 0) {
                fprintf(stderr, "%d: get_config_item(lxc.aa_profile) returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        printf("lxc.aa_profile returned %d %s\n", ret, v2);
@@ -186,7 +165,6 @@ int main(int argc, char *argv[])
        // new test with real container
        if ((c = lxc_container_new(MYNAME, NULL)) == NULL) {
                fprintf(stderr, "%d: error opening lxc_container %s\n", __LINE__, MYNAME);
-               ret = 1;
                goto out;
        }
        c->destroy(c);
@@ -194,130 +172,109 @@ int main(int argc, char *argv[])
 
        if ((c = lxc_container_new(MYNAME, NULL)) == NULL) {
                fprintf(stderr, "%d: error opening lxc_container %s\n", __LINE__, MYNAME);
-               ret = 1;
                goto out;
        }
        if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
                fprintf(stderr, "%d: failed to create a trusty container\n", __LINE__);
-               ret = 1;
                goto out;
        }
-
        lxc_container_put(c);
 
        /* XXX TODO load_config needs to clear out any old config first */
        if ((c = lxc_container_new(MYNAME, NULL)) == NULL) {
                fprintf(stderr, "%d: error opening lxc_container %s\n", __LINE__, MYNAME);
-               ret = 1;
                goto out;
        }
 
        ret = c->get_config_item(c, "lxc.cap.drop", NULL, 300);
        if (ret < 5 || ret > 255) {
                fprintf(stderr, "%d: get_config_item(lxc.cap.drop) with NULL returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        ret = c->get_config_item(c, "lxc.cap.drop", v1, 1);
        if (ret < 5 || ret > 255) {
                fprintf(stderr, "%d: get_config_item(lxc.cap.drop) returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        ret = c->get_config_item(c, "lxc.cap.drop", v2, 255);
        if (ret < 0) {
                fprintf(stderr, "%d: get_config_item(lxc.cap.drop) returned %d %s\n", __LINE__, ret, v2);
-               ret = 1;
                goto out;
        }
        printf("%d: get_config_item(lxc.cap.drop) returned %d %s\n", __LINE__, ret, v2);
        ret = c->get_config_item(c, "lxc.network", v2, 255);
        if (ret < 0) {
                fprintf(stderr, "%d: get_config_item returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        printf("%d: get_config_item(lxc.network) returned %d %s\n", __LINE__, ret, v2);
 
        if (!c->set_config_item(c, "lxc.network.ipv4", "10.2.3.4")) {
                fprintf(stderr, "%d: failed to set ipv4\n", __LINE__);
-               ret = 1;
                goto out;
        }
 
        ret = c->get_config_item(c, "lxc.network.0.ipv4", v2, 255);
        if (ret <= 0) {
                fprintf(stderr, "%d: lxc.network.0.ipv4 returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        if (!c->clear_config_item(c, "lxc.network.0.ipv4")) {
                fprintf(stderr, "%d: failed clearing all ipv4 entries\n", __LINE__);
-               ret = 1;
                goto out;
        }
        ret = c->get_config_item(c, "lxc.network.0.ipv4", v2, 255);
        if (ret != 0) {
                fprintf(stderr, "%d: after clearing ipv4 entries get_item(lxc.network.0.ipv4 returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
 
        if (!c->set_config_item(c, "lxc.network.ipv4.gateway", "10.2.3.254")) {
                fprintf(stderr, "%d: failed to set ipv4.gateway\n", __LINE__);
-               ret = 1;
                goto out;
        }
 
        ret = c->get_config_item(c, "lxc.network.0.ipv4.gateway", v2, 255);
        if (ret <= 0) {
                fprintf(stderr, "%d: lxc.network.0.ipv4.gateway returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        if (!c->set_config_item(c, "lxc.network.0.ipv4.gateway", "")) {
                fprintf(stderr, "%d: failed clearing ipv4.gateway\n", __LINE__);
-               ret = 1;
                goto out;
        }
        ret = c->get_config_item(c, "lxc.network.0.ipv4.gateway", v2, 255);
        if (ret != 0) {
                fprintf(stderr, "%d: after clearing ipv4.gateway get_item(lxc.network.0.ipv4.gateway returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
 
        ret = c->get_config_item(c, "lxc.network.0.link", v2, 255);
        if (ret < 0) {
                fprintf(stderr, "%d: get_config_item returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        printf("%d: get_config_item (link) returned %d %s\n", __LINE__, ret, v2);
        ret = c->get_config_item(c, "lxc.network.0.name", v2, 255);
        if (ret < 0) {
                fprintf(stderr, "%d: get_config_item returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        printf("%d: get_config_item (name) returned %d %s\n", __LINE__, ret, v2);
 
        if (!c->clear_config_item(c, "lxc.network")) {
                fprintf(stderr, "%d: clear_config_item failed\n", __LINE__);
-               ret = 1;
                goto out;
        }
        ret = c->get_config_item(c, "lxc.network", v2, 255);
        if (ret != 0) {
                fprintf(stderr, "%d: network was not actually cleared (get_network returned %d)\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
 
        ret = c->get_config_item(c, "lxc.cgroup", v3, 2047);
        if (ret < 0) {
                fprintf(stderr, "%d: get_config_item(cgroup.devices) returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        printf("%d: get_config_item (cgroup.devices) returned %d %s\n", __LINE__, ret, v3);
@@ -325,35 +282,30 @@ int main(int argc, char *argv[])
        ret = c->get_config_item(c, "lxc.cgroup.devices.allow", v3, 2047);
        if (ret < 0) {
                fprintf(stderr, "%d: get_config_item(cgroup.devices.devices.allow) returned %d\n", __LINE__, ret);
-               ret = 1;
                goto out;
        }
        printf("%d: get_config_item (cgroup.devices.devices.allow) returned %d %s\n", __LINE__, ret, v3);
 
        if (!c->clear_config_item(c, "lxc.cgroup")) {
                fprintf(stderr, "%d: failed clearing lxc.cgroup\n", __LINE__);
-               ret = 1;
                goto out;
        }
        if (!c->clear_config_item(c, "lxc.cap.drop")) {
                fprintf(stderr, "%d: failed clearing lxc.cap.drop\n", __LINE__);
-               ret = 1;
                goto out;
        }
        if (!c->clear_config_item(c, "lxc.mount.entry")) {
                fprintf(stderr, "%d: failed clearing lxc.mount.entry\n", __LINE__);
-               ret = 1;
                goto out;
        }
        if (!c->clear_config_item(c, "lxc.hook")) {
                fprintf(stderr, "%d: failed clearing lxc.hook\n", __LINE__);
-               ret = 1;
                goto out;
        }
-       c->destroy(c);
        printf("All get_item tests passed\n");
-       ret = 0;
+       ret = EXIT_SUCCESS;
 out:
+       c->destroy(c);
        lxc_container_put(c);
        exit(ret);
-};
+}