puppet 4.10.12-universal-darwin → 5.0.0-universal-darwin

data/spec/integration/parser/dynamic_scoping_spec.rb

@@ -5,7 +5,6 @@ require 'puppet_spec/compiler'
 require 'puppet_spec/pops'
 require 'puppet_spec/scope'
 require 'matchers/resource'
-require 'rgen/metamodel_builder'
 
 # These tests are in a separate file since othr compiler related tests have
 # been dramatically changed between 3.x and 4.x and it is a pain to merge

data/spec/integration/parser/pcore_resource_spec.rb

@@ -219,7 +219,7 @@ describe 'when pcore described resources types are in use' do
       generate_and_in_a_compilers_context do |compiler|
         t1 = find_resource_type(compiler.topscope, 'test1')
         expect(t1.title_patterns.size).to be(1)
-        expect(t1.title_patterns[0][0]).to eql(/(?m-ix:(.*))/)
+        expect(t1.title_patterns[0][0]).to eql(/(.*)/m)
       end
     end
 

data/spec/integration/parser/scope_spec.rb

@@ -8,6 +8,11 @@ describe "Two step scoping for variables" do
     expect(catalog.resource('Notify', 'something')[:message]).to eq(message)
   end
 
+  def expect_the_message_not_to_be(message, node = Puppet::Node.new('the node'))
+    catalog = compile_to_catalog(yield, node)
+    expect(catalog.resource('Notify', 'something')[:message]).to_not eq(message)
+  end
+
   before :each do
     Puppet.expects(:deprecation_warning).never
   end
@@ -250,13 +255,15 @@ describe "Two step scoping for variables" do
       end
     end
 
-    it "finds a qualified variable by following parent scopes of the specified scope" do
-      expect_the_message_to_be("from node") do <<-MANIFEST
+    it "finds a qualified variable by following inherited scope of the specified scope" do
+      expect_the_message_to_be("from parent") do <<-MANIFEST
             class c {
               notify { 'something': message => "$a::b" }
             }
-
-            class a { }
+            class parent {
+              $b = 'from parent'
+            }
+            class a inherits parent { }
 
             node default {
               $b = "from node"
@@ -267,6 +274,48 @@ describe "Two step scoping for variables" do
       end
     end
 
+    ['a:.b', '::a::b'].each do |ref|
+      it "does not resolve a qualified name on the form #{ref} against top scope" do
+        expect_the_message_not_to_be("from topscope") do <<-"MANIFEST"
+              class c {
+                notify { 'something': message => "$#{ref}" }
+              }
+              class parent {
+                $not_b = 'from parent'
+              }
+              class a inherits parent { }
+
+              $b = "from topscope"
+              node default {
+                include a
+                include c
+              }
+          MANIFEST
+        end
+      end
+    end
+
+    ['a:.b', '::a::b'].each do |ref|
+      it "does not resolve a qualified name on the form #{ref} against node scope" do
+        expect_the_message_not_to_be("from node") do <<-MANIFEST
+              class c {
+                notify { 'something': message => "$a::b" }
+              }
+              class parent {
+                $not_b = 'from parent'
+              }
+              class a inherits parent { }
+
+              node default {
+                $b = "from node"
+                include a
+                include c
+              }
+          MANIFEST
+        end
+      end
+    end
+
     it "finds values in its inherited scope when the inherited class is qualified to the top" do
       expect_the_message_to_be('foo_msg') do <<-MANIFEST
             node default {

data/spec/integration/provider/cron/crontab_spec.rb

@@ -10,7 +10,6 @@ describe Puppet::Type.type(:cron).provider(:crontab), '(integration)', :unless =
 
   before :each do
     Puppet::Type.type(:cron).stubs(:defaultprovider).returns described_class
-    described_class.stubs(:suitable?).returns true
     Puppet::FileBucket::Dipper.any_instance.stubs(:backup) # Don't backup to filebucket
 
     # I don't want to execute anything

data/spec/integration/resource/catalog_spec.rb

@@ -2,10 +2,6 @@
 require 'spec_helper'
 
 describe Puppet::Resource::Catalog do
-  it "should support pson" do
-    expect(Puppet::Resource::Catalog.supported_formats).to be_include(:pson)
-  end
-
   describe "when using the indirector" do
     before do
       # This is so the tests work w/out networking.

data/spec/integration/transaction/report_spec.rb

@@ -15,7 +15,7 @@ describe Puppet::Transaction::Report do
 
       Facter.stubs(:value).returns "host.domain.com"
 
-      report = Puppet::Transaction::Report.new("apply")
+      report = Puppet::Transaction::Report.new
 
       terminus.expects(:process).with(report)
 
@@ -31,7 +31,7 @@ describe Puppet::Transaction::Report do
 
       log = Puppet::Util::Log.new(:level => :info, :message => "foo")
 
-      report = Puppet::Transaction::Report.new("apply")
+      report = Puppet::Transaction::Report.new
       report.add_resource_status(status)
       report << log
 

data/spec/integration/transaction_spec.rb

@@ -1,12 +1,10 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
-require 'puppet_spec/compiler'
 
 require 'puppet/transaction'
 
 describe Puppet::Transaction do
   include PuppetSpec::Files
-  include PuppetSpec::Compiler
 
   before do
     Puppet::Util::Storage.stubs(:store)
@@ -19,11 +17,11 @@ describe Puppet::Transaction do
   end
 
   def touch_path
-    Puppet.features.microsoft_windows? ? "#{ENV['windir']}\\system32" : "/usr/bin:/bin"
+    Puppet.features.microsoft_windows? ? "#{ENV['windir']}/system32" : "/usr/bin:/bin"
   end
 
   def usr_bin_touch(path)
-    Puppet.features.microsoft_windows? ? "#{ENV['windir']}\\system32\\cmd.exe /c \"type NUL >> \"#{path}\"\"" : "/usr/bin/touch #{path}"
+    Puppet.features.microsoft_windows? ? "#{ENV['windir']}/system32/cmd.exe /c \"type NUL >> \"#{path}\"\"" : "/usr/bin/touch #{path}"
   end
 
   def touch(path)
@@ -235,7 +233,7 @@ describe Puppet::Transaction do
     expect(Puppet::FileSystem.exist?(path)).not_to be_truthy
   end
 
-  it "should not let one failed refresh result in other refreshes failing" do
+  it "one failed refresh should propagate its failure to dependent refreshes" do
     path = tmpfile("path")
     newfile = tmpfile("file")
       file = Puppet::Type.type(:file).new(
@@ -265,7 +263,7 @@ describe Puppet::Transaction do
 
     catalog = mk_catalog(file, exec1, exec2)
     catalog.apply
-    expect(Puppet::FileSystem.exist?(newfile)).to be_truthy
+    expect(Puppet::FileSystem.exist?(newfile)).to be_falsey
   end
 
   # Ensure when resources have been generated with eval_generate that event
@@ -340,37 +338,6 @@ describe Puppet::Transaction do
         expect(Puppet::FileSystem.exist?(file2)).to be_truthy
       end
     end
-
-    it "should propagate events correctly from a tagged container when running with tags" do
-      file1 = tmpfile("original_tag")
-      file2 = tmpfile("tag_propagation")
-      command1 = usr_bin_touch(file1)
-      command2 = usr_bin_touch(file2)
-      manifest = <<-"MANIFEST"
-        class foo {
-          exec { 'notify test':
-            command     => '#{command1}',
-            refreshonly => true,
-          }
-        }
-
-        class test {
-          include foo
-
-          exec { 'test':
-            command => '#{command2}',
-            notify  => Class['foo'],
-          }
-        }
-
-        include test
-      MANIFEST
-
-      Puppet[:tags] = 'test'
-      apply_compiled_manifest(manifest)
-      expect(Puppet::FileSystem.exist?(file1)).to be_truthy
-      expect(Puppet::FileSystem.exist?(file2)).to be_truthy
-    end
   end
 
   describe "skipping resources" do

data/spec/integration/type/package_spec.rb

@@ -33,12 +33,18 @@ describe Puppet::Type.type(:package), "when choosing a default package provider"
       else
         :yum
       end
+    when 'Suse'
+      if Puppet::Util::Package.versioncmp(Facter.value(:operatingsystemmajrelease), '10') >= 0
+        :zypper
+      else
+        :rug
+      end
     when 'FreeBSD'
       :ports
     when 'OpenBSD'
       :openbsd
     when 'DragonFly'
-      :pkgin
+      :pkgng
     when 'OpenWrt'
       :opkg
     end

data/spec/integration/util/execution_spec.rb

@@ -15,14 +15,6 @@ describe Puppet::Util::Execution do
       Puppet::Util::Execution.execpipe('echo $LC_ALL'){ |line| out << line.read.chomp }
       expect(out).to eq("C")
     end
-
-    it "should raise an ExecutionFailure with a missing command and :failonfail set to true" do
-      expect {
-        failonfail = true
-        # NOTE: critical to return l in the block for `output` in method to be #<IO:(closed)>
-        Puppet::Util::Execution.execpipe('conan_the_librarion', failonfail) { |l| l }
-      }.to raise_error(Puppet::ExecutionFailure)
-    end
   end
 
   describe "#execute (non-Windows)", :if => !Puppet.features.microsoft_windows? do

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

@@ -81,91 +81,6 @@ describe Puppet::Util::Windows::ADSI::Group,
   end
 
   describe '.members' do
-    it 'should return a list of members resolvable with Puppet::Util::Windows::ADSI::Group.name_sid_hash' do
-      temp_groupname = "g#{SecureRandom.uuid}"
-      temp_username  = "u#{SecureRandom.uuid}"[0..12]
-
-      # select a virtual account that requires an authority to be able to resolve to SID
-      # the Dhcp service is chosen for no particular reason aside from it's a service available on all Windows versions
-      dhcp_virtualaccount = Puppet::Util::Windows::SID.name_to_principal('NT SERVICE\Dhcp')
-
-      # adding :SidTypeGroup as a group member will cause error in IAdsUser::Add
-      # adding :SidTypeDomain (such as S-1-5-80 / NT SERVICE or computer name) won't error
-      #   but also won't be returned as a group member
-      # uncertain how to obtain :SidTypeComputer (perhaps AD? the local machine is :SidTypeDomain)
-      users = [
-        # Use sid_to_name to get localized names of SIDs - BUILTIN, SYSTEM, NT AUTHORITY, Everyone are all localized
-        # :SidTypeWellKnownGroup
-        # SYSTEM is prefixed with the NT Authority authority, resolveable with or without authority
-        { :sid => 'S-1-5-18', :name => Puppet::Util::Windows::SID.sid_to_name('S-1-5-18') },
-        # Everyone is not prefixed with an authority, resolveable with or without NT AUTHORITY authority
-        { :sid => 'S-1-1-0', :name => Puppet::Util::Windows::SID.sid_to_name('S-1-1-0') },
-        # Dhcp service account is prefixed with NT SERVICE authority, requires authority to resolve SID
-        # behavior is similar to IIS APPPOOL\DefaultAppPool
-        { :sid => dhcp_virtualaccount.sid, :name => dhcp_virtualaccount.domain_account },
-
-        # :SidTypeAlias with authority component
-        # Administrators group is prefixed with BUILTIN authority, can be resolved with or without authority
-        { :sid => 'S-1-5-32-544', :name => Puppet::Util::Windows::SID.sid_to_name('S-1-5-32-544') },
-      ]
-
-      begin
-        # :SidTypeUser as user on localhost, can be resolved with or without authority prefix
-        user = Puppet::Util::Windows::ADSI::User.create(temp_username)
-        user.commit()
-        users.push({ :sid => user.sid.sid, :name => Puppet::Util::Windows::ADSI.computer_name + '\\' + temp_username })
-
-        # create a test group and add above 5 members by SID
-        group = described_class.create(temp_groupname)
-        group.commit()
-        group.set_members(users.map { |u| u[:sid]} )
-
-        # most importantly make sure that all name are convertible to SIDs
-        expect { described_class.name_sid_hash(group.members) }.to_not raise_error
-
-        # also verify the names returned are as expected
-        expected_usernames = users.map { |u| u[:name] }
-        expect(group.members.map(&:domain_account)).to eq(expected_usernames)
-      ensure
-        described_class.delete(temp_groupname) if described_class.exists?(temp_groupname)
-        Puppet::Util::Windows::ADSI::User.delete(temp_username) if Puppet::Util::Windows::ADSI::User.exists?(temp_username)
-      end
-    end
-
-    it 'should return a list of Principal objects even with unresolvable SIDs' do
-      members = [
-        # NULL SID is not localized
-        stub('WIN32OLE', {
-          :objectSID => [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-          :Name => 'NULL SID',
-          :ole_respond_to? => true,
-        }),
-        # unresolvable SID is a different story altogether
-        stub('WIN32OLE', {
-          # completely valid SID, but Name is just a stringified version
-          :objectSID => [1, 5, 0, 0, 0, 0, 0, 5, 21, 0, 0, 0, 5, 113, 65, 218, 15, 127, 9, 57, 219, 4, 84, 126, 88, 4, 0, 0],
-          :Name => 'S-1-5-21-3661721861-956923663-2119435483-1112',
-          :ole_respond_to? => true,
-        })
-      ]
-
-      admins_name = Puppet::Util::Windows::SID.sid_to_name('S-1-5-32-544')
-      admins = Puppet::Util::Windows::ADSI::Group.new(admins_name)
-
-      # touch the native_group member to have it lazily loaded, so COM objects can be stubbed
-      admins.native_group
-      admins.native_group.stubs(:Members).returns(members)
-
-      # well-known NULL SID
-      expect(admins.members[0].sid).to eq('S-1-0-0')
-      expect(admins.members[0].account_type).to eq(:SidTypeWellKnownGroup)
-
-      # unresolvable SID
-      expect(admins.members[1].sid).to eq('S-1-5-21-3661721861-956923663-2119435483-1112')
-      expect(admins.members[1].account).to eq('S-1-5-21-3661721861-956923663-2119435483-1112 (unresolvable)')
-      expect(admins.members[1].account_type).to eq(:SidTypeUnknown)
-    end
-
     it 'should return a list of members with UTF-8 names' do
       begin
         original_codepage = Encoding.default_external
@@ -173,7 +88,7 @@ describe Puppet::Util::Windows::ADSI::Group,
 
         # lookup by English name Administrators is not OK on localized Windows
         admins = Puppet::Util::Windows::ADSI::Group.new(administrators_principal.account)
-        admins.members.map(&:domain_account).each do |name|
+        admins.members.each do |name|
           expect(name.encoding).to be(Encoding::UTF_8)
         end
       ensure

data/spec/integration/util/windows/principal_spec.rb

@@ -8,7 +8,7 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
   let (:system_bytes) { [1, 1, 0, 0, 0, 0, 0, 5, 18, 0, 0, 0] }
   let (:null_sid_bytes) { bytes = [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] }
   let (:administrator_bytes) { [1, 2, 0, 0, 0, 0, 0, 5, 32, 0, 0, 0, 32, 2, 0, 0] }
-  let (:computer_sid) { Puppet::Util::Windows::SID.name_to_principal(Puppet::Util::Windows::ADSI.computer_name) }
+  let (:computer_sid) { Puppet::Util::Windows::SID.name_to_sid_object(Puppet::Util::Windows::ADSI.computer_name) }
   # BUILTIN is localized on German Windows, but not French
   # looking this up like this dilutes the values of the tests as we're comparing two mechanisms
   # for returning the same values, rather than to a known good
@@ -23,7 +23,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
       expect(principal.domain).to eq('')
       expect(principal.domain_account).to eq('NULL SID')
       expect(principal.account_type).to eq(:SidTypeWellKnownGroup)
-      expect(principal.to_s).to eq('NULL SID')
     end
 
     it "should create an instance from a well-known account prefixed with NT AUTHORITY" do
@@ -40,7 +39,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
         expect(principal.account).to eq('SYSTEM')
         expect(principal.domain).to eq('NT AUTHORITY')
         expect(principal.domain_account).to eq('NT AUTHORITY\\SYSTEM')
-        expect(principal.to_s).to eq('NT AUTHORITY\\SYSTEM')
       end
 
       # Windows API LookupAccountSid behaves differently if current user is SYSTEM
@@ -89,7 +87,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
       expect(principal.domain).to eq(domain)
       expect(principal.domain_account).to eq(qualified_name)
       expect(principal.account_type).to eq(:SidTypeAlias)
-      expect(principal.to_s).to eq(qualified_name)
     end
 
     it "should raise an error when trying to lookup an account that doesn't exist" do
@@ -109,7 +106,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
       expect(principal.account).to eq(builtin_localized)
       expect(principal.domain).to eq(builtin_localized)
       expect(principal.domain_account).to eq(builtin_localized)
-      expect(principal.to_s).to eq(builtin_localized)
     end
 
     it "should return a BUILTIN domain principal for BUILTIN account names" do
@@ -119,7 +115,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
       expect(principal.account).to eq(builtin_localized)
       expect(principal.domain).to eq(builtin_localized)
       expect(principal.domain_account).to eq(builtin_localized)
-      expect(principal.to_s).to eq(builtin_localized)
     end
 
   end
@@ -140,7 +135,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
       expect(principal.domain).to eq(computer_sid.domain)
       expect(principal.domain_account).to eq(guest_name)
       expect(principal.account_type).to eq(:SidTypeUser)
-      expect(principal.to_s).to eq(guest_name)
     end
 
     it "should create an instance from a well-known group SID" do
@@ -151,7 +145,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
       expect(principal.domain).to eq('')
       expect(principal.domain_account).to eq('NULL SID')
       expect(principal.account_type).to eq(:SidTypeWellKnownGroup)
-      expect(principal.to_s).to eq('NULL SID')
     end
 
     it "should create an instance from a well-known BUILTIN Alias SID" do
@@ -167,7 +160,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
       expect(principal.domain).to eq(domain)
       expect(principal.domain_account).to eq(qualified_name)
       expect(principal.account_type).to eq(:SidTypeAlias)
-      expect(principal.to_s).to eq(qualified_name)
     end
 
     it "should raise an error when trying to lookup nil" do
@@ -222,7 +214,6 @@ describe Puppet::Util::Windows::SID::Principal, :if => Puppet.features.microsoft
       expect(principal.account).to eq(builtin_localized)
       expect(principal.domain).to eq(builtin_localized)
       expect(principal.domain_account).to eq(builtin_localized)
-      expect(principal.to_s).to eq(builtin_localized)
     end
   end
 

data/spec/integration/util/windows/process_spec.rb

@@ -34,51 +34,6 @@ describe "Puppet::Util::Windows::Process", :if => Puppet.features.microsoft_wind
     end
   end
 
-  describe "when reading environment variables" do
-    after :each do
-      # spec\integration\test\test_helper_spec.rb calls set_environment_strings
-      # after :all and thus needs access to the real APIs once again
-      Puppet::Util::Windows::Process.unstub(:GetEnvironmentStringsW)
-      Puppet::Util::Windows::Process.unstub(:FreeEnvironmentStringsW)
-    end
-
-    it "will ignore only keys or values with corrupt byte sequences" do
-      arraydest = []
-      Puppet::Util::Log.newdestination(Puppet::Test::LogCollector.new(arraydest))
-
-      env_vars = {}
-
-      # Create a UTF-16LE version of the below null separated environment string
-      # "a=b\x00c=d\x00e=\xDD\xDD\x00f=g\x00\x00"
-      env_var_block =
-        "a=b\x00".encode(Encoding::UTF_16LE) +
-        "c=d\x00".encode(Encoding::UTF_16LE) +
-        'e='.encode(Encoding::UTF_16LE) + "\xDD\xDD".force_encoding(Encoding::UTF_16LE) + "\x00".encode(Encoding::UTF_16LE) +
-        "f=g\x00\x00".encode(Encoding::UTF_16LE)
-
-      env_var_block_bytes = env_var_block.bytes.to_a
-
-      FFI::MemoryPointer.new(:byte, env_var_block_bytes.count) do |ptr|
-        # uchar here is synonymous with byte
-        ptr.put_array_of_uchar(0, env_var_block_bytes)
-
-        # stub the block of memory that the Win32 API would typically return via pointer
-        Puppet::Util::Windows::Process.expects(:GetEnvironmentStringsW).returns(ptr)
-        # stub out the real API call to free memory, else process crashes
-        Puppet::Util::Windows::Process.expects(:FreeEnvironmentStringsW)
-
-        env_vars = Puppet::Util::Windows::Process.get_environment_strings
-      end
-
-      # based on corrupted memory, the e=\xDD\xDD should have been removed from the set
-      expect(env_vars).to eq({'a' => 'b', 'c' => 'd', 'f' => 'g'})
-
-      # and Puppet should emit a warning about it
-      expect(arraydest.last.level).to eq(:warning)
-      expect(arraydest.last.message).to eq("Discarding environment variable e=\uFFFD which contains invalid bytes")
-    end
-  end
-
   describe "when setting environment variables" do
     it "can properly handle env var values with = in them" do
       begin