From a5d3a0f9a230bd8d31dec5fc44af1e62d186ccc4 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Mon, 30 Sep 2013 23:57:20 +0000 Subject: Don't delay waiting for daemons to start up if we're just going to wait for them to exit anyway. svn path=/trunk/; revision=5535 --- rpkid/tests/yamltest.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'rpkid') diff --git a/rpkid/tests/yamltest.py b/rpkid/tests/yamltest.py index 2ed3b8e6..61a344da 100644 --- a/rpkid/tests/yamltest.py +++ b/rpkid/tests/yamltest.py @@ -725,13 +725,16 @@ try: progs.append(d.run_pubd()) progs.append(d.run_rsyncd()) - print - print "Giving daemons time to start up" - time.sleep(20) - assert all(p.poll() is None for p in progs) + if synchronize or not skip_config: + + print + print "Giving daemons time to start up" + time.sleep(20) + assert all(p.poll() is None for p in progs) if skip_config: + print print "Skipping configure_*, you'll have to do that yourself if needed" else: -- cgit v1.2.3