puppet 5.0.0 → 6.0.0

data/spec/unit/util/run_mode_spec.rb

@@ -13,7 +13,7 @@ describe Puppet::Util::RunMode do
     @run_mode = Puppet::Util::RunMode.new('fake')
   end
 
-  describe Puppet::Util::UnixRunMode, :unless => Puppet.features.microsoft_windows? do
+  describe Puppet::Util::UnixRunMode, :unless => Puppet::Util::Platform.windows? do
     before do
       @run_mode = Puppet::Util::UnixRunMode.new('fake')
     end
@@ -36,7 +36,7 @@ describe Puppet::Util::RunMode do
         end
       end
 
-      it "fails when asking for the conf_dir as non-root and there is no $HOME", :unless => gte_ruby_2_4 || Puppet.features.microsoft_windows? do
+      it "fails when asking for the conf_dir as non-root and there is no $HOME", :unless => gte_ruby_2_4 || Puppet::Util::Platform.windows? do
         as_non_root do
           without_home do
             expect { @run_mode.conf_dir }.to raise_error ArgumentError, /couldn't find HOME/
@@ -64,7 +64,7 @@ describe Puppet::Util::RunMode do
         end
       end
 
-      it "fails when asking for the code_dir as non-root and there is no $HOME", :unless => gte_ruby_2_4 || Puppet.features.microsoft_windows? do
+      it "fails when asking for the code_dir as non-root and there is no $HOME", :unless => gte_ruby_2_4 || Puppet::Util::Platform.windows? do
         as_non_root do
           without_home do
             expect { @run_mode.code_dir }.to raise_error ArgumentError, /couldn't find HOME/
@@ -82,7 +82,7 @@ describe Puppet::Util::RunMode do
         as_non_root { expect(@run_mode.var_dir).to eq(File.expand_path('~/.puppetlabs/opt/puppet/cache')) }
       end
 
-      it "fails when asking for the var_dir as non-root and there is no $HOME", :unless => gte_ruby_2_4 || Puppet.features.microsoft_windows? do
+      it "fails when asking for the var_dir as non-root and there is no $HOME", :unless => gte_ruby_2_4 || Puppet::Util::Platform.windows? do
         as_non_root do
           without_home do
             expect { @run_mode.var_dir }.to raise_error ArgumentError, /couldn't find HOME/
@@ -103,7 +103,7 @@ describe Puppet::Util::RunMode do
           as_non_root { expect(@run_mode.log_dir).to eq(File.expand_path('~/.puppetlabs/var/log')) }
         end
 
-        it "fails when asking for the log_dir and there is no $HOME", :unless => gte_ruby_2_4 || Puppet.features.microsoft_windows? do
+        it "fails when asking for the log_dir and there is no $HOME", :unless => gte_ruby_2_4 || Puppet::Util::Platform.windows? do
           as_non_root do
             without_home do
               expect { @run_mode.log_dir }.to raise_error ArgumentError, /couldn't find HOME/
@@ -125,7 +125,7 @@ describe Puppet::Util::RunMode do
           as_non_root { expect(@run_mode.run_dir).to eq(File.expand_path('~/.puppetlabs/var/run')) }
         end
 
-        it "fails when asking for the run_dir and there is no $HOME", :unless => gte_ruby_2_4 || Puppet.features.microsoft_windows? do
+        it "fails when asking for the run_dir and there is no $HOME", :unless => gte_ruby_2_4 || Puppet::Util::Platform.windows? do
           as_non_root do
             without_home do
               expect { @run_mode.run_dir }.to raise_error ArgumentError, /couldn't find HOME/
@@ -136,7 +136,7 @@ describe Puppet::Util::RunMode do
     end
   end
 
-  describe Puppet::Util::WindowsRunMode, :if => Puppet.features.microsoft_windows? do
+  describe Puppet::Util::WindowsRunMode, :if => Puppet::Util::Platform.windows? do
     before do
       if not Dir.const_defined? :COMMON_APPDATA
         Dir.const_set :COMMON_APPDATA, "/CommonFakeBase"

data/spec/unit/util/selinux_spec.rb

@@ -77,7 +77,7 @@ describe Puppet::Util::SELinux do
       expect(selinux_label_support?('/mnt/nfs/testfile')).to be_falsey
     end
 
