puppet 3.3.2 → 3.4.0.rc1

data/spec/unit/file_system/tempfile_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Puppet::FileSystem::Tempfile do
+  it "makes the name of the file available" do
+    Puppet::FileSystem::Tempfile.open('foo') do |file|
+      expect(file.path).to match(/foo/)
+    end
+  end
+
+  it "provides a writeable file" do
+    Puppet::FileSystem::Tempfile.open('foo') do |file|
+      file.write("stuff")
+      file.flush
+
+      expect(Puppet::FileSystem::File.new(file.path).read).to eq("stuff")
+    end
+  end
+
+  it "returns the value of the block" do
+    the_value = Puppet::FileSystem::Tempfile.open('foo') do |file|
+      "my value"
+    end
+
+    expect(the_value).to eq("my value")
+  end
+
+  it "unlinks the temporary file" do
+    filename = Puppet::FileSystem::Tempfile.open('foo') do |file|
+      file.path
+    end
+
+    expect(Puppet::FileSystem::File.new(filename).exist?).to be_false
+  end
+
+  it "unlinks the temporary file even if the block raises an error" do
+    filename = nil
+
+    begin
+      Puppet::FileSystem::Tempfile.open('foo') do |file|
+        filename = file.path
+        raise "error!"
+      end
+    rescue
+    end
+
+    expect(Puppet::FileSystem::File.new(filename).exist?).to be_false
+  end
+end

data/spec/unit/graph/relationship_graph_spec.rb

@@ -165,12 +165,6 @@ describe Puppet::Graph::RelationshipGraph do
       expect(order_resources_traversed_in(relationships)).to(
         include_in_order("Notify[a]", "Notify[b]", "Notify[c]", "Notify[d]"))
     end
-
-    def order_resources_traversed_in(relationships)
-      order_seen = []
-      relationships.traverse { |resource| order_seen << resource.ref }
-      order_seen
-    end
   end
 
   describe "when interrupting traversal" do

data/spec/unit/hiera_puppet_spec.rb

@@ -52,7 +52,7 @@ describe 'HieraPuppet' do
         pending("This example does not apply to Puppet #{Puppet.version} because it does not have this setting")
       end
 
-      File.stubs(:exist?).with(Puppet[:hiera_config]).returns(true)
+      Puppet::FileSystem::File.stubs(:exist?).with(Puppet[:hiera_config]).returns(true)
       HieraPuppet.send(:hiera_config_file).should == Puppet[:hiera_config]
     end
 
@@ -64,7 +64,7 @@ describe 'HieraPuppet' do
       end
       Puppet.settings[:confdir] = "/dev/null/puppet"
       hiera_config = File.join(Puppet[:confdir], 'hiera.yaml')
-      File.stubs(:exist?).with(hiera_config).returns(true)
+      Puppet::FileSystem::File.stubs(:exist?).with(hiera_config).returns(true)
 
       HieraPuppet.send(:hiera_config_file).should == hiera_config
     end

data/spec/unit/indirector/catalog/compiler_spec.rb

@@ -24,12 +24,12 @@ describe Puppet::Resource::Catalog::Compiler do
     end
 
     it "should cache the server metadata and reuse it" do
+      Puppet[:node_terminus] = :memory
+      Puppet::Node.indirection.save(Puppet::Node.new("node1"))
+      Puppet::Node.indirection.save(Puppet::Node.new("node2"))
+
       compiler = Puppet::Resource::Catalog::Compiler.new
-      node1 = stub 'node1', :merge => nil
-      node2 = stub 'node2', :merge => nil
       compiler.stubs(:compile)
-      Puppet::Node.indirection.stubs(:find).with('node1', has_entry(:environment => anything)).returns(node1)
-      Puppet::Node.indirection.stubs(:find).with('node2', has_entry(:environment => anything)).returns(node2)
 
       compiler.find(Puppet::Indirector::Request.new(:catalog, :find, 'node1', nil, :node => 'node1'))
       compiler.find(Puppet::Indirector::Request.new(:catalog, :find, 'node2', nil, :node => 'node2'))
@@ -175,19 +175,16 @@ describe Puppet::Resource::Catalog::Compiler do
   end
 
   describe "when finding nodes" do
-    before do
+    it "should look node information up via the Node class with the provided key" do
       Facter.stubs(:value).returns("whatever")
-      @compiler = Puppet::Resource::Catalog::Compiler.new
-      @name = "me"
-      @node = mock 'node'
-      @request = Puppet::Indirector::Request.new(:catalog, :find, @name, nil)
-      @compiler.stubs(:compile)
-    end
+      node = Puppet::Node.new('node')
+      compiler = Puppet::Resource::Catalog::Compiler.new
+      request = Puppet::Indirector::Request.new(:catalog, :find, "me", nil)
+      compiler.stubs(:compile)
 
-    it "should look node information up via the Node class with the provided key" do
-      @node.stubs :merge
-      Puppet::Node.indirection.expects(:find).with(@name, anything).returns(@node)
-      @compiler.find(@request)
+      Puppet::Node.indirection.expects(:find).with("me", anything).returns(node)
+
+      compiler.find(request)
     end
   end
 
@@ -197,11 +194,10 @@ describe Puppet::Resource::Catalog::Compiler do
       Facter.expects(:value).with('fqdn').returns("my.server.com")
       Facter.expects(:value).with('ipaddress').returns("my.ip.address")
       @compiler = Puppet::Resource::Catalog::Compiler.new
-      @name = "me"
-      @node = mock 'node'
-      @request = Puppet::Indirector::Request.new(:catalog, :find, @name, nil)
+      @node = Puppet::Node.new("me")
+      @request = Puppet::Indirector::Request.new(:catalog, :find, "me", nil)
       @compiler.stubs(:compile)
-      Puppet::Node.indirection.stubs(:find).with(@name, anything).returns(@node)
+      Puppet::Node.indirection.stubs(:find).with("me", anything).returns(@node)
     end
 
     it "should add the server's Puppet version to the node's parameters as 'serverversion'" do

data/spec/unit/indirector/certificate_status/file_spec.rb

@@ -87,16 +87,14 @@ describe "Puppet::Indirector::CertificateStatus::File" do
       retrieved_host.certificate_request.content.to_s.chomp.should == @host.certificate_request.content.to_s.chomp
     end
 
-    it "should return the Puppet::SSL::Host when a public key exist for the host" do
-      pending("porting to Windows", :if => Puppet.features.microsoft_windows?) do
-        generate_signed_cert(@host)
-        request = Puppet::Indirector::Request.new(:certificate_status, :find, "foo", @host)
+    it "should return the Puppet::SSL::Host when a public key exists for the host" do
+      generate_signed_cert(@host)
+      request = Puppet::Indirector::Request.new(:certificate_status, :find, "foo", @host)
 
-        retrieved_host = @terminus.find(request)
+      retrieved_host = @terminus.find(request)
 
-        retrieved_host.name.should == @host.name
-        retrieved_host.certificate.content.to_s.chomp.should == @host.certificate.content.to_s.chomp
-      end
+      retrieved_host.name.should == @host.name
+      retrieved_host.certificate.content.to_s.chomp.should == @host.certificate.content.to_s.chomp
     end
 
     it "should return nil when neither a CSR nor public key exist for the host" do
@@ -122,12 +120,10 @@ describe "Puppet::Indirector::CertificateStatus::File" do
       end
 
       it "should sign the on-disk CSR when it is present" do
-        pending("porting to Windows", :if => Puppet.features.microsoft_windows?) do
-          signed_host = generate_signed_cert(@host)
+        signed_host = generate_signed_cert(@host)
 
-          signed_host.state.should == "signed"
-          Puppet::SSL::Certificate.indirection.find("foobar").should be_instance_of(Puppet::SSL::Certificate)
-        end
+        signed_host.state.should == "signed"
+        Puppet::SSL::Certificate.indirection.find("foobar").should be_instance_of(Puppet::SSL::Certificate)
       end
     end
 
@@ -142,11 +138,9 @@ describe "Puppet::Indirector::CertificateStatus::File" do
       end
 
       it "should revoke the certificate when it is present" do
-        pending("porting to Windows", :if => Puppet.features.microsoft_windows?) do
-          generate_revoked_cert(@host)
+        generate_revoked_cert(@host)
 
-          @host.state.should == 'revoked'
-        end
+        @host.state.should == 'revoked'
       end
     end
   end
@@ -163,39 +157,35 @@ describe "Puppet::Indirector::CertificateStatus::File" do
     end
 
     it "should clean certs, cert requests, keys" do
-      pending("porting to Windows", :if => Puppet.features.microsoft_windows?) do
-        signed_host = Puppet::SSL::Host.new("clean_signed_cert")
-        generate_signed_cert(signed_host)
-        signed_request = Puppet::Indirector::Request.new(:certificate_status, :delete, "clean_signed_cert", signed_host)
-        @terminus.destroy(signed_request).should == "Deleted for clean_signed_cert: Puppet::SSL::Certificate, Puppet::SSL::Key"
-
-        requested_host = Puppet::SSL::Host.new("clean_csr")
-        generate_csr(requested_host)
-        csr_request = Puppet::Indirector::Request.new(:certificate_status, :delete, "clean_csr", requested_host)
-        @terminus.destroy(csr_request).should == "Deleted for clean_csr: Puppet::SSL::CertificateRequest, Puppet::SSL::Key"
-      end
+      signed_host = Puppet::SSL::Host.new("clean_signed_cert")
+      generate_signed_cert(signed_host)
+      signed_request = Puppet::Indirector::Request.new(:certificate_status, :delete, "clean_signed_cert", signed_host)
+      @terminus.destroy(signed_request).should == "Deleted for clean_signed_cert: Puppet::SSL::Certificate, Puppet::SSL::Key"
+
+      requested_host = Puppet::SSL::Host.new("clean_csr")
+      generate_csr(requested_host)
+      csr_request = Puppet::Indirector::Request.new(:certificate_status, :delete, "clean_csr", requested_host)
+      @terminus.destroy(csr_request).should == "Deleted for clean_csr: Puppet::SSL::CertificateRequest, Puppet::SSL::Key"
     end
   end
 
   describe "when searching" do
     it "should return a list of all hosts with certificate requests, signed certs, or revoked certs" do
-      pending("porting to Windows", :if => Puppet.features.microsoft_windows?) do
-        Puppet.settings.use(:main)
+      Puppet.settings.use(:main)
 
-        signed_host = Puppet::SSL::Host.new("signed_host")
-        generate_signed_cert(signed_host)
+      signed_host = Puppet::SSL::Host.new("signed_host")
+      generate_signed_cert(signed_host)
 
-        requested_host = Puppet::SSL::Host.new("requested_host")
-        generate_csr(requested_host)
+      requested_host = Puppet::SSL::Host.new("requested_host")
+      generate_csr(requested_host)
 
-        revoked_host = Puppet::SSL::Host.new("revoked_host")
-        generate_revoked_cert(revoked_host)
+      revoked_host = Puppet::SSL::Host.new("revoked_host")
+      generate_revoked_cert(revoked_host)
 
-        retrieved_hosts = @terminus.search(Puppet::Indirector::Request.new(:certificate_status, :search, "all", signed_host))
+      retrieved_hosts = @terminus.search(Puppet::Indirector::Request.new(:certificate_status, :search, "all", signed_host))
 
-        results = retrieved_hosts.map {|h| [h.name, h.state]}.sort{ |h,i| h[0] <=> i[0] }
-        results.should == [["ca","signed"],["requested_host","requested"],["revoked_host","revoked"],["signed_host","signed"]]
-      end
+      results = retrieved_hosts.map {|h| [h.name, h.state]}.sort{ |h,i| h[0] <=> i[0] }
+      results.should == [["ca","signed"],["requested_host","requested"],["revoked_host","revoked"],["signed_host","signed"]]
     end
   end
 end

data/spec/unit/indirector/data_binding/hiera_spec.rb

@@ -2,8 +2,32 @@ require 'spec_helper'
 require 'puppet/indirector/data_binding/hiera'
 
 describe Puppet::DataBinding::Hiera do
-  it "should be a subclass of the Hiera terminus" do
-    Puppet::DataBinding::Hiera.superclass.should equal(Puppet::Indirector::Hiera)
+  include PuppetSpec::Files
+
+  def write_hiera_config(config_file, datadir)
+    File.open(config_file, 'w') do |f|
+      f.write("---
+        :yaml:
+          :datadir: #{datadir}
+        :hierarchy: ['global', 'invalid']
+        :logger: 'noop'
+        :backends: ['yaml']
+      ")
+    end
+  end
+
+  def request(key)
+    Puppet::Indirector::Request.new(:hiera, :find, key, nil)
+  end
+
+  before do
+    hiera_config_file = tmpfile("hiera.yaml")
+    Puppet.settings[:hiera_config] = hiera_config_file
+    write_hiera_config(hiera_config_file, my_fixture_dir)
+  end
+
+  after do
+    Puppet::DataBinding::Hiera.instance_variable_set(:@hiera, nil)
   end
 
   it "should have documentation" do
@@ -18,4 +42,73 @@ describe Puppet::DataBinding::Hiera do
   it "should have its name set to :hiera" do
     Puppet::DataBinding::Hiera.name.should == :hiera
   end
+  it "should be the default data_binding terminus" do
+    Puppet.settings[:data_binding_terminus].should == :hiera
+  end
+
+  it "should raise an error if we don't have the hiera feature" do
+    Puppet.features.expects(:hiera?).returns(false)
+    lambda { Puppet::DataBinding::Hiera.new }.should raise_error RuntimeError,
+      "Hiera terminus not supported without hiera library"
+  end
+
+  describe "the behavior of the hiera_config method", :if => Puppet.features.hiera? do
+    it "should override the logger and set it to puppet" do
+      Puppet::DataBinding::Hiera.hiera_config[:logger].should == "puppet"
+    end
+
+    context "when the Hiera configuration file does not exist" do
+      let(:path) { File.expand_path('/doesnotexist') }
+
+      before do
+        Puppet.settings[:hiera_config] = path
+      end
+
+      it "should log a warning" do
+        Puppet.expects(:warning).with(
+         "Config file #{path} not found, using Hiera defaults")
+        Puppet::DataBinding::Hiera.hiera_config
+      end
+
+      it "should only configure the logger and set it to puppet" do
+        Puppet.expects(:warning).with(
+         "Config file #{path} not found, using Hiera defaults")
+        Puppet::DataBinding::Hiera.hiera_config.should == { :logger => 'puppet' }
+      end
+    end
+  end
+
+  describe "the behavior of the find method", :if => Puppet.features.hiera? do
+
+    let(:data_binder) { Puppet::DataBinding::Hiera.new }
+
+    it "should support looking up an integer" do
+      data_binder.find(request("integer")).should == 3000
+    end
+
+    it "should support looking up a string" do
+      data_binder.find(request("string")).should == 'apache'
+    end
+
+    it "should support looking up an array" do
+      data_binder.find(request("array")).should == [
+        '0.ntp.puppetlabs.com',
+        '1.ntp.puppetlabs.com',
+      ]
+    end
+
+    it "should support looking up a hash" do
+      data_binder.find(request("hash")).should == {
+        'user'  => 'Hightower',
+        'group' => 'admin',
+        'mode'  => '0644'
+      }
+    end
+
+    it "raises a data binding error if hiera cannot parse the yaml data" do
+      expect do
+        data_binder.find(request('invalid'))
+      end.to raise_error(Puppet::DataBinding::LookupError)
+    end
+  end
 end

data/spec/unit/indirector/direct_file_server_spec.rb

@@ -26,12 +26,12 @@ describe Puppet::Indirector::DirectFileServer do
   describe Puppet::Indirector::DirectFileServer, "when finding a single file" do
 
     it "should return nil if the file does not exist" do
-      FileTest.expects(:exists?).with(@path).returns false
+      Puppet::FileSystem::File.expects(:exist?).with(@path).returns false
       @server.find(@request).should be_nil
     end
 
     it "should return a Content instance created with the full path to the file if the file exists" do
-      FileTest.expects(:exists?).with(@path).returns true
+      Puppet::FileSystem::File.expects(:exist?).with(@path).returns true
       @model.expects(:new).returns(:mycontent)
       @server.find(@request).should == :mycontent
     end
@@ -42,7 +42,7 @@ describe Puppet::Indirector::DirectFileServer do
     before do
       @data = mock 'content'
       @data.stubs(:collect)
-      FileTest.expects(:exists?).with(@path).returns true
+      Puppet::FileSystem::File.expects(:exist?).with(@path).returns true
     end
 
     it "should pass the full path to the instance" do
@@ -61,18 +61,18 @@ describe Puppet::Indirector::DirectFileServer do
 
   describe Puppet::Indirector::DirectFileServer, "when searching for multiple files" do
     it "should return nil if the file does not exist" do
-      FileTest.expects(:exists?).with(@path).returns false
+      Puppet::FileSystem::File.expects(:exist?).with(@path).returns false
       @server.find(@request).should be_nil
     end
 
     it "should use :path2instances from the terminus_helper to return instances if the file exists" do
-      FileTest.expects(:exists?).with(@path).returns true
+      Puppet::FileSystem::File.expects(:exist?).with(@path).returns true
       @server.expects(:path2instances)
       @server.search(@request)
     end
 
     it "should pass the original request to :path2instances" do
-      FileTest.expects(:exists?).with(@path).returns true
+      Puppet::FileSystem::File.expects(:exist?).with(@path).returns true
       @server.expects(:path2instances).with(@request, @path)
       @server.search(@request)
     end

data/spec/unit/indirector/facts/facter_spec.rb

@@ -48,6 +48,9 @@ describe Puppet::Node::Facts::Facter do
     Facter.stubs(:to_hash).returns({})
     @name = "me"
     @request = stub 'request', :key => @name
+    @environment = stub 'environment'
+    @request.stubs(:environment).returns(@environment)
+    @request.environment.stubs(:modules).returns([])
   end
 
   describe Puppet::Node::Facts::Facter, " when finding facts" do
@@ -58,6 +61,15 @@ describe Puppet::Node::Facts::Facter do
       @facter.find(@request)
     end
 
+    it "should include external facts when feature is present" do
+      clear = sequence 'clear'
+      Puppet.features.stubs(:external_facts?).returns(:true)
+      Puppet::Node::Facts::Facter.expects(:setup_external_facts).in_sequence(clear)
+      Puppet::Node::Facts::Facter.expects(:reload_facter).in_sequence(clear)
+      Puppet::Node::Facts::Facter.expects(:load_fact_plugins).in_sequence(clear)
+      @facter.find(@request)
+    end
+
     it "should return a Facts instance" do
       @facter.find(@request).should be_instance_of(Puppet::Node::Facts)
     end
@@ -131,6 +143,20 @@ describe Puppet::Node::Facts::Facter do
     Puppet::Node::Facts::Facter.load_facts_in_dir("mydir")
   end
 
+  it "should include pluginfactdest when loading external facts",
+     :if => Puppet.features.external_facts?, :unless => Puppet.features.microsoft_windows? do
+    Puppet[:pluginfactdest] = "/plugin/dest"
+    @facter.find(@request)
+    Facter::Util::Config.external_facts_dirs.include?("/plugin/dest")
+  end
+
+  it "should include pluginfactdest when loading external facts",
+    :if => Puppet.features.external_facts?, :if => Puppet.features.microsoft_windows? do
+    Puppet[:pluginfactdest] = "/plugin/dest"
+    @facter.find(@request)
+    Facter::Util::Config.external_facts_dirs.include?("C:/plugin/dest")
+  end
+
   describe "when loading fact plugins from disk" do
     let(:one) { File.expand_path("one") }
     let(:two) { File.expand_path("two") }
@@ -160,5 +186,12 @@ describe Puppet::Node::Facts::Facter do
 
       Puppet::Node::Facts::Facter.load_fact_plugins
     end
+
+    it "should include module plugin facts when present", :if => Puppet.features.external_facts? do
+      mod = Puppet::Module.new("mymodule", "#{one}/mymodule", @request.environment)
+      @request.environment.stubs(:modules).returns([mod])
+      @facter.find(@request)
+      Facter::Util::Config.external_facts_dirs.include?("#{one}/mymodule/facts.d")
+    end
   end
 end