[1818] Wait for components to start before testing them

diff --git a/tests/lettuce/features/bindctl_commands.feature b/tests/lettuce/features/bindctl_commands.feature
index 541d993fc465e3f02a8e3875d83eb1525d955ec8..96527b71be46c74ac25fa7b38bc069d02e73530a 100644 (file)
--- a/tests/lettuce/features/bindctl_commands.feature
+++ b/tests/lettuce/features/bindctl_commands.feature
@@ -10,6 +10,13 @@ Feature: control with bindctl
     # currently less standardized than 'help')
     Given I have bind10 running with configuration example.org.config
 
+    And wait for bind10 stderr message ZONEMGR_STARTED
+    And wait for bind10 stderr message AUTH_SERVER_STARTED
+    And wait for bind10 stderr message XFRIN_STARTED
+    And wait for bind10 stderr message XFROUT_STARTED
+    And wait for bind10 stderr message STATS_STARTING
+    And wait for bind10 stderr message STATHTTPD_STARTED
+
     Then remove bind10 configuration Boss/components/NOSUCHMODULE
     last bindctl output should contain Error
 
@@ -21,14 +28,25 @@ Feature: control with bindctl
     bind10 module StatsHttpd should be running
 
     Then remove bind10 configuration Boss/components value b10-xfrout
+    And wait for new bind10 stderr message BIND10_PROCESS_ENDED
     last bindctl output should not contain Error
     # assuming it won't error for further modules (if it does, the final
     # 'should not be running' tests would fail anyway)
     Then remove bind10 configuration Boss/components value b10-stats-httpd
+    And wait for new bind10 stderr message BIND10_PROCESS_ENDED
+    last bindctl output should not contain Error
     Then remove bind10 configuration Boss/components value b10-stats
+    And wait for new bind10 stderr message BIND10_PROCESS_ENDED
+    last bindctl output should not contain Error
     Then remove bind10 configuration Boss/components value b10-zonemgr
+    And wait for new bind10 stderr message BIND10_PROCESS_ENDED
+    last bindctl output should not contain Error
     Then remove bind10 configuration Boss/components value b10-xfrin
+    And wait for new bind10 stderr message BIND10_PROCESS_ENDED
+    last bindctl output should not contain Error
     Then remove bind10 configuration Boss/components value b10-auth
+    And wait for new bind10 stderr message BIND10_PROCESS_ENDED
+    last bindctl output should not contain Error
 
     bind10 module Xfrout should not be running
     bind10 module Zonemgr should not be running

diff --git a/tests/lettuce/features/default.feature b/tests/lettuce/features/default.feature
index d3115e6c467e5622031eb2faca966acaeb8cecf4..18f952a18185ce9f9b46c2b6e866efdc33663eb0 100644 (file)
--- a/tests/lettuce/features/default.feature
+++ b/tests/lettuce/features/default.feature
@@ -4,10 +4,16 @@ Feature: default bind10 config
     Scenario: Check that only the default components are running
     Given I have bind10 running with configuration default.config
 
+    And wait for bind10 stderr message STATS_STARTING
+    And wait for bind10 stderr message STATHTTPD_STARTED
+
+    # These should be running
     bind10 module Boss should be running
     bind10 module Logging should be running
     bind10 module Stats should be running
     bind10 module StatsHttpd should be running
+
+    # These should not be running
     bind10 module Resolver should not be running
     bind10 module Xfrout should not be running
     bind10 module Zonemgr should not be running