From 3378841a230cb467173eed9ed5d3aaa6cd08b2fc Mon Sep 17 00:00:00 2001 From: Dominic Maraglia Date: Tue, 17 May 2011 15:56:30 -0700 Subject: 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. --- acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb | 3 +++ 1 file changed, 3 insertions(+) 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 -- cgit From aad2fd780b5134af4f5385c38c15a72c28697bd0 Mon Sep 17 00:00:00 2001 From: Jacob Helwig Date: Mon, 16 May 2011 09:46:22 -0700 Subject: (#7259) Do not try to load all Terminus classes when configuring the Indirector When configuring the Indirector routes, we should only try loading the Terminus classes that are referenced by the configuration. Previously, we were loading all Terminus classes, which would cause errors if we didn't have all of the prerequisites for all of them, even if the ones with missing prerequisites weren't being used by the configuration. Paired-with: Nick Lewis --- lib/puppet/indirector.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/indirector.rb b/lib/puppet/indirector.rb index 7267ac7f3..86ede5994 100644 --- a/lib/puppet/indirector.rb +++ b/lib/puppet/indirector.rb @@ -18,7 +18,7 @@ module Puppet::Indirector terminus_name = termini["terminus"] cache_name = termini["cache"] - Puppet::Indirector::Terminus.terminus_classes(indirection_name) + Puppet::Indirector::Terminus.terminus_class(indirection_name, terminus_name || cache_name) indirection = Puppet::Indirector::Indirection.instance(indirection_name) raise "Indirection #{indirection_name} does not exist" unless indirection -- cgit From 83c756367ef4bfc404b2395362f796c2c942b053 Mon Sep 17 00:00:00 2001 From: Jacob Helwig Date: Mon, 16 May 2011 09:52:04 -0700 Subject: (#7259) Remove ActiveRecord requirement from indirector face spec "should be able to return a list of terminuses for a given indirection" was calling Puppet::Indirector::Face.terminus_classes, which is just a thin wrapper around Puppet::Indirector::Terminus.terminus_classes, which would attempt to load all Terminus classes. This would cause problems if not all of the prerequisites for all of the Terminus classes were installed (For example: ActiveRecord). Now we only test that the thin wrapper appropriately munges the output from Puppet::Indirector::Terminus.terminus_classes, since the method being wrapped should have its own tests for the behavior that was being tested originally. Paired-with: Nick Lewis --- spec/unit/indirector/face_spec.rb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/spec/unit/indirector/face_spec.rb b/spec/unit/indirector/face_spec.rb index 1530f7270..943ff7991 100755 --- a/spec/unit/indirector/face_spec.rb +++ b/spec/unit/indirector/face_spec.rb @@ -16,8 +16,17 @@ describe Puppet::Indirector::Face do Puppet::Indirector::Face.indirections.should be_include("catalog") end - it "should be able to return a list of terminuses for a given indirection" do - Puppet::Indirector::Face.terminus_classes(:catalog).should be_include("compiler") + it "should return the sorted to_s list of terminus classes" do + Puppet::Indirector::Terminus.expects(:terminus_classes).returns([ + :yaml, + :compiler, + :rest + ]) + Puppet::Indirector::Face.terminus_classes(:catalog).should == [ + 'compiler', + 'rest', + 'yaml' + ] end describe "as an instance" do -- cgit From fc0add14616f9ddf54ba2dd449bfd0acc03d7ed7 Mon Sep 17 00:00:00 2001 From: Michael Stahnke Date: Wed, 18 May 2011 15:55:56 -0700 Subject: Updated CHANGELOG for 2.7.0rc3 --- CHANGELOG | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 68e54b439..1459bc77f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,23 @@ +2.7.0rc3 +=== +83c7563 (#7259) Remove ActiveRecord requirement from indirector face spec +aad2fd7 (#7259) Do not try to load all Terminus classes when configuring the Indirector +3378841 Adding a sleep state post starting master +d972cea (#7507) Add more filters for Ruby 1.9 spec failures +9da1454 (#7507) Add ability to filter Ruby 1.9 spec failures +47e4ac9 (#7507) Fix when_invoked action specs in Ruby 1.9 +809b6fe (#7297) Fix Puppet::Resource#to_manifest in Ruby 1.9 +3197e21 (#7298) require 'English' to provide $CHILD_STATUS in Ruby 1.9 +48923af (#7291) Fix issues with instance_methods in Ruby 1.9 +68065ff (#7291) Fixed ascii problem with Ruby 1.9.2 +1abb7c0 (#7291) Fix Ruby 1.9 face failures +6159466 (#7291) The 'script' version of actions needs options argument +09f5d9c (#7469) Add license to test face so tests pass +a44cbb1 (#7264) Docs: Clarify that subscribe/notify imply require/before +9377507 (#7468) Stub spec that tries to connect to pypi.python.org +5db214c Prevent spec failure caused by network device mock leak +3722520 Fix #7299 - do not require net/ssh for running rake spec + 2.7.0rc2 === 61edff9 (#7353) Remove :for_humans format entirely. -- cgit