tests: Try to make shutdowntest a bit more robust

This should help it run better on slow test environment like the LXC CI
armhf builder.
 - Wait longer for the container to start
 - Wait longer for the container to shutdown
 - On failure to shutdown, kill the container
 - Always destroy the container if it's around

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/tests/shutdowntest.c b/src/tests/shutdowntest.c
index 2450221ffff554be72b4e97c018fe9d65c4c60c1..0f9a8fd14248db5ad733ef760c1e682e7aacd649 100644 (file)
--- a/src/tests/shutdowntest.c
+++ b/src/tests/shutdowntest.c
@@ -70,10 +70,13 @@ int main(int argc, char *argv[])
        }
 
        /* Wait for init to be ready for SIGPWR */
-       sleep(10);
+       sleep(20);
 
-       if (!c->shutdown(c, 60)) {
+       if (!c->shutdown(c, 120)) {
                fprintf(stderr, "%d: failed to shut down %s\n", __LINE__, MYNAME);
+               if (!c->stop(c)) {
+                       fprintf(stderr, "%d: failed to kill %s\n", __LINE__, MYNAME);
+               }
                goto out;
        }
 
@@ -90,6 +93,10 @@ int main(int argc, char *argv[])
        fprintf(stderr, "all lxc_container tests passed for %s\n", c->name);
        ret = 0;
 out:
+       if (c && c->is_defined(c)) {
+               c->destroy(c);
+       }
+
        lxc_container_put(c);
        exit(ret);
 }