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

1 files changed, 7 insertions, 4 deletions

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: