puppet 3.0.0.rc5 → 3.0.0.rc7

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 #
 module Puppet
-  PUPPETVERSION = '3.0.0-rc5'
+  PUPPETVERSION = '3.0.0-rc7'
 
   def self.version
     @puppet_version || PUPPETVERSION

data/spec/fixtures/hiera.yaml

@@ -0,0 +1,9 @@
+---
+:hierarchy:
+  - %{test_suite}
+  - spec_hiera
+:backends:
+  - yaml
+  - puppet
+:yaml:
+  :datadir: './spec/fixtures'

data/spec/integration/defaults_spec.rb

@@ -107,22 +107,29 @@ describe "Puppet defaults" do
     Puppet.settings.setting(:hostcert).owner.should == Puppet.settings[:user]
   end
 
-  it "should use a bind address of ''" do
-    Puppet.settings.clear
-    Puppet.settings[:bindaddress].should == ""
-  end
-
   [:modulepath, :factpath].each do |setting|
     it "should configure '#{setting}' not to be a file setting, so multi-directory settings are acceptable" do
       Puppet.settings.setting(setting).should be_instance_of(Puppet::Settings::PathSetting)
     end
   end
 
-  it "should add /usr/sbin and /sbin to the path if they're not there" do
-    Puppet::Util.withenv("PATH" => "/usr/bin:/usr/local/bin") do
-      Puppet.settings[:path] = "none" # this causes it to ignore the setting
-      ENV["PATH"].split(File::PATH_SEPARATOR).should be_include("/usr/sbin")
-      ENV["PATH"].split(File::PATH_SEPARATOR).should be_include("/sbin")
+  describe "on a Unix-like platform it", :as_platform => :posix do
+    it "should add /usr/sbin and /sbin to the path if they're not there" do
+      Puppet::Util.withenv("PATH" => "/usr/bin#{File::PATH_SEPARATOR}/usr/local/bin") do
+        Puppet.settings[:path] = "none" # this causes it to ignore the setting
+        ENV["PATH"].split(File::PATH_SEPARATOR).should be_include("/usr/sbin")
+        ENV["PATH"].split(File::PATH_SEPARATOR).should be_include("/sbin")
+      end
+    end
+  end
+
+  describe "on a Windows-like platform it", :as_platform => :windows do
+    it "should not add anything" do
+      path = "c:\\windows\\system32#{File::PATH_SEPARATOR}c:\\windows"
+      Puppet::Util.withenv("PATH" => path) do
+        Puppet.settings[:path] = "none" # this causes it to ignore the setting
+        ENV["PATH"].should == path
+      end
     end
   end
 
@@ -300,7 +307,14 @@ describe "Puppet defaults" do
     end
 
     it "should be set to hiera by default" do
-      Puppet.settings[:data_binding_terminus].should == 'hiera'
+      Puppet.settings[:data_binding_terminus].should == :hiera
+    end
+  end
+
+  describe "agent_catalog_run_lockfile" do
+    it "(#2888) is not a file setting so it is absent from the Settings catalog" do
+      Puppet.settings.setting(:agent_catalog_run_lockfile).should_not be_a_kind_of Puppet::Settings::FileSetting
+      Puppet.settings.setting(:agent_catalog_run_lockfile).should be_a Puppet::Settings::StringSetting
     end
   end
 end

data/spec/integration/faces/ca_spec.rb

@@ -82,6 +82,8 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
   end
 
   context "#fingerprint" do
+    let(:fingerprint_re) { /^\([0-9A-Z]+\) [0-9A-F:]+$/ }
+
     it "should be nil if there is no certificate" do
       subject.fingerprint('random-host').should be_nil
     end
@@ -89,27 +91,20 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
     it "should fingerprint a CSR" do
       given_certificate_requests_for('random-host')
 
-      subject.fingerprint('random-host').should =~ /^[0-9A-F:]+$/
+      subject.fingerprint('random-host').should =~ fingerprint_re
     end
 
     it "should fingerprint a certificate" do
       given_certificates_for('random-host')
 
-      subject.fingerprint('random-host').should =~ /^[0-9A-F:]+$/
+      subject.fingerprint('random-host').should =~ fingerprint_re
     end
 
-    %w{md5 MD5 sha1 ShA1 SHA1 RIPEMD160 sha256 sha512}.each do |digest|
+    %w{md5 MD5 sha1 SHA1 RIPEMD160 sha256 sha512}.each do |digest|
       it "should fingerprint with #{digest.inspect}" do
         given_certificates_for('random-host')
 
-        subject.fingerprint('random-host', :digest => digest).should =~ /^[0-9A-F:]+$/
-      end
-
-      it "should fingerprint with #{digest.to_sym} as a symbol" do
-        given_certificates_for('random-host')
-
-        subject.fingerprint('random-host', :digest => digest.to_sym).
-          should =~ /^[0-9A-F:]+$/
+        subject.fingerprint('random-host', :digest => digest).should =~ fingerprint_re
       end
     end
   end
@@ -228,8 +223,8 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
       subject.revoke('random-host')
 
       found = subject.list(:all => true, :subject => 'random-host')
-      subject.get_action(:list).when_rendering(:console).call(found).
-        should =~ /^- random-host  \([:0-9A-F]+\) \(certificate revoked\)/
+      subject.get_action(:list).when_rendering(:console).call(found, {}).
+        should =~ /^- random-host  \(\w+\) [:0-9A-F]+ \(certificate revoked\)/
     end
   end
 
@@ -260,7 +255,7 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
       subject.list(:signed => true, :subject => 'random-host').should_not == []
 
       subject.destroy('random-host').
-        should == "Deleted for random-host: Puppet::SSL::Certificate, Puppet::SSL::Key"
+        should == "Deleted for random-host: Puppet::SSL::Certificate"
     end
   end
 
@@ -282,7 +277,7 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
 
         context "when_rendering :console" do
           it "should return nothing for #{type.inspect}" do
-            subject.get_action(:list).when_rendering(:console).call(subject.list(type)).should == ""
+            subject.get_action(:list).when_rendering(:console).call(subject.list(type), {}).should == ""
           end
         end
       end
@@ -330,7 +325,7 @@ describe Puppet::Face[:ca, '0.1.0'], :unless => Puppet.features.microsoft_window
             given_certificate_requests_for(*input[0])
             given_certificates_for(*input[1])
 
-            text = subject.get_action(:list).when_rendering(:console).call(subject.list(:all => true))
+            text = subject.get_action(:list).when_rendering(:console).call(subject.list(:all => true), {})
 
             pattern.each do |item|
               text.should =~ item

data/spec/integration/network/server/webrick_spec.rb

@@ -5,19 +5,17 @@ require 'puppet/ssl/certificate_authority'
 require 'socket'
 
 describe Puppet::Network::Server, :unless => Puppet.features.microsoft_windows? do
+  describe "when using webrick" do
   include PuppetSpec::Files
 
-  # This reduces the odds of conflicting port numbers between concurrent runs
-  # of the suite on the same machine dramatically.
-  def port
-    20000 + ($$ % 40000)
-  end
+    # This reduces the odds of conflicting port numbers between concurrent runs
+    # of the suite on the same machine dramatically.
+    let(:port) { 20000 + ($$ % 40000) }
+    let(:handlers) { [:node] }
+    let(:address) { '127.0.0.1' }
 
-  describe "when using webrick" do
     before :each do
-      Puppet[:servertype] = 'webrick'
       Puppet[:server] = '127.0.0.1'
-      @params = { :port => port, :handlers => [ :node ] }
 
       # Get a safe temporary file
       dir = tmpdir("webrick_integration_testing")
@@ -31,46 +29,36 @@ describe Puppet::Network::Server, :unless => Puppet.features.microsoft_windows?
 
       ca = Puppet::SSL::CertificateAuthority.new
       ca.generate(Puppet[:certname]) unless Puppet::SSL::Certificate.indirection.find(Puppet[:certname])
+
+      @server = Puppet::Network::Server.new(address, port, handlers)
     end
 
     after do
-      Puppet.settings.clear
-
       Puppet::SSL::Host.ca_location = :none
     end
 
     describe "before listening" do
       it "should not be reachable at the specified address and port" do
-        lambda { TCPSocket.new('127.0.0.1', port) }.should raise_error
+        expect { TCPSocket.new('127.0.0.1', port) }.to raise_error
       end
     end
 
     describe "when listening" do
       it "should be reachable on the specified address and port" do
-        @server = Puppet::Network::Server.new(@params.merge(:port => port))
         @server.listen
-        lambda { TCPSocket.new('127.0.0.1', port) }.should_not raise_error
-      end
-
-      it "should default to '0.0.0.0' as its bind address" do
-        Puppet.settings.clear
-        Puppet[:servertype] = 'webrick'
-        Puppet[:bindaddress].should == '0.0.0.0'
+        expect { TCPSocket.new('127.0.0.1', port) }.to_not raise_error
       end
 
       it "should use any specified bind address" do
-        Puppet[:bindaddress] = "127.0.0.1"
-        @server = Puppet::Network::Server.new(@params.merge(:port => port))
         @server.stubs(:unlisten) # we're breaking listening internally, so we have to keep it from unlistening
-        @server.send(:http_server).expects(:listen).with { |args| args[:address] == "127.0.0.1" }
+        Puppet::Network::HTTP::WEBrick.any_instance.expects(:listen).with(address, port)
         @server.listen
       end
 
       it "should not allow multiple servers to listen on the same address and port" do
-        @server = Puppet::Network::Server.new(@params.merge(:port => port))
         @server.listen
-        @server2 = Puppet::Network::Server.new(@params.merge(:port => port))
-        lambda { @server2.listen }.should raise_error
+        server2 = Puppet::Network::Server.new(address, port, handlers)
+        expect { server2.listen }.to raise_error
       end
 
       after :each do
@@ -80,10 +68,9 @@ describe Puppet::Network::Server, :unless => Puppet.features.microsoft_windows?
 
     describe "after unlistening" do
       it "should not be reachable on the port and address assigned" do
-        @server = Puppet::Network::Server.new(@params.merge(:port => port))
         @server.listen
         @server.unlisten
-        lambda { TCPSocket.new('127.0.0.1', port) }.should raise_error(Errno::ECONNREFUSED)
+        expect { TCPSocket.new('127.0.0.1', port) }.to raise_error(Errno::ECONNREFUSED)
       end
     end
   end

data/spec/integration/node_spec.rb

@@ -43,12 +43,15 @@ describe Puppet::Node do
     describe "and using the memory terminus" do
       before do
         @name = "me"
-        @old_terminus = Puppet::Node.indirection.terminus_class
         @terminus = Puppet::Node.indirection.terminus(:memory)
         Puppet::Node.indirection.stubs(:terminus).returns @terminus
         @node = Puppet::Node.new(@name)
       end
 
+      after do
+        @terminus.instance_variable_set(:@instances, {})
+      end
+
       it "should find no nodes by default" do
         Puppet::Node.indirection.find(@name).should be_nil
       end

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

@@ -17,7 +17,7 @@ describe "The require function" do
   it "should add a dependency between the 'required' class and our class" do
     @compiler.known_resource_types.add Puppet::Resource::Type.new(:hostclass, "requiredclass")
 
-    @scope.function_require("requiredclass")
+    @scope.function_require(["requiredclass"])
     @scope.resource["require"].should_not be_nil
     ref = @scope.resource["require"].shift
     ref.type.should == "Class"
@@ -28,8 +28,8 @@ describe "The require function" do
     @compiler.known_resource_types.add Puppet::Resource::Type.new(:hostclass, "requiredclass1")
     @compiler.known_resource_types.add Puppet::Resource::Type.new(:hostclass, "requiredclass2")
 
-    @scope.function_require("requiredclass1")
-    @scope.function_require("requiredclass2")
+    @scope.function_require(["requiredclass1"])
+    @scope.function_require(["requiredclass2"])
 
     @scope.resource["require"].should_not be_nil
 

data/spec/integration/parser/undef_param_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+require 'puppet_spec/compiler'
+
+describe "Undefined parameters should be handled so that" do
+  include PuppetSpec::Compiler
+
+  def expect_the_message_to_be(message, node = Puppet::Node.new('the node'))
+    catalog = compile_to_catalog(yield, node)
+    catalog.resource('Notify', 'something')[:message].should == message
+  end
+
+  def expect_puppet_error(message, node = Puppet::Node.new('the node'))
+    expect { compile_to_catalog(yield, node) }.to raise_error(Puppet::Error, message)
+  end
+  before :each do
+    Puppet.expects(:deprecation_warning).never
+  end
+
+  describe "when a value is given as parameter value" do
+    it "it should override the default" do
+      expect_the_message_to_be('2') do <<-MANIFEST
+        node default {
+          include foo
+        }
+        class foo {
+          define a($x=1) { notify { 'something': message => $x }}
+          a {'a': x => 2}
+        }
+        MANIFEST
+      end
+    end
+  end
+
+  describe "when 'undef' is given as parameter value" do
+    it "the value should be set to 'undef'" do
+      expect_the_message_to_be(true) do <<-MANIFEST
+          node default {
+            include foo
+          }
+          class foo {
+            define a($x=1) { notify { 'something': message => $x == undef }}
+            a {'a': x => undef}
+          }
+        MANIFEST
+      end
+    end
+  end
+
+  describe "when no value is given for a parameter" do
+    it "the value should be set to the default" do
+      expect_the_message_to_be('1') do <<-MANIFEST
+          node default {
+            include foo
+          }
+          class foo {
+            define a($x=1) { notify { 'something': message => $x }}
+            a {'a': }
+          }
+        MANIFEST
+      end
+    end
+    it "and the default is set to undef, the value should be set to the default" do
+      expect_the_message_to_be(true) do <<-MANIFEST
+          node default {
+            include foo
+          }
+          class foo {
+            define a($x=undef) { notify { 'something': message => $x == undef}}
+            a {'a': }
+          }
+      MANIFEST
+      end
+    end
+
+    it "and no default is set should fail with error" do
+      expect_puppet_error(/^Must pass x to Foo::A\[a\].*/) do <<-MANIFEST
+          node default {
+            include foo
+          }
+          class foo {
+            define a($x) { notify { 'something': message => $x }}
+            a {'a': }
+          }
+      MANIFEST
+      end
+    end
+  end
+end

data/spec/integration/provider/mount_spec.rb

@@ -5,6 +5,8 @@ require 'puppet/file_bucket/dipper'
 describe "mount provider (integration)", :unless => Puppet.features.microsoft_windows? do
   include PuppetSpec::Files
 
+  family = Facter.value(:osfamily)
+
   def create_fake_fstab(initially_contains_entry)
     File.open(@fake_fstab, 'w') do |f|
       if initially_contains_entry
@@ -19,6 +21,7 @@ describe "mount provider (integration)", :unless => Puppet.features.microsoft_wi
     @current_device = "/dev/disk1s1"
     Puppet::Type.type(:mount).defaultprovider.stubs(:default_target).returns(@fake_fstab)
     Facter.stubs(:value).with(:operatingsystem).returns('Darwin')
+    Facter.stubs(:value).with(:osfamily).returns('Darwin')
     Puppet::Util::ExecutionStub.set do |command, options|
       case command[0]
       when %r{/s?bin/mount}
@@ -107,7 +110,7 @@ describe "mount provider (integration)", :unless => Puppet.features.microsoft_wi
               ["local", "journaled"].each do |options_setting|
                 describe "When setting options => #{options_setting}" do
                   it "should leave the system in the #{expected_final_state ? 'mounted' : 'unmounted'} state, #{expected_fstab_data ? 'with' : 'without'} data in /etc/fstab" do
-                    pending("Solaris: The mock :operatingsystem value does not get changed in lib/puppet/provider/mount/parsed.rb", Facter[:osfamily] == "Solaris")
+                    pending("Solaris: The mock :operatingsystem value does not get changed in lib/puppet/provider/mount/parsed.rb", :if => family == "Solaris")
                     @desired_options = options_setting
                     run_in_catalog(:ensure=>ensure_setting, :options => options_setting)
                     @mounted.should == expected_final_state

data/spec/integration/ssl/certificate_authority_spec.rb

@@ -122,5 +122,23 @@ describe Puppet::SSL::CertificateAuthority, :unless => Puppet.features.microsoft
         $CHILD_STATUS.should == 0
       end
     end
+
+    it "should verify proof of possession when signing certificates" do
+      csr = @host.certificate_request
+      wrong_key = Puppet::SSL::Key.new(@host.name)
+      wrong_key.generate
+
+      csr.content.public_key = wrong_key.content.public_key
+      # The correct key has to be removed so we can save the incorrect one
+      Puppet::SSL::CertificateRequest.indirection.destroy(@host.name)
+      Puppet::SSL::CertificateRequest.indirection.save(csr)
+
+      expect {
+        @ca.sign(@host.name)
+      }.to raise_error(
+        Puppet::SSL::CertificateAuthority::CertificateSigningError,
+        "CSR contains a public key that does not correspond to the signing key"
+      )
+    end
   end
 end

data/spec/lib/puppet_spec/files.rb

@@ -36,10 +36,10 @@ module PuppetSpec::Files
     path
   end
 
-  def tmpfile(name) PuppetSpec::Files.tmpfile(name) end
-  def self.tmpfile(name)
+  def tmpfile(name, dir = nil) PuppetSpec::Files.tmpfile(name, dir) end
+  def self.tmpfile(name, dir = nil)
     # Generate a temporary file, just for the name...
-    source = Tempfile.new(name)
+    source = dir ? Tempfile.new(name, dir) : Tempfile.new(name)
     path = source.path
     source.close!
 

data/spec/lib/puppet_spec/settings.rb

@@ -6,7 +6,6 @@ module PuppetSpec::Settings
   #  to this already very large changeset.
   #  Would be nice to clean this up later.  --cprice 2012-03-20
   TEST_APP_DEFAULT_DEFINITIONS = {
-    :run_mode     => { :default => :test, :desc => "run mode" },
     :name         => { :default => "test", :desc => "name" },
     :logdir       => { :type => :directory, :default => "test", :desc => "logdir" },
     :confdir      => { :type => :directory, :default => "test", :desc => "confdir" },

data/spec/shared_contexts/platform.rb

@@ -12,13 +12,17 @@ shared_context "windows", :as_platform => :windows do
 
   around do |example|
     file_alt_separator = File::ALT_SEPARATOR
+    file_path_separator = File::PATH_SEPARATOR
+
     # prevent Ruby from warning about changing a constant
     with_verbose_disabled do
       File::ALT_SEPARATOR = '\\'
+      File::PATH_SEPARATOR = ';'
     end
     example.run
     with_verbose_disabled do
       File::ALT_SEPARATOR = file_alt_separator
+      File::PATH_SEPARATOR = file_path_separator
     end
   end
 end
@@ -31,13 +35,17 @@ shared_context "posix", :as_platform => :posix do
 
   around do |example|
     file_alt_separator = File::ALT_SEPARATOR
+    file_path_separator = File::PATH_SEPARATOR
+
     # prevent Ruby from warning about changing a constant
     with_verbose_disabled do
       File::ALT_SEPARATOR = nil
+      File::PATH_SEPARATOR = ':'
     end
     example.run
     with_verbose_disabled do
       File::ALT_SEPARATOR = file_alt_separator
+      File::PATH_SEPARATOR = file_path_separator
     end
   end
 end