puppet 6.0.3-universal-darwin → 6.0.4-universal-darwin

data/spec/unit/provider/nameservice/directoryservice_spec.rb

@@ -17,13 +17,13 @@ end
 
     it "[#6009] should handle nested arrays of members" do
       current = ["foo", "bar", "baz"]
-      desired = "foo,quux,qorp"
+      desired = ["foo", ["quux"], "qorp"]
       group   = 'example'
 
       @resource.stubs(:[]).with(:name).returns(group)
       @resource.stubs(:[]).with(:auth_membership).returns(true)
       @provider.instance_variable_set(:@property_value_cache_hash,
-                                      { :members => current.join(',') })
+                                      { :members => current })
 
       %w{bar baz}.each do |del|
         @provider.expects(:execute).once.

data/spec/unit/provider/package/dnf_spec.rb

@@ -30,6 +30,20 @@ context 'default' do
     Facter.stubs(:value).with(:operatingsystemmajrelease).returns("8675")
     expect(provider_class).to be_default
   end
+
+  it "should not be the default provider on rhel7" do
+      Facter.stubs(:value).with(:osfamily).returns(:redhat)
+      Facter.stubs(:value).with(:operatingsystem).returns(:redhat)
+      Facter.stubs(:value).with(:operatingsystemmajrelease).returns("7")
+      expect(provider_class).to_not be_default
+  end
+
+  it "should be the default provider on rhel8" do
+      Facter.stubs(:value).with(:osfamily).returns(:redhat)
+      Facter.stubs(:value).with(:operatingsystem).returns(:redhat)
+      Facter.stubs(:value).with(:operatingsystemmajrelease).returns("8")
+      expect(provider_class).to be_default
+  end
 end
 
 describe provider_class do

data/spec/unit/type/group_spec.rb

@@ -2,21 +2,8 @@
 require 'spec_helper'
 
 describe Puppet::Type.type(:group) do
-  let(:mock_group_provider) do
-    described_class.provide(:mock_group_provider) do
-      has_features :manages_members
-      mk_resource_methods
-      def create; end
-      def delete; end
-      def exists?; get(:ensure) != :absent; end
-      def flush; end
-      def self.instances; []; end
-    end
-  end
-
-  before(:each) do
+  before do
     @class = Puppet::Type.type(:group)
-    described_class.stubs(:defaultprovider).returns mock_group_provider
   end
 
   it "should have a system_groups feature" do
@@ -83,108 +70,31 @@ describe Puppet::Type.type(:group) do
     expect(type.exists?).to eq(true)
   end
 
-  describe "when managing members" do
-    def stub_property(resource_hash)
-      described_class.new(resource_hash).property(:members)
-    end
-
-    describe "validation" do
-      it "raises an error for a non-String value" do
-        expect {
-          described_class.new(:name => 'foo', :members => true)
-        }.to raise_error(Puppet::Error)
-      end
-
-      it "raises an error for an array value containing a non-String element" do
-        expect {
-          described_class.new(:name => 'foo', :members => [ true, 'foo' ])
-        }.to raise_error(Puppet::Error)
-      end
-
-      it "raises an error when the members are specified as UIDs instead of usernames" do
-        expect {
-          described_class.new(:name => 'foo', :members => [ '123', '456' ])
-        }.to raise_error(Puppet::Error)
-      end
-
-      it "raises an error when an empty string is passed for a member's username" do
-        expect {
-          described_class.new(:name => 'foo', :members => [ 'foo', '' ])
-        }.to raise_error(Puppet::Error)
-      end
-
-      it "passes for a single member" do
-        expect {
-          described_class.new(:name => 'foo', :members => 'foo')
-        }.to_not raise_error
-      end
+  describe "should delegate :members implementation to the provider:"  do
 
-      it "passes for a member whose username has a number" do
-        expect {
-          described_class.new(:name => 'foo', :members => 'foo123')
-        }.to_not raise_error
-      end
+    let (:provider) do
+      @class.provide(:testing) do
+        has_features :manages_members
 
-      it "passes for an array of members" do
-        expect {
-          described_class.new(:name => 'foo', :members => [ 'foo', 'bar' ])
-        }.to_not raise_error
-      end
-
-      it "passes for a comma-separated list of members" do
-        expect {
-          described_class.new(:name => 'foo', :members => 'foo,bar')
-        }.to_not raise_error
+        def members
+          []
+        end
       end
     end
+    let (:provider_instance) { provider.new }
+    let (:type) { @class.new(:name => "group", :provider => provider_instance, :members => ['user1']) }
 
-    describe "#inclusive?" do
-      it "returns false when auth_membership == false" do
-        members_property = stub_property(
-          :name => 'foo',
-          :auth_membership => false,
-          :members => []
-        )
-
-        expect(members_property.inclusive?).to be false
-      end
-
-      it "returns true when auth_membership == true" do
-        members_property = stub_property(
-          :name => 'foo',
-          :auth_membership => true,
-          :members => []
-        )
-
-        expect(members_property.inclusive?).to be true
-      end
+    it "insync? calls members_insync?" do
+      provider_instance.expects(:members_insync?).with(['user1'], ['user1']).returns true
+      expect(type.property(:members).insync?(['user1'])).to be_truthy
     end
 
