summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominic Maraglia <dmaraglia@gmail.com>2011-05-17 15:56:30 -0700
committerDominic Maraglia <dmaraglia@gmail.com>2011-05-17 15:56:30 -0700
commit3378841a230cb467173eed9ed5d3aaa6cd08b2fc (patch)
tree7df5c6c6d1ae1a94e1de966580a37a341d2febe6
parentc8b294a0b0a1fc91a64c0a1ac3bab3b2aec92faf (diff)
downloadpuppet-3378841a230cb467173eed9ed5d3aaa6cd08b2fc.tar.gz
puppet-3378841a230cb467173eed9ed5d3aaa6cd08b2fc.tar.xz
puppet-3378841a230cb467173eed9ed5d3aaa6cd08b2fc.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