-    it "(#8714) don't follow symlinks when determining file systems", :unless => Puppet.features.microsoft_windows? do
+    it "(#8714) don't follow symlinks when determining file systems", :unless => Puppet::Util::Platform.windows? do
       scratch = Pathname(PuppetSpec::Files.tmpdir('selinux'))
 
       self.stubs(:read_mounts).returns({
@@ -109,7 +109,7 @@ describe Puppet::Util::SELinux do
 
     it "should return nil if lgetfilecon fails" do
       self.expects(:selinux_support?).returns true
-      Selinux.expects(:lgetfilecon).with("/foo").returns -1
+      Selinux.expects(:lgetfilecon).with("/foo").returns(-1)
       expect(get_selinux_current_context("/foo")).to be_nil
     end
   end
@@ -153,7 +153,7 @@ describe Puppet::Util::SELinux do
       fstat = stub 'File::Stat', :mode => 0
       Puppet::FileSystem.expects(:lstat).with('/foo').returns(fstat)
       self.expects(:find_fs).with("/foo").returns "ext3"
-      Selinux.expects(:matchpathcon).with("/foo", 0).returns -1
+      Selinux.expects(:matchpathcon).with("/foo", 0).returns(-1)
 
       expect(get_selinux_default_context("/foo")).to be_nil
     end

data/spec/unit/util/storage_spec.rb

@@ -165,6 +165,18 @@ describe Puppet::Util::Storage do
 
         Puppet::Util::Storage.load
       end
+
+      it 'should load Time and Symbols' do
+        state = {
+          'File[/etc/puppetlabs/puppet]' =>
+          { :checked => Time.new('2018-08-08 15:28:25.546999000 -07:00') }
+        }
+        write_state_file(YAML.dump(state))
+
+        Puppet::Util::Storage.load
+
+        expect(Puppet::Util::Storage.state).to eq(state.dup)
+      end
     end
   end
 
@@ -188,7 +200,7 @@ describe Puppet::Util::Storage do
       Dir.mkdir(Puppet[:statefile])
       Puppet::Util::Storage.cache(:yayness)
 
-      if Puppet.features.microsoft_windows?
+      if Puppet::Util::Platform.windows?
         expect { Puppet::Util::Storage.store }.to raise_error do |error|
           expect(error).to be_a(Puppet::Util::Windows::Error)
           expect(error.code).to eq(5) # ERROR_ACCESS_DENIED

data/spec/unit/util/suidmanager_spec.rb

@@ -40,7 +40,7 @@ describe Puppet::Util::SUIDManager do
 
   describe "#asuser" do
     it "should not get or set euid/egid when not root" do
-      Puppet.features.stubs(:microsoft_windows?).returns(false)
+      Puppet::Util::Platform.stubs(:windows?).returns false
       Process.stubs(:uid).returns(1)
 
       Process.stubs(:egid).returns(51)
@@ -54,7 +54,7 @@ describe Puppet::Util::SUIDManager do
     context "when root and not windows" do
       before :each do
         Process.stubs(:uid).returns(0)
-        Puppet.features.stubs(:microsoft_windows?).returns(false)
+        Puppet::Util::Platform.stubs(:windows?).returns false
       end
 
       it "should set euid/egid" do
@@ -122,7 +122,7 @@ describe Puppet::Util::SUIDManager do
     end
 
     it "should not get or set euid/egid on Windows" do
-      Puppet.features.stubs(:microsoft_windows?).returns true
+      Puppet::Util::Platform.stubs(:windows?).returns false
 
       Puppet::Util::SUIDManager.asuser(user[:uid], user[:gid]) {}
 
@@ -234,7 +234,7 @@ describe Puppet::Util::SUIDManager do
     describe "on POSIX systems" do
       before :each do
         Puppet.features.stubs(:posix?).returns(true)
-        Puppet.features.stubs(:microsoft_windows?).returns(false)
+        Puppet::Util::Platform.stubs(:windows?).returns false
       end
 
       it "should be root if uid is 0" do
@@ -250,7 +250,7 @@ describe Puppet::Util::SUIDManager do
       end
     end
 
-    describe "on Microsoft Windows", :if => Puppet.features.microsoft_windows? do
+    describe "on Microsoft Windows", :if => Puppet::Util::Platform.windows? do
       it "should be root if user is privileged" do
         Puppet::Util::Windows::User.stubs(:admin?).returns true
 

data/spec/unit/util/tag_set_spec.rb

@@ -20,7 +20,7 @@ describe Puppet::Util::TagSet do
     array = ['a', :b, 1, 5.4]
     set.merge(array)
 
-    expect(Set.new(YAML.load(set.to_yaml))).to eq(Set.new(array))
+    expect(Set.new(Puppet::Util::Yaml.safe_load(set.to_yaml, [Symbol, Puppet::Util::TagSet]))).to eq(Set.new(array))
   end
 
   it 'deserializes from a yaml array' do
@@ -43,4 +43,11 @@ describe Puppet::Util::TagSet do
 
     expect(set.join(', ')).to be_one_of('a, b', 'b, a')
   end
+
+  it 'raises when deserializing unacceptable objects' do
+    yaml = [Object.new].to_yaml
+    expect {
+      Puppet::Util::TagSet.from_yaml(yaml)
+    }.to raise_error(Puppet::Util::Yaml::YamlLoadError, /Tried to load unspecified class: Object/)
+  end
 end

data/spec/unit/util/tagging_spec.rb

@@ -1,4 +1,5 @@
 #! /usr/bin/env ruby
+# coding: utf-8
 require 'spec_helper'
 
 require 'puppet/util/tagging'
@@ -11,13 +12,6 @@ describe Puppet::Util::Tagging do
     expect(tagger.tags).to include("one")
   end
 
-  it "should return a duplicate of the tag list, rather than the original" do
-    tagger.tag("one")
-    tags = tagger.tags
-    tags << "two"
-    expect(tagger.tags).to_not include("two")
-  end
-
   it "should add all provided tags to the tag list" do
     tagger.tag("one", "two")
     expect(tagger.tags).to include("one")
@@ -97,11 +91,25 @@ describe Puppet::Util::Tagging do
     "\"",
     "'",
   ].each do |char|
-    it "should not allow UTF-8 punctuation characters" do
+    it "should not allow UTF-8 punctuation characters, e.g. #{char}" do
       expect { tagger.tag(char) }.to raise_error(Puppet::ParseError)
     end
   end
 
+  it "should allow encodings that can be coerced to UTF-8" do
+     chinese = "標記你是它".force_encoding(Encoding::UTF_8)
+     ascii   = "tags--".force_encoding(Encoding::ASCII_8BIT)
+     jose    = "jos\xE9".force_encoding(Encoding::ISO_8859_1)
+
+     [chinese, ascii, jose].each do |tag|
+       expect(tagger.valid_tag?(tag)).to be_truthy
+     end
+  end
+
+  it "should not allow strings that cannot be converted to UTF-8" do
+    invalid = "\xA0".force_encoding(Encoding::ASCII_8BIT)
+    expect(tagger.valid_tag?(invalid)).to be_falsey
+  end
 
   it "should add qualified classes as tags" do
     tagger.tag("one::two")
@@ -158,6 +166,17 @@ describe Puppet::Util::Tagging do
       tagger.tag("my-tag")
       expect(tagger).to be_tagged("my-tag")
     end
+
+    it 'skips undef /nil tags' do
+      tagger.tag('before')
+      tagger.tag(nil)
+      tagger.tag('after')
+      expect(tagger).to_not be_tagged(nil)
+      expect(tagger).to_not be_tagged('')
+      expect(tagger).to_not be_tagged('undef')
+      expect(tagger).to be_tagged('before')
+      expect(tagger).to be_tagged('after')
+    end
   end
 
   context "when querying if tagged" do

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

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'puppet/util/windows'
 
-describe "Puppet::Util::Windows::AccessControlEntry", :if => Puppet.features.microsoft_windows? do
+describe "Puppet::Util::Windows::AccessControlEntry", :if => Puppet::Util::Platform.windows? do
   let(:klass) { Puppet::Util::Windows::AccessControlEntry }
   let(:sid) { 'S-1-5-18' }
   let(:mask) { Puppet::Util::Windows::File::FILE_ALL_ACCESS }

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

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'puppet/util/windows'
 
-describe "Puppet::Util::Windows::AccessControlList", :if => Puppet.features.microsoft_windows? do
+describe "Puppet::Util::Windows::AccessControlList", :if => Puppet::Util::Platform.windows? do
   let(:klass) { Puppet::Util::Windows::AccessControlList }
   let(:system_sid) { 'S-1-5-18' }
   let(:admins_sid) { 'S-1-5-544' }

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

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 require 'puppet/util/windows'
 
-describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows? do
+describe Puppet::Util::Windows::ADSI, :if => Puppet::Util::Platform.windows? do
   let(:connection) { stub 'connection' }
   let(:builtin_localized) { Puppet::Util::Windows::SID.sid_to_name('S-1-5-32') }
   # SYSTEM is special as English can retrieve it via Windows API
@@ -102,18 +102,18 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
       user = Puppet::Util::Windows::ADSI::User.create(username)
 
       expect(user).to be_a(Puppet::Util::Windows::ADSI::User)
-      expect(user.native_user).to eq(adsi_user)
+      expect(user.native_object).to eq(adsi_user)
     end
 
     it "should be able to check the existence of a user" do
-      Puppet::Util::Windows::SID.expects(:name_to_sid_object).with(username).returns nil
+      Puppet::Util::Windows::SID.expects(:name_to_principal).with(username).returns nil
       Puppet::Util::Windows::ADSI.expects(:connect).with("WinNT://./#{username},user").returns connection
       connection.expects(:Class).returns('User')
       expect(Puppet::Util::Windows::ADSI::User.exists?(username)).to be_truthy
     end
 
     it "should be able to check the existence of a domain user" do
-      Puppet::Util::Windows::SID.expects(:name_to_sid_object).with("#{domain}\\#{username}").returns nil
+      Puppet::Util::Windows::SID.expects(:name_to_principal).with("#{domain}\\#{username}").returns nil
       Puppet::Util::Windows::ADSI.expects(:connect).with("WinNT://#{domain}/#{username},user").returns connection
       connection.expects(:Class).returns('User')
       expect(Puppet::Util::Windows::ADSI::User.exists?(domain_username)).to be_truthy
@@ -152,10 +152,10 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
       wmi_users = [stub('WMI', :name => name)]
       Puppet::Util::Windows::ADSI.expects(:execquery).with('select name from win32_useraccount where localaccount = "TRUE"').returns(wmi_users)
 
-      native_user = stub('IADsUser')
+      native_object = stub('IADsUser')
       homedir = "C:\\Users\\#{name}"
-      native_user.expects(:Get).with('HomeDirectory').returns(homedir)
-      Puppet::Util::Windows::ADSI.expects(:connect).with("WinNT://./#{name},user").returns(native_user)
+      native_object.expects(:Get).with('HomeDirectory').returns(homedir)
+      Puppet::Util::Windows::ADSI.expects(:connect).with("WinNT://./#{name},user").returns(native_object)
 
       users = Puppet::Util::Windows::ADSI::User.to_a
       expect(users.length).to eq(1)
@@ -213,7 +213,7 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
       end
 
       it "should generate the correct URI" do
-        Puppet::Util::Windows::SID.stubs(:octet_string_to_sid_object).returns(sid)
+        Puppet::Util::Windows::SID.stubs(:octet_string_to_principal).returns(sid)
         expect(user.uri).to eq("WinNT://testcomputername/#{username},user")
       end
 
@@ -276,8 +276,8 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
       let(:someone_sid){ stub(:account => 'someone', :domain => 'testcomputername')}
 
       describe "should be able to use SID objects" do
-        let(:system)     { Puppet::Util::Windows::SID.name_to_sid_object('SYSTEM') }
-        let(:invalid)    { Puppet::Util::Windows::SID.name_to_sid_object('foobar') }
+        let(:system)     { Puppet::Util::Windows::SID.name_to_principal('SYSTEM') }
+        let(:invalid)    { Puppet::Util::Windows::SID.name_to_principal('foobar') }
 
         it "to add a member" do
           adsi_group.expects(:Add).with("WinNT://S-1-5-18")
@@ -303,11 +303,14 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
       it "should provide its groups as a list of names" do
         names = ['user1', 'user2']
 
-        users = names.map { |name| stub('user', :Name => name) }
+        users = names.map { |name| stub('user', :Name => name, :objectSID => name, :ole_respond_to? => true) }
 
         adsi_group.expects(:Members).returns(users)
 
-        expect(group.members).to match(names)
+        Puppet::Util::Windows::SID.expects(:octet_string_to_principal).with('user1').returns(stub(:domain_account => 'HOSTNAME\user1'))
+        Puppet::Util::Windows::SID.expects(:octet_string_to_principal).with('user2').returns(stub(:domain_account => 'HOSTNAME\user2'))
+
+        expect(group.members.map(&:domain_account)).to match(['HOSTNAME\user1', 'HOSTNAME\user2'])
       end
 
       context "calling .set_members" do
@@ -320,16 +323,16 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
           ]
 
           # use stubbed objectSid on member to return stubbed SID
-          Puppet::Util::Windows::SID.expects(:octet_string_to_sid_object).with([0]).returns(sids[0])
-          Puppet::Util::Windows::SID.expects(:octet_string_to_sid_object).with([1]).returns(sids[1])
+          Puppet::Util::Windows::SID.expects(:octet_string_to_principal).with([0]).returns(sids[0])
+          Puppet::Util::Windows::SID.expects(:octet_string_to_principal).with([1]).returns(sids[1])
 
-          Puppet::Util::Windows::SID.expects(:name_to_sid_object).with('user2').returns(sids[1])
-          Puppet::Util::Windows::SID.expects(:name_to_sid_object).with('DOMAIN2\user3').returns(sids[2])
+          Puppet::Util::Windows::SID.expects(:name_to_principal).with('user2').returns(sids[1])
+          Puppet::Util::Windows::SID.expects(:name_to_principal).with('DOMAIN2\user3').returns(sids[2])
 
           Puppet::Util::Windows::ADSI.expects(:sid_uri).with(sids[0]).returns("WinNT://DOMAIN/user1,user")
           Puppet::Util::Windows::ADSI.expects(:sid_uri).with(sids[2]).returns("WinNT://DOMAIN2/user3,user")
 
-          members = names.each_with_index.map{|n,i| stub(:Name => n, :objectSID => [i])}
+          members = names.each_with_index.map{|n,i| stub(:Name => n, :objectSID => [i], :ole_respond_to? => true)}
           adsi_group.expects(:Members).returns members
 
           adsi_group.expects(:Remove).with('WinNT://DOMAIN/user1,user')
@@ -347,15 +350,15 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
           ]
 
           # use stubbed objectSid on member to return stubbed SID
-          Puppet::Util::Windows::SID.expects(:octet_string_to_sid_object).with([0]).returns(sids[0])
-          Puppet::Util::Windows::SID.expects(:octet_string_to_sid_object).with([1]).returns(sids[1])
+          Puppet::Util::Windows::SID.expects(:octet_string_to_principal).with([0]).returns(sids[0])
+          Puppet::Util::Windows::SID.expects(:octet_string_to_principal).with([1]).returns(sids[1])
 
-          Puppet::Util::Windows::SID.expects(:name_to_sid_object).with('user2').returns(sids[1])
-          Puppet::Util::Windows::SID.expects(:name_to_sid_object).with('DOMAIN2\user3').returns(sids[2])
+          Puppet::Util::Windows::SID.expects(:name_to_principal).with('user2').returns(sids[1])
+          Puppet::Util::Windows::SID.expects(:name_to_principal).with('DOMAIN2\user3').returns(sids[2])
 
           Puppet::Util::Windows::ADSI.expects(:sid_uri).with(sids[2]).returns("WinNT://DOMAIN2/user3,user")
 
-          members = names.each_with_index.map{|n,i| stub(:Name => n, :objectSID => [i])}
+          members = names.each_with_index.map{|n,i| stub(:Name => n, :objectSID => [i], :ole_respond_to? => true)}
           adsi_group.expects(:Members).returns members
 
           adsi_group.expects(:Remove).with('WinNT://DOMAIN/user1,user').never
@@ -382,13 +385,13 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
           ]
 
           # use stubbed objectSid on member to return stubbed SID
-          Puppet::Util::Windows::SID.expects(:octet_string_to_sid_object).with([0]).returns(sids[0])
-          Puppet::Util::Windows::SID.expects(:octet_string_to_sid_object).with([1]).returns(sids[1])
+          Puppet::Util::Windows::SID.expects(:octet_string_to_principal).with([0]).returns(sids[0])
+          Puppet::Util::Windows::SID.expects(:octet_string_to_principal).with([1]).returns(sids[1])
 
           Puppet::Util::Windows::ADSI.expects(:sid_uri).with(sids[0]).returns("WinNT://DOMAIN/user1,user")
           Puppet::Util::Windows::ADSI.expects(:sid_uri).with(sids[1]).returns("WinNT://testcomputername/user2,user")
 
-          members = names.each_with_index.map{|n,i| stub(:Name => n, :objectSID => [i])}
+          members = names.each_with_index.map{|n,i| stub(:Name => n, :objectSID => [i], :ole_respond_to? => true)}
           adsi_group.expects(:Members).returns members
 
           adsi_group.expects(:Remove).with('WinNT://DOMAIN/user1,user')
@@ -404,10 +407,10 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
               stub(:account => 'user2', :domain => 'testcomputername', :sid => 2 ),
           ]
           # use stubbed objectSid on member to return stubbed SID
-          Puppet::Util::Windows::SID.expects(:octet_string_to_sid_object).with([0]).returns(sids[0])
-          Puppet::Util::Windows::SID.expects(:octet_string_to_sid_object).with([1]).returns(sids[1])
+          Puppet::Util::Windows::SID.expects(:octet_string_to_principal).with([0]).returns(sids[0])
+          Puppet::Util::Windows::SID.expects(:octet_string_to_principal).with([1]).returns(sids[1])
 
-          members = names.each_with_index.map{|n,i| stub(:Name => n, :objectSID => [i])}
+          members = names.each_with_index.map{|n,i| stub(:Name => n, :objectSID => [i], :ole_respond_to? => true)}
           adsi_group.expects(:Members).returns members
 
           adsi_group.expects(:Remove).never
@@ -428,7 +431,7 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
         adsi_group.expects(:objectSID).returns([0])
         Socket.expects(:gethostname).returns('TESTcomputerNAME')
         computer_sid = stub(:account => groupname,:domain => 'testcomputername')
-        Puppet::Util::Windows::SID.expects(:octet_string_to_sid_object).with([0]).returns(computer_sid)
+        Puppet::Util::Windows::SID.expects(:octet_string_to_principal).with([0]).returns(computer_sid)
         expect(group.uri).to eq("WinNT://./#{groupname},group")
       end
     end
@@ -454,11 +457,11 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
       group = Puppet::Util::Windows::ADSI::Group.create(groupname)
 
       expect(group).to be_a(Puppet::Util::Windows::ADSI::Group)
-      expect(group.native_group).to eq(adsi_group)
+      expect(group.native_object).to eq(adsi_group)
     end
 
     it "should be able to confirm the existence of a group" do
-      Puppet::Util::Windows::SID.expects(:name_to_sid_object).with(groupname).returns nil
+      Puppet::Util::Windows::SID.expects(:name_to_principal).with(groupname).returns nil
       Puppet::Util::Windows::ADSI.expects(:connect).with("WinNT://./#{groupname},group").returns connection
       connection.expects(:Class).returns('Group')
 
@@ -499,14 +502,15 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
       wmi_groups = [stub('WMI', :name => name)]
       Puppet::Util::Windows::ADSI.expects(:execquery).with('select name from win32_group where localaccount = "TRUE"').returns(wmi_groups)
 
-      native_group = stub('IADsGroup')
-      native_group.expects(:Members).returns([stub(:Name => 'Administrator')])
-      Puppet::Util::Windows::ADSI.expects(:connect).with("WinNT://./#{name},group").returns(native_group)
+      native_object = stub('IADsGroup')
+      Puppet::Util::Windows::SID.expects(:octet_string_to_principal).with([]).returns(stub(:domain_account => '.\Administrator'))
+      native_object.expects(:Members).returns([stub(:Name => 'Administrator', :objectSID => [], :ole_respond_to? => true)])
+      Puppet::Util::Windows::ADSI.expects(:connect).with("WinNT://./#{name},group").returns(native_object)
 
       groups = Puppet::Util::Windows::ADSI::Group.to_a
       expect(groups.length).to eq(1)
       expect(groups[0].name).to eq(name)
-      expect(groups[0].members).to eq(['Administrator'])
+      expect(groups[0].members.map(&:domain_account)).to eq(['.\Administrator'])
     end
   end
 

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

@@ -3,7 +3,11 @@
 
 require 'spec_helper'
 
-describe "FFI::MemoryPointer", :if => Puppet.features.microsoft_windows? do
+describe "FFI::MemoryPointer", :if => Puppet::Util::Platform.windows? do
+  # use 2 bad bytes at end so we have even number of bytes / characters
+  let (:bad_string) { "hello invalid world".encode(Encoding::UTF_16LE) + "\xDD\xDD".force_encoding(Encoding::UTF_16LE) }
+  let (:bad_string_bytes) { bad_string.bytes.to_a }
+
   context "read_wide_string" do
     let (:string) { "foo_bar" }
 
@@ -24,6 +28,40 @@ describe "FFI::MemoryPointer", :if => Puppet.features.microsoft_windows? do
 
       expect(read_string.encoding).to eq(Encoding::UTF_8)
     end
+
+    it "should raise an error and emit a debug message when receiving a string containing invalid bytes in the destination encoding" do
+      # enable a debug output sink to local string array
+      Puppet.debug = true
+      arraydest = []
+      Puppet::Util::Log.newdestination(Puppet::Test::LogCollector.new(arraydest))
+
+      read_string = nil
+
+      expect {
+        FFI::MemoryPointer.new(:byte, bad_string_bytes.count) do |ptr|
+          # uchar here is synonymous with byte
+          ptr.put_array_of_uchar(0, bad_string_bytes)
+
+          read_string = ptr.read_wide_string(bad_string.length)
+        end
+      }.to raise_error(Encoding::InvalidByteSequenceError)
+
+      expect(read_string).to be_nil
+      expect(arraydest.last.message).to eq("Unable to convert value #{bad_string.dump} to encoding UTF-8 due to #<Encoding::InvalidByteSequenceError: \"\\xDD\\xDD\" on UTF-16LE>")
+    end
+
+    it "should not raise an error when receiving a string containing invalid bytes in the destination encoding, when specifying :invalid => :replace" do
+      read_string = nil
+
+      FFI::MemoryPointer.new(:byte, bad_string_bytes.count) do |ptr|
+        # uchar here is synonymous with byte
+        ptr.put_array_of_uchar(0, bad_string_bytes)
+
+        read_string = ptr.read_wide_string(bad_string.length, Encoding::UTF_8, :invalid => :replace)
+      end
+
+      expect(read_string).to eq("hello invalid world\uFFFD")
+    end
   end
 
   context "read_arbitrary_wide_string_up_to" do
@@ -66,5 +104,18 @@ describe "FFI::MemoryPointer", :if => Puppet.features.microsoft_windows? do
 
       expect(read_string.encoding).to eq(Encoding::UTF_8)
     end
+
+    it "should not raise an error when receiving a string containing invalid bytes in the destination encoding, when specifying :invalid => :replace" do
+      read_string = nil
+
+      FFI::MemoryPointer.new(:byte, bad_string_bytes.count) do |ptr|
+        # uchar here is synonymous with byte
+        ptr.put_array_of_uchar(0, bad_string_bytes)
+
+        read_string = ptr.read_arbitrary_wide_string_up_to(ptr.size / 2, :single_null, :invalid => :replace)
+      end
+
+      expect(read_string).to eq("hello invalid world\uFFFD")
+    end
   end
 end

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

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 require 'puppet/util/windows'
 
-describe Puppet::Util::Windows::EventLog, :if => Puppet.features.microsoft_windows? do
+describe Puppet::Util::Windows::EventLog, :if => Puppet::Util::Platform.windows? do
 
   before(:each) { @event_log = Puppet::Util::Windows::EventLog.new }
   after(:each) { @event_log.close }

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

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'puppet/util/windows'
 
-describe "Puppet::Util::Windows::SecurityDescriptor", :if => Puppet.features.microsoft_windows? do
+describe "Puppet::Util::Windows::SecurityDescriptor", :if => Puppet::Util::Platform.windows? do
   let(:system_sid) { Puppet::Util::Windows::SID::LocalSystem }
   let(:admins_sid) { Puppet::Util::Windows::SID::BuiltinAdministrators }
   let(:group_sid) { Puppet::Util::Windows::SID::Nobody }