diff options
| author | Dominic Maraglia <dominic@puppetlabs.com> | 2011-05-24 11:29:13 -0700 |
|---|---|---|
| committer | Dominic Maraglia <dominic@puppetlabs.com> | 2011-05-24 11:29:13 -0700 |
| commit | fb0ddf2a85ea7045cff116191ba8ec78e0d976cf (patch) | |
| tree | a2facc4b88992e5abf45362e4279827df9608ff7 | |
| parent | 2a86215498b20155cb588d018c0e1df0a8102f3f (diff) | |
| parent | b101804f5825e9f69a690f9a974222dd7b83a330 (diff) | |
| download | puppet-fb0ddf2a85ea7045cff116191ba8ec78e0d976cf.tar.gz puppet-fb0ddf2a85ea7045cff116191ba8ec78e0d976cf.tar.xz puppet-fb0ddf2a85ea7045cff116191ba8ec78e0d976cf.zip | |
Merge branch 'tests/master/7117'
| -rw-r--r-- | acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb b/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb index 3f762bcca..37c71893c 100644 --- a/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb +++ b/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb @@ -17,9 +17,17 @@ on master, "ps -U puppet | awk '/puppet/ { print \$1 }' | xargs kill || echo \"P 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 - +step "Verify Puppet Master is ready to accept connections" +host=agents.first +time1 = Time.new +until + on(host, "curl -k https://#{master}:8140") do + sleep 1 + end +time2 = Time.new +elapsed = time2 - time1 +Log.notify "Slept for #{elapsed} seconds waiting for Puppet Master to become ready" # Run test on Agents step "Agent: agent --test" |