From: Stéphane Graber <stgraber@ubuntu.com>
Date: Fri, 24 Jan 2014 04:30:14 +0000 (-0500)
Subject: tests: Fix createtest
X-Git-Tag: lxc-1.0.0.beta3~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80a873c2237df690b46549b6dcdcb2ff16e61aa2;p=thirdparty%2Flxc.git

tests: Fix createtest

Drop 60s delay and clear config before loading it.

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

diff --git a/src/tests/createtest.c b/src/tests/createtest.c
index b53c96384..ba3a387b2 100644
--- a/src/tests/createtest.c
+++ b/src/tests/createtest.c
@@ -60,14 +60,13 @@ int main(int argc, char *argv[])
 		goto out;
 	}
 
+	c->clear_config(c);
 	c->load_config(c, NULL);
 	c->want_daemonize(c, true);
 	if (!c->startl(c, 0, NULL)) {
 		fprintf(stderr, "%d: failed to start %s\n", __LINE__, MYNAME);
 		goto out;
 	}
-	fprintf(stderr, "%d: %s started, you have 60 seconds to test a console\n", __LINE__, MYNAME);
-	sleep(60);  // wait a minute to let user connect to console
 
 	if (!c->stop(c)) {
 		fprintf(stderr, "%d: failed to stop %s\n", __LINE__, MYNAME);