diff options
| author | Dominic Maraglia <dominic@puppetlabs.com> | 2011-05-24 09:21:06 -0700 |
|---|---|---|
| committer | Dominic Maraglia <dominic@puppetlabs.com> | 2011-05-24 09:21:06 -0700 |
| commit | 6a9408e8431c2dd27434d02ba747b7ff476d2610 (patch) | |
| tree | d71095da9beef78f38741387e4c43a0a717e5de5 | |
| parent | 8eea3f5481f429a415159a716b7a8f60f3c9be5a (diff) | |
| parent | 4645c99166f415b87ac1bfd01caebdcbeb65d19f (diff) | |
| download | puppet-6a9408e8431c2dd27434d02ba747b7ff476d2610.tar.gz puppet-6a9408e8431c2dd27434d02ba747b7ff476d2610.tar.xz puppet-6a9408e8431c2dd27434d02ba747b7ff476d2610.zip | |
Merge branch 'tests/2.7.x/7117' into 2.7.x
| -rw-r--r-- | acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb | 12 |
1 files changed, 11 insertions, 1 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..79f56c07a 100644 --- a/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb +++ b/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb @@ -17,7 +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" |