From 544dcf80db32ef0827f19366af453d17224d2df6 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Sat, 13 Nov 2010 21:22:08 -0800 Subject: Fix #5289 -- Bad copy/paste changes message on test failure In my fix for #4894 (commit a097b939ab52bafb681cf7c5dcaf11717add07e6) I made and tested the fix in one case and then copied most of it (all but a variable initialization, Doh!) to two other locations. This caused tests that would have failed with a socket-in-use error to fail with a different error rather than retrying. Also fixed the spelling of "simultaneous." --- spec/integration/indirector/bucket_file/rest_spec.rb | 3 ++- spec/integration/indirector/certificate_revocation_list/rest_spec.rb | 3 ++- spec/integration/indirector/rest_spec.rb | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spec/integration/indirector/bucket_file/rest_spec.rb b/spec/integration/indirector/bucket_file/rest_spec.rb index 9864a98ce..acfc0594b 100644 --- a/spec/integration/indirector/bucket_file/rest_spec.rb +++ b/spec/integration/indirector/bucket_file/rest_spec.rb @@ -36,6 +36,7 @@ describe "Filebucket REST Terminus" do @host = Puppet::SSL::Host.new(Puppet[:certname]) @params = { :port => 34343, :handlers => [ :file_bucket_file ] } + retries = 0 begin @server = Puppet::Network::Server.new(@params) @server.listen @@ -43,7 +44,7 @@ describe "Filebucket REST Terminus" do sleep 0.1 puts "Port 34343 is in use; waiting for it to be free" if retries == 50 retry if (retries += 1) < 100 - pending "Can't run too many simultanious tests" + pending "Can't run too many simultaneous tests" end @old_terminus = Puppet::FileBucket::File.indirection.terminus_class diff --git a/spec/integration/indirector/certificate_revocation_list/rest_spec.rb b/spec/integration/indirector/certificate_revocation_list/rest_spec.rb index 3998db45f..74e3f90a0 100755 --- a/spec/integration/indirector/certificate_revocation_list/rest_spec.rb +++ b/spec/integration/indirector/certificate_revocation_list/rest_spec.rb @@ -33,6 +33,7 @@ describe "Certificate REST Terminus" do ca.generate(Puppet[:certname]) unless Puppet::SSL::Certificate.find(Puppet[:certname]) @params = { :port => 34343, :handlers => [ :certificate_revocation_list ] } + retries = 0 begin @server = Puppet::Network::Server.new(@params) @server.listen @@ -40,7 +41,7 @@ describe "Certificate REST Terminus" do sleep 0.1 puts "Port 34343 is in use; waiting for it to be free" if retries == 50 retry if (retries += 1) < 100 - pending "Can't run too many simultanious tests" + pending "Can't run too many simultaneous tests" end # And make sure we've generated the CRL diff --git a/spec/integration/indirector/rest_spec.rb b/spec/integration/indirector/rest_spec.rb index 53a3086cd..8aaf4fc80 100755 --- a/spec/integration/indirector/rest_spec.rb +++ b/spec/integration/indirector/rest_spec.rb @@ -74,7 +74,7 @@ describe Puppet::Indirector::REST do sleep 0.1 puts "Port 34343 is in use; waiting for it to be free" if retries == 50 retry if (retries += 1) < 100 - pending "Can't run too many simultanious tests" + pending "Can't run too many simultaneous tests" end # LAK:NOTE We need to have a fake model here so that our indirected methods get -- cgit