puppet 0.25.4 → 0.25.5

data/spec/integration/bin/puppetmasterd.rb

@@ -16,6 +16,10 @@ describe "puppetmasterd" do
         Puppet[:certdnsnames] = "localhost"
 
         @@port = 12345
+
+        Puppet::SSL::Host.instance_eval{
+            @value_cache = {}
+        }
     end
 
     after {
@@ -48,7 +52,7 @@ describe "puppetmasterd" do
             f.puts { "notify { testing: }" }
         end
 
-        args = arguments + addl_args
+        args = arguments + " " + addl_args
 
         bin = File.join(File.dirname(__FILE__), "..", "..", "..", "sbin", "puppetmasterd")
         lib = File.join(File.dirname(__FILE__), "..", "..", "..", "lib")
@@ -56,9 +60,22 @@ describe "puppetmasterd" do
     end
 
     def stop
-        if @pidfile and FileTest.exist?(@pidfile)
+        if @pidfile and File.exist?(@pidfile)
             pid = File.read(@pidfile).chomp.to_i
             Process.kill(:TERM, pid)
+            10.times do
+                break unless File.exist?(@pidfile)
+                sleep 1
+            end
+            begin
+                # sigkill and report if process was still running
+                Process.kill(:KILL, pid)
+
+                raise "Process didn't die from SIGTERM after 10 seconds"
+            rescue Errno::ESRCH
+                # process wasn't running. good.
+            end
+
         end
     end
 
@@ -73,16 +90,10 @@ describe "puppetmasterd" do
     it "should be serving status information over xmlrpc" do
         start
 
-        sleep 5
+        sleep 6
 
         client = Puppet::Network::Client.status.new(:Server => "localhost", :Port => @@port)
 
-        FileUtils.mkdir_p(File.dirname(Puppet[:autosign]))
-        File.open(Puppet[:autosign], "w") { |f|
-            f.puts Puppet[:certname]
-        }
-
-        client.cert
         retval = client.status
 
         retval.should == 1

data/spec/integration/defaults.rb

@@ -223,4 +223,8 @@ describe "Puppet defaults" do
     it "should have a 'postrun_command' that defaults to the empty string" do
         Puppet.settings[:postrun_command].should == ""
     end
+
+    it "should have a 'certificate_revocation' setting that defaults to true" do
+        Puppet.settings[:certificate_revocation].should be_true
+    end
 end

data/spec/integration/indirector/certificate/rest.rb

@@ -19,7 +19,6 @@ describe "Certificate REST Terminus" do
         Puppet.settings[:vardir] = @dir
         Puppet.settings[:server] = "127.0.0.1"
         Puppet.settings[:masterport] = "34343"
-        Puppet.settings[:http_enable_post_connection_check] = false
 
         Puppet::Util::Cacher.expire
 

data/spec/integration/indirector/certificate_request/rest.rb

@@ -21,7 +21,6 @@ describe "Certificate Request REST Terminus" do
         Puppet.settings[:vardir] = @dir
         Puppet.settings[:server] = "127.0.0.1"
         Puppet.settings[:masterport] = "34343"
-        Puppet.settings[:http_enable_post_connection_check] = false
 
         Puppet[:servertype] = 'webrick'
         Puppet[:server] = '127.0.0.1'

data/spec/integration/indirector/certificate_revocation_list/rest.rb

@@ -19,7 +19,6 @@ describe "Certificate REST Terminus" do
         Puppet.settings[:vardir] = @dir
         Puppet.settings[:server] = "127.0.0.1"
         Puppet.settings[:masterport] = "34343"
-        Puppet.settings[:http_enable_post_connection_check] = false
 
         Puppet::Util::Cacher.expire
 

data/spec/integration/indirector/report/rest.rb

@@ -19,7 +19,6 @@ describe "Report REST Terminus" do
         Puppet.settings[:vardir] = @dir
         Puppet.settings[:server] = "127.0.0.1"
         Puppet.settings[:masterport] = "34343"
-        Puppet.settings[:http_enable_post_connection_check] = false
 
         Puppet::Util::Cacher.expire
 

data/spec/integration/indirector/rest.rb

@@ -40,7 +40,6 @@ describe Puppet::Indirector::REST do
         Puppet.settings[:vardir] = @dir
         Puppet.settings[:server] = "127.0.0.1"
         Puppet.settings[:masterport] = "34343"
-        Puppet.settings[:http_enable_post_connection_check] = false
 
         Puppet::SSL::Host.ca_location = :local
 

data/spec/integration/parser/functions/require.rb

@@ -22,10 +22,27 @@ describe "the require function" do
 
         @scope.function_require("requiredclass")
         @scope.resource["require"].should_not be_nil
-        ref = @scope.resource["require"]
+        ref = @scope.resource["require"].shift
         ref.type.should == "Class"
         ref.title.should == "requiredclass"
     end
+
+    it "should queue relationships between the 'required' class and our classes" do
+        @parser.newclass("requiredclass1")
+        @parser.newclass("requiredclass2")
+
+        @scope.function_require("requiredclass1")
+        @scope.function_require("requiredclass2")
+
+        @scope.resource["require"].should_not be_nil
+
+        (ref1,ref2) = @scope.resource["require"]
+        ref1.type.should == "Class"
+        ref1.title.should == "requiredclass1"
+        ref2.type.should == "Class"
+        ref2.title.should == "requiredclass2"
+    end
+
 end
 
 describe "the include function" do

data/spec/unit/application/filebucket.rb

@@ -124,9 +124,9 @@ describe "Filebucket" do
         describe "with remote bucket" do
 
             it "should create a remote Client to the configured server" do
-                Puppet.stubs(:[]).with(:server).returns("puppet.reductivelabs.com")
+                Puppet.stubs(:[]).with(:server).returns("puppet.puppetlabs.com")
 
-                Puppet::Network::Client::Dipper.expects(:new).with { |h| h[:Server] == "puppet.reductivelabs.com" }
+                Puppet::Network::Client::Dipper.expects(:new).with { |h| h[:Server] == "puppet.puppetlabs.com" }
 
                 @filebucket.run_setup
             end

data/spec/unit/application/puppetd.rb

@@ -275,10 +275,10 @@ describe "puppetd" do
 
         it "should set a central log destination with --centrallogs" do
             @puppetd.options.stubs(:[]).with(:centrallogs).returns(true)
-            Puppet.stubs(:[]).with(:server).returns("puppet.reductivelabs.com")
+            Puppet.stubs(:[]).with(:server).returns("puppet.puppetlabs.com")
             Puppet::Util::Log.stubs(:newdestination).with(:syslog)
 
-            Puppet::Util::Log.expects(:newdestination).with("puppet.reductivelabs.com")
+            Puppet::Util::Log.expects(:newdestination).with("puppet.puppetlabs.com")
 
             @puppetd.run_setup
         end
@@ -301,9 +301,8 @@ describe "puppetd" do
             @puppetd.run_setup
         end
 
-        it "should tell the catalog handler to use REST" do
-            Puppet::Resource::Catalog.expects(:terminus_class=).with(:rest)
-
+        it "should change the catalog_terminus setting to 'rest'" do
+            Puppet.expects(:[]=).with(:catalog_terminus, :rest)
             @puppetd.run_setup
         end
 

data/spec/unit/configurer.rb

@@ -141,9 +141,54 @@ describe Puppet::Configurer, "when retrieving a catalog" do
 
         @catalog = Puppet::Resource::Catalog.new
 
+        # this is the default when using a Configurer instance
+        Puppet::Resource::Catalog.indirection.stubs(:terminus_class).returns :rest
+
         @agent.stubs(:convert_catalog).returns @catalog
     end
 
+    describe "and configured to only retrieve a catalog from the cache" do
+        before do
+            Puppet.settings[:use_cached_catalog] = true
+        end
+
+        it "should first look in the cache for a catalog" do
+            Puppet::Resource::Catalog.expects(:find).with { |name, options| options[:ignore_terminus] == true }.returns @catalog
+            Puppet::Resource::Catalog.expects(:find).with { |name, options| options[:ignore_cache] == true }.never
+
+            @agent.retrieve_catalog.should == @catalog
+        end
+
+        it "should compile a new catalog if none is found in the cache" do
+            Puppet::Resource::Catalog.expects(:find).with { |name, options| options[:ignore_terminus] == true }.returns nil
+            Puppet::Resource::Catalog.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns @catalog
+
+            @agent.retrieve_catalog.should == @catalog
+        end
+    end
+
+    describe "when not using a REST terminus for catalogs" do
+        it "should not pass any facts when retrieving the catalog" do
+            @agent.expects(:facts_for_uploading).never
+            Puppet::Resource::Catalog.expects(:find).with { |name, options|
+                options[:facts].nil?
+            }.returns @catalog
+
+            @agent.retrieve_catalog
+        end
+    end
+
+    describe "when using a REST terminus for catalogs" do
+        it "should pass the prepared facts and the facts format as arguments when retrieving the catalog" do
+            @agent.expects(:facts_for_uploading).returns(:facts => "myfacts", :facts_format => :foo)
+            Puppet::Resource::Catalog.expects(:find).with { |name, options|
+                options[:facts] == "myfacts" and options[:facts_format] == :foo
+            }.returns @catalog
+
+            @agent.retrieve_catalog
+        end
+    end
+
     it "should use the Catalog class to get its catalog" do
         Puppet::Resource::Catalog.expects(:find).returns @catalog
 
@@ -152,19 +197,12 @@ describe Puppet::Configurer, "when retrieving a catalog" do
 
     it "should use its certname to retrieve the catalog" do
         Facter.stubs(:value).returns "eh"
-        Puppet.expects(:[]).with(:certname).returns "myhost.domain.com"
+        Puppet.settings[:certname] = "myhost.domain.com"
         Puppet::Resource::Catalog.expects(:find).with { |name, options| name == "myhost.domain.com" }.returns @catalog
 
         @agent.retrieve_catalog
     end
 
-    it "should pass the prepared facts and the facts format as arguments when retrieving the catalog" do
-        @agent.expects(:facts_for_uploading).returns(:facts => "myfacts", :facts_format => :foo)
-        Puppet::Resource::Catalog.expects(:find).with { |name, options| options[:facts] == "myfacts" and options[:facts_format] == :foo }.returns @catalog
-
-        @agent.retrieve_catalog
-    end
-
     it "should default to returning a catalog retrieved directly from the server, skipping the cache" do
         Puppet::Resource::Catalog.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns @catalog
 

data/spec/unit/file_serving/fileset.rb

@@ -42,6 +42,12 @@ describe Puppet::FileServing::Fileset, " when initializing" do
         set.links.should == :manage
     end
 
+    it "should accept a 'checksum_type' option" do
+        File.expects(:lstat).with("/some/file").returns stub("stat")
+        set = Puppet::FileServing::Fileset.new("/some/file", :checksum_type => :test)
+        set.checksum_type.should == :test
+    end
+
     it "should fail if 'links' is set to anything other than :manage or :follow" do
         proc { Puppet::FileServing::Fileset.new("/some/file", :links => :whatever) }.should raise_error(ArgumentError)
     end

data/spec/unit/file_serving/terminus_helper.rb

@@ -76,6 +76,16 @@ describe Puppet::FileServing::TerminusHelper do
             @helper.path2instances(@request, "/my/file")
         end
 
+        it "should set the request checksum_type if one is provided" do
+            @one.expects(:checksum_type=).with :test
+            @two.expects(:checksum_type=).with :test
+            @model.expects(:new).returns(@one)
+            @model.expects(:new).returns(@two)
+
+            @request.options[:checksum_type] = :test
+            @helper.path2instances(@request, "/my/file")
+        end
+
         it "should collect the instance's attributes" do
             @one.expects(:collect)
             @two.expects(:collect)

data/spec/unit/indirector/indirection.rb

@@ -545,44 +545,33 @@ describe Puppet::Indirector::Indirection do
                     @indirection.expire("/my/key")
                 end
 
-                describe "and the terminus supports removal of cache items with destroy" do
-                    it "should destroy the cached instance" do
-                        @cache.expects(:find).returns @cached
-                        @cache.expects(:destroy).with { |r| r.method == :destroy and r.key == "/my/key" }
-                        @cache.expects(:save).never
-                        @indirection.expire("/my/key")
-                    end
-                end
-
-                describe "and the terminus does not support removal of cache items with destroy" do
-                    it "should set the cached instance's expiration to a time in the past" do
-                        @cache.expects(:find).returns @cached
-                        @cache.stubs(:save)
+                it "should set the cached instance's expiration to a time in the past" do
+                    @cache.expects(:find).returns @cached
+                    @cache.stubs(:save)
 
-                        @cached.expects(:expiration=).with { |t| t < Time.now }
+                    @cached.expects(:expiration=).with { |t| t < Time.now }
 
-                        @indirection.expire("/my/key")
-                    end
+                    @indirection.expire("/my/key")
+                end
 
-                    it "should save the now expired instance back into the cache" do
-                        @cache.expects(:find).returns @cached
+                it "should save the now expired instance back into the cache" do
+                    @cache.expects(:find).returns @cached
 
-                        @cached.expects(:expiration=).with { |t| t < Time.now }
+                    @cached.expects(:expiration=).with { |t| t < Time.now }
 
-                        @cache.expects(:save)
+                    @cache.expects(:save)
 
-                        @indirection.expire("/my/key")
-                    end
+                    @indirection.expire("/my/key")
+                end
 
-                    it "should use a request to save the expired resource to the cache" do
-                        @cache.expects(:find).returns @cached
+                it "should use a request to save the expired resource to the cache" do
+                    @cache.expects(:find).returns @cached
 
-                        @cached.expects(:expiration=).with { |t| t < Time.now }
+                    @cached.expects(:expiration=).with { |t| t < Time.now }
 
-                        @cache.expects(:save).with { |r| r.is_a?(Puppet::Indirector::Request) and r.instance == @cached and r.method == :save }.returns(@cached)
+                    @cache.expects(:save).with { |r| r.is_a?(Puppet::Indirector::Request) and r.instance == @cached and r.method == :save }.returns(@cached)
 
-                        @indirection.expire("/my/key")
-                    end
+                    @indirection.expire("/my/key")
                 end
             end
         end

data/spec/unit/network/format_handler.rb

@@ -73,8 +73,9 @@ describe Puppet::Network::FormatHandler do
             it "should still return the default format first" do
                 FormatTester.supported_formats.should == [:two, :one]
             end
-            it "should log a warning" do
-                Puppet.expects(:warning)
+            it "should log a debug message" do
+                Puppet.expects(:debug).with("Value of 'preferred_serialization_format' (unsupported) is invalid for FormatTester, using default (two)")
+                Puppet.expects(:debug).with("FormatTester supports formats: one two; using two")
                 FormatTester.supported_formats
             end
         end

data/spec/unit/network/http_pool.rb

@@ -36,7 +36,7 @@ describe Puppet::Network::HttpPool do
         end
 
         it "should return an http instance created with the passed host and port" do
-            http = stub 'http', :use_ssl= => nil, :read_timeout= => nil, :open_timeout= => nil, :enable_post_connection_check= => nil, :started? => false
+            http = stub 'http', :use_ssl= => nil, :read_timeout= => nil, :open_timeout= => nil, :started? => false
             Net::HTTP.expects(:new).with("me", 54321, nil, nil).returns(http)
             Puppet::Network::HttpPool.http_instance("me", 54321).should equal(http)
         end
@@ -53,16 +53,8 @@ describe Puppet::Network::HttpPool do
             Puppet::Network::HttpPool.http_instance("me", 54321).open_timeout.should == 120
         end
 
-        it "should default to http_enable_post_connection_check being enabled" do
-            Puppet.settings[:http_enable_post_connection_check].should be_true
-        end
-
-        it "should set enable_post_connection_check true " do
-            Puppet::Network::HttpPool.http_instance("me", 54321).instance_variable_get("@enable_post_connection_check").should be(Puppet.settings[:http_enable_post_connection_check])
-        end
-
         it "should create the http instance with the proxy host and port set if the http_proxy is not set to 'none'" do
-            stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120, :http_enable_post_connection_check => true
+            stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120
             Puppet::Network::HttpPool.http_instance("me", 54321).open_timeout.should == 120
         end
 
@@ -72,19 +64,19 @@ describe Puppet::Network::HttpPool do
             end
 
             it "should cache http instances" do
-                stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120, :http_enable_post_connection_check => true
+                stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120
                 old = Puppet::Network::HttpPool.http_instance("me", 54321)
                 Puppet::Network::HttpPool.http_instance("me", 54321).should equal(old)
             end
 
             it "should have a mechanism for getting a new http instance instead of the cached instance" do
-                stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120, :http_enable_post_connection_check => true
+                stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120
                 old = Puppet::Network::HttpPool.http_instance("me", 54321)
                 Puppet::Network::HttpPool.http_instance("me", 54321, true).should_not equal(old)
             end
 
             it "should close existing, open connections when requesting a new connection" do
-                stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120, :http_enable_post_connection_check => true
+                stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120
                 old = Puppet::Network::HttpPool.http_instance("me", 54321)
                 old.expects(:started?).returns(true)
                 old.expects(:finish)
@@ -92,7 +84,7 @@ describe Puppet::Network::HttpPool do
             end
 
             it "should have a mechanism for clearing the http cache" do
-                stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120, :http_enable_post_connection_check => true
+                stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120
                 old = Puppet::Network::HttpPool.http_instance("me", 54321)
                 Puppet::Network::HttpPool.http_instance("me", 54321).should equal(old)
                 old = Puppet::Network::HttpPool.http_instance("me", 54321)
@@ -101,7 +93,7 @@ describe Puppet::Network::HttpPool do
             end
 
             it "should close open http connections when clearing the cache" do
-                stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120, :http_enable_post_connection_check => true
+                stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120
                 one = Puppet::Network::HttpPool.http_instance("me", 54321)
                 one.expects(:started?).returns(true)
                 one.expects(:finish).returns(true)
@@ -109,7 +101,7 @@ describe Puppet::Network::HttpPool do
             end
 
             it "should not close unopened http connections when clearing the cache" do
-                stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120, :http_enable_post_connection_check => true
+                stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120
                 one = Puppet::Network::HttpPool.http_instance("me", 54321)
                 one.expects(:started?).returns(false)
                 one.expects(:finish).never
@@ -123,7 +115,7 @@ describe Puppet::Network::HttpPool do
             end
 
             it "should not cache http instances" do
-                stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120, :http_enable_post_connection_check => true
+                stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120
                 old = Puppet::Network::HttpPool.http_instance("me", 54321)
                 Puppet::Network::HttpPool.http_instance("me", 54321).should_not equal(old)
             end