-    describe "#should= munging the @should instance variable" do
-      def should_var_of(property)
-        property.instance_variable_get(:@should)
-      end
-
-      it "leaves a single member as-is" do
-        members_property = stub_property(:name => 'foo', :members => [])
-        members_property.should = 'foo'
+    it "is_to_s and should_to_s call members_to_s" do
+      provider_instance.expects(:members_to_s).with(['user1', 'user2']).returns "user1 (), user2 ()"
+      provider_instance.expects(:members_to_s).with(['user1']).returns "user1 ()"
 
-        expect(should_var_of(members_property)).to eql([ 'foo' ])
-      end
-
-      it "leaves an array of members as-is" do
-        members_property = stub_property(:name => 'foo', :members => [])
-        members_property.should = [ 'foo', 'bar' ]
-
-        expect(should_var_of(members_property)).to eql(['foo', 'bar'])
-      end
-
-      it "munges a comma-separated list of members into an array" do
-        members_property = stub_property(:name => 'foo', :members => [])
-        members_property.should = 'foo,bar' 
-
-        expect(should_var_of(members_property)).to eql(['foo', 'bar'])
-      end
+      expect(type.property(:members).is_to_s('user1')).to eq('user1 ()')
+      expect(type.property(:members).should_to_s('user1,user2')).to eq('user1 (), user2 ()')
     end
   end
 end

data/spec/unit/util/log/destinations_spec.rb

@@ -54,6 +54,7 @@ describe Puppet::Util::Log.desttypes[:file] do
         it_behaves_like "file destination"
 
         it "logs an error if it can't chown the file owner & group" do
+          File.expects(:exists?).with(abspath).returns(false)
           FileUtils.expects(:chown).with(Puppet[:user], Puppet[:group], abspath).raises(Errno::EPERM)
           Puppet.features.expects(:root?).returns(true)
           Puppet.expects(:err).with("Unable to set ownership to #{Puppet[:user]}:#{Puppet[:group]} for log file: #{abspath}")
@@ -62,11 +63,20 @@ describe Puppet::Util::Log.desttypes[:file] do
         end
 
         it "doesn't attempt to chown when running as non-root" do
+          File.expects(:exists?).with(abspath).returns(false)
           FileUtils.expects(:chown).with(Puppet[:user], Puppet[:group], abspath).never
           Puppet.features.expects(:root?).returns(false)
 
           @class.new(abspath)
         end
+
+        it "doesn't attempt to chown when file already exists" do
+          File.expects(:exists?).with(abspath).returns(true)
+          FileUtils.expects(:chown).with(Puppet[:user], Puppet[:group], abspath).never
+          Puppet.features.expects(:root?).returns(true)
+
+          @class.new(abspath)
+        end
       end
 
       describe "with a JSON file" do

data/spec/unit/util/suidmanager_spec.rb

@@ -121,9 +121,7 @@ describe Puppet::Util::SUIDManager do
       end
     end
 
-    it "should not get or set euid/egid on Windows" do
-      Puppet::Util::Platform.stubs(:windows?).returns false
-
+    it "should not get or set euid/egid on Windows", if: Puppet::Util::Platform.windows? do
       Puppet::Util::SUIDManager.asuser(user[:uid], user[:gid]) {}
 
       expect(xids).to be_empty

data/spec/unit/util/windows/adsi_spec.rb

@@ -433,7 +433,7 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet::Util::Platform.windows? do
           adsi_group.expects(:Remove).with('WinNT://DOMAIN/user1,user')
           adsi_group.expects(:Add).with('WinNT://DOMAIN2/user3,user')
 
-          group.set_members('user2,DOMAIN2\user3')
+          group.set_members(['user2', 'DOMAIN2\user3'])
         end
 
         it "should add the desired_members to an existing group when not inclusive" do
@@ -460,7 +460,7 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet::Util::Platform.windows? do
 
           adsi_group.expects(:Add).with('WinNT://DOMAIN2/user3,user')
 
-          group.set_members('user2,DOMAIN2\user3',false)
+          group.set_members(['user2', 'DOMAIN2\user3'],false)
         end
 
         it "should return immediately when desired_members is nil" do
@@ -492,7 +492,7 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet::Util::Platform.windows? do
           adsi_group.expects(:Remove).with('WinNT://DOMAIN/user1,user')
           adsi_group.expects(:Remove).with('WinNT://testcomputername/user2,user')
 
-          group.set_members('')
+          group.set_members([])
         end
 
         it "should do nothing when desired_members is empty and not inclusive" do
@@ -511,13 +511,13 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet::Util::Platform.windows? do
           adsi_group.expects(:Remove).never
           adsi_group.expects(:Add).never
 
-          group.set_members('',false)
+          group.set_members([],false)
         end
 
         it "should raise an error when a username does not resolve to a SID" do
           expect {
             adsi_group.expects(:Members).returns []
-            group.set_members('foobar')
+            group.set_members(['foobar'])
           }.to raise_error(Puppet::Error, /Could not resolve name: foobar/)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.0.4
 platform: universal-darwin
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -1557,6 +1557,7 @@ files:
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/metadata.json
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseeone.pp
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseezero.pp
+- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee_ws.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/metadata.json
@@ -2753,6 +2754,7 @@ test_files:
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/metadata.json
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseeone.pp
 - spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/types/withuseezero.pp
+- spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee_ws.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/metadata.json