[lxc-devel] [PATCH] tests: Try to make shutdowntest a bit more robust

[Serge Hallyn]

Quoting Stéphane Graber (stgraber at ubuntu.com):
> 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 at ubuntu.com>

wowzer, 20 seconds?  for a busybox container?

Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

> ---
>  src/tests/shutdowntest.c | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/src/tests/shutdowntest.c b/src/tests/shutdowntest.c
> index 2450221..0f9a8fd 100644
> --- 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);
>  }
> -- 
> 1.9.1
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel