summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominic Maraglia <dmaraglia@gmail.com>2011-05-18 12:12:35 -0700
committerDominic Maraglia <dmaraglia@gmail.com>2011-05-18 12:12:35 -0700
commitc81f5c6e6cdb4d7f8bef6814f63f82acbdbdbe33 (patch)
treee45f884d92cc0b57f5507751ba40a29e96114ae1
parent51855e7f17877871aa8ec4f1ed7226c1d95ce66b (diff)
downloadpuppet-c81f5c6e6cdb4d7f8bef6814f63f82acbdbdbe33.tar.gz
puppet-c81f5c6e6cdb4d7f8bef6814f63f82acbdbdbe33.tar.xz
puppet-c81f5c6e6cdb4d7f8bef6814f63f82acbdbdbe33.zip
Adding a sleep state post starting master
Occasional spurious errors seen when running this test -- curl reports an SSL protocol error; I suspect this is actually a timing issue related to starting up the master and not being ready to to accecpt connections.
-rw-r--r--acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb b/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb
index 76a6bf818..3f762bcca 100644
--- a/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb
+++ b/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb
@@ -16,6 +16,9 @@ step "Master: kill running Puppet Master"
on master, "ps -U puppet | awk '/puppet/ { print \$1 }' | xargs kill || echo \"Puppet Master not running\""
step "Master: Start Puppet Master"
on master, puppet_master("--certdnsnames=\"puppet:$(hostname -s):$(hostname -f)\" --verbose --noop")
+# allow Master to start and initialize environment
+sleep 1
+
# Run test on Agents