puppet 6.21.1-universal-darwin → 6.22.1-universal-darwin

data/spec/unit/resource/catalog_spec.rb

@@ -205,7 +205,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
     end
 
     it "should set itself as the catalog for each converted resource" do
-      @catalog.vertices.each { |v| expect(v.catalog.object_id).to equal(@catalog.object_id) }
+      @catalog.vertices.each { |v| expect(v.catalog.object_id).to eql(@catalog.object_id) }
     end
 
     # This tests #931.

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

@@ -158,6 +158,12 @@ describe "Puppet::Util::Windows::SID", :if => Puppet::Util::Platform.windows? do
       # this works in French Windows, even though the account is really AUTORITE NT\\Syst\u00E8me
       expect(subject.name_to_principal('NT AUTHORITY\SYSTEM').sid).to eq(sid)
     end
+
+    it "should print a debug message on failures" do
+      expect(Puppet).to receive(:debug).with(/Could not retrieve raw SID bytes from 'NonExistingUser'/)
+      expect(Puppet).to receive(:debug).with(/No mapping between account names and security IDs was done/)
+      subject.name_to_principal('NonExistingUser')
+    end
   end
 
   context "#ads_to_principal" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.21.1
+  version: 6.22.1
 platform: universal-darwin
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -1801,6 +1801,7 @@ files:
 - spec/fixtures/unit/provider/service/smf/svcs_fmri.out
 - spec/fixtures/unit/provider/service/smf/svcs_multiple_fmris.out
 - spec/fixtures/unit/provider/service/systemd/list_unit_files_services
+- spec/fixtures/unit/provider/service/systemd/list_unit_files_services_vendor_preset
 - spec/fixtures/unit/provider/user/aix/aix_passwd_file.out
 - spec/fixtures/unit/reports/tagmail/tagmail_email.conf
 - spec/fixtures/unit/reports/tagmail/tagmail_failers.conf
@@ -1889,10 +1890,8 @@ files:
 - spec/integration/util/windows/user_spec.rb
 - spec/integration/util_spec.rb
 - spec/lib/matchers/containment_matchers.rb
-- spec/lib/matchers/include.rb
 - spec/lib/matchers/include_in_order.rb
 - spec/lib/matchers/include_in_order_spec.rb
-- spec/lib/matchers/include_spec.rb
 - spec/lib/matchers/json.rb
 - spec/lib/matchers/match_tokens2.rb
 - spec/lib/matchers/relationship_graph_matchers.rb
@@ -3071,6 +3070,7 @@ test_files:
 - spec/fixtures/unit/provider/service/smf/svcs_fmri.out
 - spec/fixtures/unit/provider/service/smf/svcs_multiple_fmris.out
 - spec/fixtures/unit/provider/service/systemd/list_unit_files_services
+- spec/fixtures/unit/provider/service/systemd/list_unit_files_services_vendor_preset
 - spec/fixtures/unit/provider/user/aix/aix_passwd_file.out
 - spec/fixtures/unit/reports/tagmail/tagmail_email.conf
 - spec/fixtures/unit/reports/tagmail/tagmail_failers.conf
@@ -3159,10 +3159,8 @@ test_files:
 - spec/integration/util/windows/user_spec.rb
 - spec/integration/util_spec.rb
 - spec/lib/matchers/containment_matchers.rb
-- spec/lib/matchers/include.rb
 - spec/lib/matchers/include_in_order.rb
 - spec/lib/matchers/include_in_order_spec.rb
-- spec/lib/matchers/include_spec.rb
 - spec/lib/matchers/json.rb
 - spec/lib/matchers/match_tokens2.rb
 - spec/lib/matchers/relationship_graph_matchers.rb

data/spec/lib/matchers/include.rb

@@ -1,27 +0,0 @@
-module Matchers; module Include
-  extend RSpec::Matchers::DSL
-
-  matcher :include_in_any_order do |*matchers|
-    match do |enumerable|
-      @not_matched = []
-      expected_as_array.each do |matcher|
-        if enumerable.empty?
-          break
-        end
-
-        if found = enumerable.find { |elem| matcher.matches?(elem) }
-          enumerable = enumerable.reject { |elem| elem == found }
-        else
-          @not_matched << matcher
-        end
-      end
-
-
-      @not_matched.empty? && enumerable.empty?
-    end
-
-    failure_message do |enumerable|
-      "did not match #{@not_matched.collect(&:description).join(', ')} in #{enumerable.inspect}: <#{@not_matched.collect(&:failure_message).join('>, <')}>"
-    end
-  end
-end; end

data/spec/lib/matchers/include_spec.rb

@@ -1,32 +0,0 @@
-require 'spec_helper'
-require 'matchers/include'
-
-describe "include matchers" do
-  include Matchers::Include
-
-  context :include_in_any_order do
-    it "matches an empty list" do
-      expect([]).to include_in_any_order()
-    end
-
-    it "matches a list with a single element" do
-      expect([1]).to include_in_any_order(eq(1))
-    end
-
-    it "does not match when an expected element is missing" do
-      expect([1]).to_not include_in_any_order(eq(2))
-    end
-
-    it "matches a list with 2 elements in a different order from the expectation" do
-      expect([1, 2]).to include_in_any_order(eq(2), eq(1))
-    end
-
-    it "does not match when there are more than just the expected elements" do
-      expect([1, 2]).to_not include_in_any_order(eq(1))
-    end
-
-    it "matches multiple, equal elements when there are multiple, equal exepectations" do
-      expect([1, 1]).to include_in_any_order(eq(1), eq(1))
-    end
-  end
-end