puppet 5.5.3-universal-darwin → 5.5.6-universal-darwin

data/spec/unit/provider/augeas/augeas_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/util/package'
 
@@ -235,6 +234,50 @@ describe provider_class do
       expect(@provider.process_values(command)).to eq(true)
     end
 
+    it "should return true for an array match with double quotes and spaces" do
+      command = ["values", "fake value", "==   [  \"set\"  ,  \"of\" , \"values\"  ]  "]
+      expect(@provider.process_values(command)).to eq(true)
+    end
+
+    it "should return true for an array match with internally escaped single quotes" do
+      @provider.aug.stubs(:match).returns(["set", "o'values", "here"])
+      @provider.aug.stubs(:get).returns('set').then.returns("o'values").then.returns('here')
+      command = ["values", "fake value", "== [ 'set', 'o\\'values', 'here']"]
+      expect(@provider.process_values(command)).to eq(true)
+    end
+
+    it "should return true for an array match with octal character sequences" do
+      command = ["values", "fake value", "== [\"\\x73et\", \"of\", \"values\"]"]
+      expect(@provider.process_values(command)).to eq(true)
+    end
+
+    it "should return true for an array match with hex character sequences" do
+      command = ["values", "fake value", "== [\"\\163et\", \"of\", \"values\"]"]
+      expect(@provider.process_values(command)).to eq(true)
+    end
+
+    it "should return true for an array match with short unicode escape sequences" do
+      command = ["values", "fake value", "== [\"\\u0073et\", \"of\", \"values\"]"]
+      expect(@provider.process_values(command)).to eq(true)
+    end
+
+    it "should return true for an array match with single character long unicode escape sequences" do
+      command = ["values", "fake value", "== [\"\\u{0073}et\", \"of\", \"values\"]"]
+      expect(@provider.process_values(command)).to eq(true)
+    end
+
+    it "should return true for an array match with multi-character long unicode escape sequences" do
+      command = ["values", "fake value", "== [\"\\u{0073 0065 0074}\", \"of\", \"values\"]"]
+      expect(@provider.process_values(command)).to eq(true)
+    end
+
+    it "should return true for an array match with literal backslashes" do
+      @provider.aug.stubs(:match).returns(["set", "o\\values", "here"])
+      @provider.aug.stubs(:get).returns('set').then.returns("o\\values").then.returns('here')
+      command = ["values", "fake value", "== [ 'set', 'o\\\\values', 'here']"]
+      expect(@provider.process_values(command)).to eq(true)
+    end
+
     it "should return false for an array non match" do
       command = ["values", "fake value", "== ['this', 'should', 'not', 'match']"]
       expect(@provider.process_values(command)).to eq(false)
@@ -249,6 +292,18 @@ describe provider_class do
       command = ["values", "fake value", "!= ['this', 'should', 'not', 'match']"]
       expect(@provider.process_values(command)).to eq(true)
     end
+
+    it "should return true for an array non match with double quotes and spaces" do
+      command = ["values", "fake value", "!=   [  \"this\"  ,  \"should\" ,\"not\",  \"match\"  ]  "]
+      expect(@provider.process_values(command)).to eq(true)
+    end
+
+    it "should return true for an empty array match" do
+      @provider.aug.stubs(:match).returns([])
+      @provider.aug.stubs(:get)
+      command = ["values", "fake value", "== []"]
+      expect(@provider.process_values(command)).to eq(true)
+    end
   end
 
   describe "match filters" do
@@ -294,6 +349,11 @@ describe provider_class do
       expect(@provider.process_match(command)).to eq(true)
     end
 
+    it "should return true for an array match with double quotes and spaces" do
+      command = ["match", "fake value", "==   [  \"set\"  ,  \"of\" , \"values\"  ]  "]
+      expect(@provider.process_match(command)).to eq(true)
+    end
+
     it "should return false for an array non match" do
       command = ["match", "fake value", "== ['this', 'should', 'not', 'match']"]
       expect(@provider.process_match(command)).to eq(false)
@@ -308,6 +368,11 @@ describe provider_class do
       command = ["match", "fake value", "!= ['this', 'should', 'not', 'match']"]
       expect(@provider.process_match(command)).to eq(true)
     end
+
+    it "should return true for an array non match with double quotes and spaces" do
+      command = ["match", "fake value", "!=   [  \"this\"  ,  \"should\" ,\"not\",  \"match\"  ]  "]
+      expect(@provider.process_match(command)).to eq(true)
+    end
   end
 
   describe "need to run" do

data/spec/unit/provider/service/smf_spec.rb

@@ -18,8 +18,6 @@ describe provider_class, :if => Puppet.features.posix? do
 
     FileTest.stubs(:file?).with('/usr/sbin/svcadm').returns true
     FileTest.stubs(:executable?).with('/usr/sbin/svcadm').returns true
-    FileTest.stubs(:file?).with('/usr/sbin/svccfg').returns true
-    FileTest.stubs(:executable?).with('/usr/sbin/svccfg').returns true
     FileTest.stubs(:file?).with('/usr/bin/svcs').returns true
     FileTest.stubs(:executable?).with('/usr/bin/svcs').returns true
     Facter.stubs(:value).with(:operatingsystem).returns('Solaris')
@@ -76,9 +74,9 @@ describe provider_class, :if => Puppet.features.posix? do
       @provider.expects(:svcs).with('-H', '-o', 'state,nstate', "/system/myservice").returns("online\t-")
       @provider.status
     end
-    it "should return absent if svcs can't find the service" do
+    it "should return stopped if svcs can't find the service" do
       @provider.stubs(:svcs).raises(Puppet::ExecutionFailure.new("no svc found"))
-      expect(@provider.status).to eq(:absent)
+      expect(@provider.status).to eq(:stopped)
     end
     it "should return running if online in svcs output" do
       @provider.stubs(:svcs).returns("online\t-")
@@ -168,14 +166,12 @@ describe provider_class, :if => Puppet.features.posix? do
 
   describe "when stopping" do
     it "should execute external command 'svcadm disable /system/myservice'" do
-      @provider.stubs(:status).returns :running
       @provider.expects(:texecute).with(:stop, ["/usr/sbin/svcadm", :disable, '-s', "/system/myservice"], true)
       @provider.expects(:wait).with('offline', 'disabled', 'uninitialized')
       @provider.stop
     end
 
     it "should error if timeout occurs while stopping the service" do
-      @provider.stubs(:status).returns :running
       @provider.expects(:texecute).with(:stop, ["/usr/sbin/svcadm", :disable, '-s', "/system/myservice"], true)
       Timeout.expects(:timeout).with(60).raises(Timeout::Error)
       expect { @provider.stop }.to raise_error Puppet::Error, ('Timed out waiting for /system/myservice to transition states')

data/spec/unit/provider/service/upstart_spec.rb

@@ -34,6 +34,43 @@ describe Puppet::Type.type(:service).provider(:upstart) do
     expect(described_class.default?).to be_truthy
   end
 
+  context "upstart daemon existence confine" do
+    # We have a separate method here because our search for the upstart daemon
+    # confine expects it to be the last confine declared in the upstart provider.
+    # If in the future we add other confines below it or change its order, these
+    # unit tests will fail. Placing knowledge of where this confine is located
+    # in one place makes updating it less painful in case we ever need to do this.
+    def assert_upstart_daemon_existence_confine_is(expected_value)
+      upstart_daemon_existence_confine = provider_class.confine_collection.instance_variable_get(:@confines)[-1]
+      expect(upstart_daemon_existence_confine.valid?).to be(expected_value)
+    end
+
+    let(:initctl_version) { ['/sbin/initctl', 'version', '--quiet'] }
+    before(:each) do
+      # Stub out /sbin/initctl
+      Puppet::Util.stubs(:which).with('/sbin/initctl').returns('/sbin/initctl')
+
+      # Both of our tests are asserting the confine :true block that shells out to
+      # `initctl version --quiet`. Its expression is evaluated at provider load-time.
+      # Hence before each test, we want to reload the upstart provider so that the
+      # confine is re-evaluated.
+      Puppet::Type.type(:service).unprovide(:upstart)
+    end
+
+    it "should return true when the daemon is running" do
+      Puppet::Util::Execution.expects(:execute).with(initctl_version, instance_of(Hash))
+      assert_upstart_daemon_existence_confine_is(true)
+    end
+
+    it "should return false when the daemon is not running" do
+      Puppet::Util::Execution.expects(:execute)
+        .with(initctl_version, instance_of(Hash))
+        .raises(Puppet::ExecutionFailure, "initctl failed!")
+
+      assert_upstart_daemon_existence_confine_is(false)
+    end
+  end
+
   describe "excluding services" do
     it "ignores tty and serial on Redhat systems" do
       Facter.stubs(:value).with(:osfamily).returns('RedHat')

data/spec/unit/settings/autosign_setting_spec.rb

@@ -72,11 +72,11 @@ describe Puppet::Settings::AutosignSetting do
   end
 
   describe "converting the setting to a resource" do
-    it "converts the file path to a file resource" do
+    it "converts the file path to a file resource", :if => !Puppet::Util::Platform.windows? do
       path = File.expand_path('/path/to/autosign.conf')
       settings.stubs(:value).with('autosign', nil, false).returns(path)
       Puppet::FileSystem.stubs(:exist?).with(path).returns true
-      Puppet.stubs(:features).returns(stub(:root? => true, :microsoft_windows? => false))
+      Puppet.features.expects(:root?).returns(true)
 
       setting.mode = '0664'
       setting.owner = 'service'

data/spec/unit/settings/file_setting_spec.rb

@@ -182,12 +182,14 @@ describe Puppet::Settings::FileSetting do
     end
 
     it "should set the mode on the file if a mode is provided as an octal number" do
+      Puppet[:manage_internal_file_permissions] = true
       @file.mode = 0755
 
       expect(@file.to_resource[:mode]).to eq('755')
     end
 
     it "should set the mode on the file if a mode is provided as a string" do
+      Puppet[:manage_internal_file_permissions] = true
       @file.mode = '0755'
 
       expect(@file.to_resource[:mode]).to eq('755')
@@ -202,6 +204,7 @@ describe Puppet::Settings::FileSetting do
     end
 
     it "should set the owner if running as root and the owner is provided" do
+      Puppet[:manage_internal_file_permissions] = true
       Puppet.features.expects(:root?).returns true
       Puppet.features.stubs(:microsoft_windows?).returns false
 
@@ -218,6 +221,7 @@ describe Puppet::Settings::FileSetting do
     end
 
     it "should set the group if running as root and the group is provided" do
+      Puppet[:manage_internal_file_permissions] = true
       Puppet.features.expects(:root?).returns true
       Puppet.features.stubs(:microsoft_windows?).returns false
 
@@ -235,6 +239,7 @@ describe Puppet::Settings::FileSetting do
 
 
     it "should not set owner if not running as root" do
+      Puppet[:manage_internal_file_permissions] = true
       Puppet.features.expects(:root?).returns false
       Puppet.features.stubs(:microsoft_windows?).returns false
       @file.stubs(:owner).returns "foo"
@@ -242,6 +247,7 @@ describe Puppet::Settings::FileSetting do
     end
 
     it "should not set group if not running as root" do
+      Puppet[:manage_internal_file_permissions] = true
       Puppet.features.expects(:root?).returns false
       Puppet.features.stubs(:microsoft_windows?).returns false
       @file.stubs(:group).returns "foo"

data/spec/unit/ssl/certificate_authority_spec.rb

@@ -943,6 +943,7 @@ describe Puppet::SSL::CertificateAuthority do
         end
 
         it "should be deprecated" do
+          Puppet.expects(:deprecation_warning).with(regexp_matches(/Accessing 'cacert' as a setting is deprecated/))
           Puppet.expects(:deprecation_warning).with(regexp_matches(/certificate_is_alive\? is deprecated/))
           @ca.certificate_is_alive?(@cert)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 5.5.3
+  version: 5.5.6
 platform: universal-darwin
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -116,6 +116,7 @@ files:
 - COMMITTERS.md
 - CONTRIBUTING.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - MAINTAINERS
 - README.md
@@ -2704,7 +2705,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: puppet
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Puppet, an automated configuration management tool