Unverified Commit a9f4f9dc by 2xsec Committed by Christian Brauner

tests: cleanup shutdowntest.c

Signed-off-by: 's avatar2xsec <dh48.jeong@samsung.com>
parent 90bc298b
...@@ -49,8 +49,10 @@ int main(int argc, char *argv[]) ...@@ -49,8 +49,10 @@ int main(int argc, char *argv[])
fprintf(stderr, "%d: failed to set network type\n", __LINE__); fprintf(stderr, "%d: failed to set network type\n", __LINE__);
goto out; goto out;
} }
c->set_config_item(c, "lxc.net.0.link", "lxcbr0"); c->set_config_item(c, "lxc.net.0.link", "lxcbr0");
c->set_config_item(c, "lxc.net.0.flags", "up"); c->set_config_item(c, "lxc.net.0.flags", "up");
if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) { if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
fprintf(stderr, "%d: failed to create a container\n", __LINE__); fprintf(stderr, "%d: failed to create a container\n", __LINE__);
goto out; goto out;
...@@ -64,6 +66,7 @@ int main(int argc, char *argv[]) ...@@ -64,6 +66,7 @@ int main(int argc, char *argv[])
c->clear_config(c); c->clear_config(c);
c->load_config(c, NULL); c->load_config(c, NULL);
c->want_daemonize(c, true); c->want_daemonize(c, true);
if (!c->startl(c, 0, NULL)) { if (!c->startl(c, 0, NULL)) {
fprintf(stderr, "%d: failed to start %s\n", __LINE__, MYNAME); fprintf(stderr, "%d: failed to start %s\n", __LINE__, MYNAME);
goto out; goto out;
...@@ -74,9 +77,9 @@ int main(int argc, char *argv[]) ...@@ -74,9 +77,9 @@ int main(int argc, char *argv[])
if (!c->shutdown(c, 120)) { if (!c->shutdown(c, 120)) {
fprintf(stderr, "%d: failed to shut down %s\n", __LINE__, MYNAME); fprintf(stderr, "%d: failed to shut down %s\n", __LINE__, MYNAME);
if (!c->stop(c)) { if (!c->stop(c))
fprintf(stderr, "%d: failed to kill %s\n", __LINE__, MYNAME); fprintf(stderr, "%d: failed to kill %s\n", __LINE__, MYNAME);
}
goto out; goto out;
} }
...@@ -92,10 +95,10 @@ int main(int argc, char *argv[]) ...@@ -92,10 +95,10 @@ int main(int argc, char *argv[])
fprintf(stderr, "all lxc_container tests passed for %s\n", c->name); fprintf(stderr, "all lxc_container tests passed for %s\n", c->name);
ret = 0; ret = 0;
out: out:
if (c && c->is_defined(c)) { if (c && c->is_defined(c))
c->destroy(c); c->destroy(c);
}
lxc_container_put(c); lxc_container_put(c);
exit(ret); exit(ret);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment