puppet 6.0.10 → 6.1.0

data/spec/unit/confine_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/confine'
@@ -38,26 +39,26 @@ describe Puppet::Confine do
     end
 
     it "should be invalid if any values fail" do
-      allow(@confine).to receive(:pass?).and_return(true)
-      expect(@confine).to receive(:pass?).with("b").and_return(false)
+      @confine.stubs(:pass?).returns true
+      @confine.expects(:pass?).with("b").returns false
       expect(@confine).not_to be_valid
     end
 
     it "should be valid if all values pass" do
-      allow(@confine).to receive(:pass?).and_return(true)
+      @confine.stubs(:pass?).returns true
       expect(@confine).to be_valid
     end
 
     it "should short-cut at the first failing value" do
-      expect(@confine).to receive(:pass?).once.and_return(false)
+      @confine.expects(:pass?).once.returns false
       @confine.valid?
     end
 
     it "should log failing confines with the label and message" do
-      allow(@confine).to receive(:pass?).and_return(false)
-      expect(@confine).to receive(:message).and_return("My message")
-      expect(@confine).to receive(:label).and_return("Mylabel")
-      expect(Puppet).to receive(:debug).with("Mylabel: My message")
+      @confine.stubs(:pass?).returns false
+      @confine.expects(:message).returns "My message"
+      @confine.expects(:label).returns "Mylabel"
+      Puppet.expects(:debug).with("Mylabel: My message")
       @confine.valid?
     end
   end
@@ -66,9 +67,9 @@ describe Puppet::Confine do
     before { @confine = Puppet::Confine.new(%w{a b c d}) }
 
     it "should return an array with the result of the test for each value" do
-      allow(@confine).to receive(:pass?).and_return(true)
-      expect(@confine).to receive(:pass?).with("b").and_return(false)
-      expect(@confine).to receive(:pass?).with("d").and_return(false)
+      @confine.stubs(:pass?).returns true
+      @confine.expects(:pass?).with("b").returns false
+      @confine.expects(:pass?).with("d").returns false
 
       expect(@confine.result).to eq([true, false, true, false])
     end
@@ -77,14 +78,14 @@ describe Puppet::Confine do
   describe "when requiring" do
     it "does not cache failed requires when always_retry_plugins is true" do
       Puppet[:always_retry_plugins] = true
-      expect(Puppet::Confine).to receive(:require).with('puppet/confine/osfamily').twice.and_raise(LoadError)
+      Puppet::Confine.expects(:require).with('puppet/confine/osfamily').twice.raises(LoadError)
       Puppet::Confine.test(:osfamily)
       Puppet::Confine.test(:osfamily)
     end
 
     it "caches failed requires when always_retry_plugins is false" do
       Puppet[:always_retry_plugins] = false
-      expect(Puppet::Confine).to receive(:require).with('puppet/confine/osfamily').once.and_raise(LoadError)
+      Puppet::Confine.expects(:require).with('puppet/confine/osfamily').once.raises(LoadError)
       Puppet::Confine.test(:osfamily)
       Puppet::Confine.test(:osfamily)
     end

data/spec/unit/confiner_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/confiner'
@@ -21,15 +22,15 @@ describe Puppet::Confiner do
   end
 
   it "should delegate its confine method to its confine collection" do
-    coll = double('collection')
-    allow(@object).to receive(:confine_collection).and_return(coll)
-    expect(coll).to receive(:confine).with(:foo => :bar, :bee => :baz)
+    coll = mock 'collection'
+    @object.stubs(:confine_collection).returns coll
+    coll.expects(:confine).with(:foo => :bar, :bee => :baz)
     @object.confine(:foo => :bar, :bee => :baz)
   end
 
   it "should create a new confine collection if one does not exist" do
-    expect(Puppet::ConfineCollection).to receive(:new).with("mylabel").and_return("mycoll")
-    expect(@object).to receive(:to_s).and_return("mylabel")
+    Puppet::ConfineCollection.expects(:new).with("mylabel").returns "mycoll"
+    @object.expects(:to_s).returns "mylabel"
     expect(@object.confine_collection).to eq("mycoll")
   end
 
@@ -39,22 +40,22 @@ describe Puppet::Confiner do
 
   describe "when testing suitability" do
     before do
-      @coll = double('collection')
-      allow(@object).to receive(:confine_collection).and_return(@coll)
+      @coll = mock 'collection'
+      @object.stubs(:confine_collection).returns @coll
     end
 
     it "should return true if the confine collection is valid" do
-      expect(@coll).to receive(:valid?).and_return(true)
+      @coll.expects(:valid?).returns true
       expect(@object).to be_suitable
     end
 
     it "should return false if the confine collection is invalid" do
-      expect(@coll).to receive(:valid?).and_return(false)
+      @coll.expects(:valid?).returns false
       expect(@object).not_to be_suitable
     end
 
     it "should return the summary of the confine collection if a long result is asked for" do
-      expect(@coll).to receive(:summary).and_return("myresult")
+      @coll.expects(:summary).returns "myresult"
       expect(@object.suitable?(false)).to eq("myresult")
     end
   end

data/spec/unit/context/trusted_information_spec.rb

@@ -53,7 +53,7 @@ describe Puppet::Context::TrustedInformation, :unless => RUBY_PLATFORM == 'java'
     end
 
     it "is remote but lacks certificate information when it is authenticated" do
-      expect(Puppet).to receive(:info).once.with("TrustedInformation expected a certificate, but none was given.")
+      Puppet.expects(:info).once.with("TrustedInformation expected a certificate, but none was given.")
 
       trusted = Puppet::Context::TrustedInformation.remote(true, 'cert name', nil)
 

data/spec/unit/daemon_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/daemon'
 require 'puppet/agent'
@@ -27,29 +28,29 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
   end
 
   let(:agent) { Puppet::Agent.new(TestClient.new, false) }
-  let(:server) { double("Server", :start => nil, :wait_for_shutdown => nil) }
+  let(:server) { stub("Server", :start => nil, :wait_for_shutdown => nil) }
 
-  let(:pidfile) { double("PidFile", :lock => true, :unlock => true, :file_path => 'fake.pid') }
+  let(:pidfile) { stub("PidFile", :lock => true, :unlock => true, :file_path => 'fake.pid') }
   let(:scheduler) { RecordingScheduler.new }
 
   let(:daemon) { Puppet::Daemon.new(pidfile, scheduler) }
 
   before(:each) do
-    allow(Signal).to receive(:trap)
-    allow(daemon).to receive(:close_streams).and_return(nil)
+    Signal.stubs(:trap)
+    daemon.stubs(:close_streams).returns nil
   end
 
   it "should reopen the Log logs when told to reopen logs" do
-    expect(Puppet::Util::Log).to receive(:reopen)
+    Puppet::Util::Log.expects(:reopen)
     daemon.reopen_logs
   end
 
   describe "when setting signal traps" do
     [:INT, :TERM].each do |signal|
       it "logs a notice and exits when sent #{signal}" do
-        allow(Signal).to receive(:trap).with(signal).and_yield
-        expect(Puppet).to receive(:notice).with("Caught #{signal}; exiting")
-        expect(daemon).to receive(:stop)
+        Signal.stubs(:trap).with(signal).yields
+        Puppet.expects(:notice).with("Caught #{signal}; exiting")
+        daemon.expects(:stop)
 
         daemon.set_signal_traps
       end
@@ -57,8 +58,8 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
 
     {:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs}.each do |signal, method|
       it "logs a notice and remembers to call #{method} when it receives #{signal}" do
-        allow(Signal).to receive(:trap).with(signal).and_yield
-        expect(Puppet).to receive(:notice).with("Caught #{signal}; storing #{method}")
+        Signal.stubs(:trap).with(signal).yields
+        Puppet.expects(:notice).with("Caught #{signal}; storing #{method}")
 
         daemon.set_signal_traps
 
@@ -69,7 +70,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
 
   describe "when starting" do
     before do
-      allow(daemon).to receive(:set_signal_traps)
+      daemon.stubs(:set_signal_traps)
     end
 
     it "should fail if it has neither agent nor server" do
@@ -77,14 +78,14 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     end
 
     it "should create its pidfile" do
-      expect(pidfile).to receive(:lock).and_return(true)
+      pidfile.expects(:lock).returns(true)
 
       daemon.agent = agent
       daemon.start
     end
 
     it "should fail if it cannot lock" do
-      expect(pidfile).to receive(:lock).and_return(false)
+      pidfile.expects(:lock).returns(false)
       daemon.agent = agent
 
       expect { daemon.start }.to raise_error(RuntimeError, "Could not create PID file: #{pidfile.file_path}")
@@ -93,7 +94,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     it "should start its server if one is configured" do
       daemon.server = server
 
-      expect(server).to receive(:start)
+      server.expects(:start)
 
       daemon.start
     end
@@ -119,7 +120,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     it "waits for the server to shutdown when there is one" do
       daemon.server = server
 
-      expect(server).to receive(:wait_for_shutdown)
+      server.expects(:wait_for_shutdown)
 
       daemon.start
     end
@@ -127,7 +128,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     it "waits for the server to shutdown when there is one" do
       daemon.server = server
 
-      expect(server).to receive(:wait_for_shutdown)
+      server.expects(:wait_for_shutdown)
 
       daemon.start
     end
@@ -135,7 +136,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
 
   describe "when stopping" do
     before do
-      allow(Puppet::Util::Log).to receive(:close_all)
+      Puppet::Util::Log.stubs(:close_all)
       # to make the global safe to mock, set it to a subclass of itself,
       # then restore it in an after pass
       without_warnings { Puppet::Application = Class.new(Puppet::Application) }
@@ -147,7 +148,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     end
 
     it "should stop its server if one is configured" do
-      expect(server).to receive(:stop)
+      server.expects(:stop)
 
       daemon.server = server
 
@@ -155,18 +156,18 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     end
 
     it 'should request a stop from Puppet::Application' do
-      expect(Puppet::Application).to receive(:stop!)
+      Puppet::Application.expects(:stop!)
       expect { daemon.stop }.to exit_with 0
     end
 
     it "should remove its pidfile" do
-      expect(pidfile).to receive(:unlock)
+      pidfile.expects(:unlock)
 
       expect { daemon.stop }.to exit_with 0
     end
 
     it "should close all logs" do
-      expect(Puppet::Util::Log).to receive(:close_all)
+      Puppet::Util::Log.expects(:close_all)
       expect { daemon.stop }.to exit_with 0
     end
 
@@ -185,8 +186,8 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     end
 
     it "should do nothing if the agent is running" do
-      expect(agent).to receive(:run).with({:splay => false}).and_raise(Puppet::LockError, 'Failed to aquire lock')
-      expect(Puppet).to receive(:notice).with('Not triggering already-running agent')
+      agent.expects(:run).with({:splay => false}).raises Puppet::LockError, 'Failed to aquire lock'
+      Puppet.expects(:notice).with('Not triggering already-running agent')
 
       daemon.agent = agent
 
@@ -194,8 +195,8 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     end
 
     it "should run the agent if one is available and it is not running" do
-      expect(agent).to receive(:run).with({:splay => false})
-      expect(Puppet).not_to receive(:notice).with('Not triggering already-running agent')
+      agent.expects(:run).with({:splay => false})
+      Puppet.expects(:notice).with('Not triggering already-running agent').never
 
       daemon.agent = agent
 
@@ -213,21 +214,21 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
     end
 
     it 'should set Puppet::Application.restart!' do
-      expect(Puppet::Application).to receive(:restart!)
-      allow(daemon).to receive(:reexec)
+      Puppet::Application.expects(:restart!)
+      daemon.stubs(:reexec)
       daemon.restart
     end
 
     it "should reexec itself if no agent is available" do
-      expect(daemon).to receive(:reexec)
+      daemon.expects(:reexec)
 
       daemon.restart
     end
 
     it "should reexec itself if the agent is not running" do
-      expect(agent).to receive(:running?).and_return(false)
+      agent.expects(:running?).returns false
       daemon.agent = agent
-      expect(daemon).to receive(:reexec)
+      daemon.expects(:reexec)
 
       daemon.restart
     end
@@ -235,25 +236,25 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
 
   describe "when reexecing it self" do
     before do
-      allow(daemon).to receive(:exec)
-      allow(daemon).to receive(:stop)
+      daemon.stubs(:exec)
+      daemon.stubs(:stop)
     end
 
     it "should fail if no argv values are available" do
-      expect(daemon).to receive(:argv).and_return(nil)
+      daemon.expects(:argv).returns nil
       expect { daemon.reexec }.to raise_error(Puppet::DevError)
     end
 
     it "should shut down without exiting" do
       daemon.argv = %w{foo}
-      expect(daemon).to receive(:stop).with(:exit => false)
+      daemon.expects(:stop).with(:exit => false)
 
       daemon.reexec
     end
 
     it "should call 'exec' with the original executable and arguments" do
       daemon.argv = %w{foo}
-      expect(daemon).to receive(:exec).with($0 + " foo")
+      daemon.expects(:exec).with($0 + " foo")
 
       daemon.reexec
     end

data/spec/unit/data_providers/function_data_provider_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 

data/spec/unit/data_providers/hiera_data_provider_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 

data/spec/unit/datatypes_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 require 'puppet_spec/files'
@@ -283,7 +284,7 @@ describe "Puppet::DataTypes" do
         'position.rb' => <<-RUBY
             module PuppetX; module Mytest; class Position
               attr_reader :x, :y
-
+  
               def initialize(x, y)
                 @x = x
                 @y = y
@@ -310,7 +311,7 @@ describe "Puppet::DataTypes" do
                 PUPPET
 
               load_file('puppetx/mytest/position')
-
+  
               implementation_class PuppetX::Mytest::Position
             end
             RUBY
@@ -336,7 +337,7 @@ describe "Puppet::DataTypes" do
                 PUPPET
 
               load_file('puppetx/mytest/position')
-
+  
               implementation_class PuppetX::Mytest::Position
             end
         RUBY

data/spec/unit/defaults_spec.rb

@@ -5,19 +5,16 @@ describe "Defaults" do
   describe ".default_diffargs" do
     describe "on AIX" do
       before(:each) do
-        allow(Facter).to receive(:value).with(:kernel).and_return("AIX")
+        Facter.stubs(:value).with(:kernel).returns("AIX")
       end
-
       describe "on 5.3" do
         before(:each) do
-          allow(Facter).to receive(:value).with(:kernelmajversion).and_return("5300")
+          Facter.stubs(:value).with(:kernelmajversion).returns("5300")
         end
-
         it "should be empty" do
           expect(Puppet.default_diffargs).to eq("")
         end
       end
-
       [ "",
         nil,
         "6300",
@@ -25,7 +22,7 @@ describe "Defaults" do
       ].each do |kernel_version|
         describe "on kernel version #{kernel_version.inspect}" do
           before(:each) do
-            allow(Facter).to receive(:value).with(:kernelmajversion).and_return(kernel_version)
+            Facter.stubs(:value).with(:kernelmajversion).returns(kernel_version)
           end
 
           it "should be '-u'" do
@@ -34,10 +31,9 @@ describe "Defaults" do
         end
       end
     end
-
     describe "on everything else" do
       before(:each) do
-        allow(Facter).to receive(:value).with(:kernel).and_return("NOT_AIX")
+        Facter.stubs(:value).with(:kernel).returns("NOT_AIX")
       end
 
       it "should be '-u'" do
@@ -66,24 +62,24 @@ describe "Defaults" do
 
   describe '.default_digest_algorithm' do
     it 'defaults to md5 when FIPS is not enabled' do
-      allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(false)
+      Puppet::Util::Platform.stubs(:fips_enabled?).returns false
       expect(Puppet.default_digest_algorithm).to eq('md5')
     end
 
     it 'defaults to sha256 when FIPS is enabled' do
-      allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(true)
+      Puppet::Util::Platform.stubs(:fips_enabled?).returns true
       expect(Puppet.default_digest_algorithm).to eq('sha256')
     end
   end
 
   describe '.supported_checksum_types' do
     it 'defaults to md5, sha256, sha384, sha512, sha224 when FIPS is not enabled' do
-      allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(false)
+      Puppet::Util::Platform.stubs(:fips_enabled?).returns false
       expect(Puppet.default_file_checksum_types).to eq(%w[md5 sha256 sha384 sha512 sha224])
     end
 
     it 'defaults to sha256, sha384, sha512, sha224 when FIPS is enabled' do
-      allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(true)
+      Puppet::Util::Platform.stubs(:fips_enabled?).returns true
       expect(Puppet.default_file_checksum_types).to eq(%w[sha256 sha384 sha512 sha224])
     end
   end
@@ -106,7 +102,7 @@ describe "Defaults" do
     end
 
     it 'raises when setting md5 in FIPS mode' do
-      allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(true)
+      Puppet::Util::Platform.stubs(:fips_enabled?).returns true
       expect {
         Puppet.settings[:supported_checksum_types] = %w[md5]
       }.to raise_error(ArgumentError,
@@ -114,13 +110,26 @@ describe "Defaults" do
     end
   end
 
+  describe 'server vs server_list' do
+    it 'should warn when both settings are set in code' do
+      Puppet.expects(:deprecation_warning).with('Attempted to set both server and server_list. Server setting will not be used.', :SERVER_DUPLICATION)
+      Puppet.settings[:server] = 'test_server'
+      Puppet.settings[:server_list] = ['one', 'two']
+    end
+
+    it 'should warn when both settings are set by command line' do
+      Puppet.expects(:deprecation_warning).with('Attempted to set both server and server_list. Server setting will not be used.', :SERVER_DUPLICATION)
+      Puppet.settings.handlearg("--server_list", "one,two")
+      Puppet.settings.handlearg("--server", "test_server")
+    end
+  end
+
   describe 'manage_internal_file_permissions' do
     describe 'on windows', :if => Puppet::Util::Platform.windows? do
       it 'should default to false' do
         expect(Puppet.settings[:manage_internal_file_permissions]).to be false
       end
     end
-
     describe 'on non-windows', :if => ! Puppet::Util::Platform.windows? do
       it 'should default to true' do
         expect(Puppet.settings[:manage_internal_file_permissions]).to be true
@@ -139,7 +148,7 @@ describe "Defaults" do
       let(:installdir) { 'C:\Program Files\Puppet Labs\Puppet' }
 
       it 'includes user and system modules' do
-        allow(Facter).to receive(:value).with(:env_windows_installdir).and_return(installdir)
+        Facter.stubs(:value).with(:env_windows_installdir).returns(installdir)
 
         expect(
           Puppet.default_basemodulepath
@@ -147,7 +156,7 @@ describe "Defaults" do
       end
 
       it 'includes user modules if installdir fact is missing' do
-        allow(Facter).to receive(:value).with(:env_windows_installdir).and_return(nil)
+        Facter.stubs(:value).with(:env_windows_installdir).returns(nil)
 
         expect(
           Puppet.default_basemodulepath
@@ -167,7 +176,7 @@ describe "Defaults" do
       let(:installdir) { 'C:\Program Files\Puppet Labs\Puppet' }
 
       it 'includes the default vendormoduledir' do
-        allow(Facter).to receive(:value).with(:env_windows_installdir).and_return(installdir)
+        Facter.stubs(:value).with(:env_windows_installdir).returns(installdir)
 
         expect(
           Puppet.default_vendormoduledir
@@ -175,7 +184,7 @@ describe "Defaults" do
       end
 
       it 'is nil if installdir fact is missing' do
-        allow(Facter).to receive(:value).with(:env_windows_installdir).and_return(nil)
+        Facter.stubs(:value).with(:env_windows_installdir).returns(nil)
 
         expect(Puppet.default_vendormoduledir).to be_nil
       end