puppet 4.8.2-x86-mingw32 → 4.9.0-x86-mingw32

data/spec/integration/data_binding_spec.rb

@@ -143,7 +143,7 @@ describe "Data binding" do
   def configure_hiera_for_one_tier(data)
     hiera_config_file = tmpfile("hiera.yaml")
 
-    File.open(hiera_config_file, 'w') do |f|
+    File.open(hiera_config_file, 'w:UTF-8') do |f|
       f.write("---
         :yaml:
           :datadir: #{dir}
@@ -154,7 +154,7 @@ describe "Data binding" do
     end
 
     data.each do | file, contents |
-      File.open(File.join(dir, "#{file}.yaml"), 'w') do |f|
+      File.open(File.join(dir, "#{file}.yaml"), 'w:UTF-8') do |f|
         f.write(YAML.dump(contents))
       end
     end
@@ -165,7 +165,7 @@ describe "Data binding" do
   def configure_hiera_for_two_tier(data)
     hiera_config_file = tmpfile("hiera.yaml")
 
-    File.open(hiera_config_file, 'w') do |f|
+    File.open(hiera_config_file, 'w:UTF-8') do |f|
       f.write("---
         :yaml:
           :datadir: #{dir}
@@ -176,7 +176,7 @@ describe "Data binding" do
     end
 
     data.each do | file, contents |
-      File.open(File.join(dir, "#{file}.yaml"), 'w') do |f|
+      File.open(File.join(dir, "#{file}.yaml"), 'w:UTF-8') do |f|
         f.write(YAML.dump(contents))
       end
     end
@@ -188,7 +188,7 @@ describe "Data binding" do
     module_dir = File.join(dir, module_name, 'manifests')
     FileUtils.mkdir_p(module_dir)
 
-    File.open(File.join(module_dir, name), 'w') do |f|
+    File.open(File.join(module_dir, name), 'w:UTF-8') do |f|
       f.write(manifest)
     end
   end

data/spec/integration/defaults_spec.rb

@@ -235,6 +235,19 @@ describe "Puppet defaults" do
     it "should be set to hiera by default" do
       expect(Puppet.settings[:data_binding_terminus]).to eq(:hiera)
     end
+
+    it "to be neither 'hiera' nor 'none', a deprecation warning is logged" do
+      expect(@logs).to eql([])
+      Puppet[:data_binding_terminus] = 'magic'
+      expect(@logs[0].to_s).to match(/Setting 'data_binding_terminus' is deprecated/)
+    end
+
+    it "to not log a warning if set to 'none' or 'hiera'" do
+      expect(@logs).to eql([])
+      Puppet[:data_binding_terminus] = 'none'
+      Puppet[:data_binding_terminus] = 'hiera'
+      expect(@logs).to eql([])
+    end
   end
 
   describe "agent_catalog_run_lockfile" do

data/spec/integration/environments/default_manifest_spec.rb

@@ -18,11 +18,11 @@ describe "default manifests" do
         manifestsdir = File.join(testingdir, "manifests")
         FileUtils.mkdir_p(manifestsdir)
 
-        File.open(File.join(manifestsdir, "site.pp"), "w") do |f|
+        File.open(File.join(manifestsdir, "site.pp"), "w", :encoding => Encoding::UTF_8) do |f|
           f.puts("notify { 'ManifestFromRelativeDefault': }")
         end
 
-        File.open(File.join(confdir, "puppet.conf"), "w") do |f|
+        File.open(File.join(confdir, "puppet.conf"), "w", :encoding => Encoding::UTF_8) do |f|
           f.puts("environmentpath=#{environmentpath}")
         end
 
@@ -43,14 +43,14 @@ describe "default manifests" do
         manifestsdir = File.expand_path("manifests", confdir)
         FileUtils.mkdir_p(manifestsdir)
 
-        File.open(File.join(confdir, "puppet.conf"), "w") do |f|
+        File.open(File.join(confdir, "puppet.conf"), "w", :encoding => Encoding::UTF_8) do |f|
           f.puts(<<-EOF)
   environmentpath=#{environmentpath}
   default_manifest=#{manifestsdir}
           EOF
         end
 
-        File.open(File.join(manifestsdir, "site.pp"), "w") do |f|
+        File.open(File.join(manifestsdir, "site.pp"), "w", :encoding => Encoding::UTF_8) do |f|
           f.puts("notify { 'ManifestFromAbsoluteDefaultManifest': }")
         end
 
@@ -61,7 +61,7 @@ describe "default manifests" do
 
       it "reads manifest from directory environment manifest when environment.conf manifest set" do
         default_manifestsdir = File.expand_path("manifests", confdir)
-        File.open(File.join(confdir, "puppet.conf"), "w") do |f|
+        File.open(File.join(confdir, "puppet.conf"), "w", :encoding => Encoding::UTF_8) do |f|
           f.puts(<<-EOF)
   environmentpath=#{environmentpath}
   default_manifest=#{default_manifestsdir}
@@ -71,11 +71,11 @@ describe "default manifests" do
         manifestsdir = File.join(testingdir, "special_manifests")
         FileUtils.mkdir_p(manifestsdir)
 
-        File.open(File.join(manifestsdir, "site.pp"), "w") do |f|
+        File.open(File.join(manifestsdir, "site.pp"), "w", :encoding => Encoding::UTF_8) do |f|
           f.puts("notify { 'ManifestFromEnvironmentConfManifest': }")
         end
 
-        File.open(File.join(testingdir, "environment.conf"), "w") do |f|
+        File.open(File.join(testingdir, "environment.conf"), "w", :encoding => Encoding::UTF_8) do |f|
           f.puts("manifest=./special_manifests")
         end
 
@@ -89,21 +89,21 @@ describe "default manifests" do
         default_manifestsdir = File.expand_path("manifests", confdir)
         FileUtils.mkdir_p(default_manifestsdir)
 
-        File.open(File.join(confdir, "puppet.conf"), "w") do |f|
+        File.open(File.join(confdir, "puppet.conf"), "w", :encoding => Encoding::UTF_8) do |f|
           f.puts(<<-EOF)
   environmentpath=#{environmentpath}
   default_manifest=#{default_manifestsdir}
           EOF
         end
 
-        File.open(File.join(default_manifestsdir, "site.pp"), "w") do |f|
+        File.open(File.join(default_manifestsdir, "site.pp"), "w", :encoding => Encoding::UTF_8) do |f|
           f.puts("notify { 'ManifestFromAbsoluteDefaultManifest': }")
         end
 
         implicit_manifestsdir = File.join(testingdir, "manifests")
         FileUtils.mkdir_p(implicit_manifestsdir)
 
-        File.open(File.join(implicit_manifestsdir, "site.pp"), "w") do |f|
+        File.open(File.join(implicit_manifestsdir, "site.pp"), "w", :encoding => Encoding::UTF_8) do |f|
           f.puts("notify { 'ManifestFromImplicitRelativeEnvironmentManifestDirectory': }")
         end
 
@@ -125,7 +125,7 @@ describe "default manifests" do
       before(:each) do
         FileUtils.mkdir_p(manifestsdir)
 
-        File.open(File.join(confdir, "puppet.conf"), "w") do |f|
+        File.open(File.join(confdir, "puppet.conf"), "w", :encoding => Encoding::UTF_8) do |f|
           f.puts(<<-EOF)
   environmentpath=#{environmentpath}
   default_manifest=#{manifestsdir}
@@ -133,7 +133,7 @@ describe "default manifests" do
           EOF
         end
 
-        File.open(File.join(manifestsdir, "site.pp"), "w") do |f|
+        File.open(File.join(manifestsdir, "site.pp"), "w", :encoding => Encoding::UTF_8) do |f|
           f.puts("notify { 'ManifestFromAbsoluteDefaultManifest': }")
         end
       end
@@ -145,7 +145,7 @@ describe "default manifests" do
       end
 
       it "refuses to compile if environment.conf specifies a different manifest" do
-        File.open(File.join(testingdir, "environment.conf"), "w") do |f|
+        File.open(File.join(testingdir, "environment.conf"), "w", :encoding => Encoding::UTF_8) do |f|
           f.puts("manifest=./special_manifests")
         end
 
@@ -155,7 +155,7 @@ describe "default manifests" do
       end
 
       it "reads manifest from default_manifest setting when environment.conf has manifest set if setting equals default_manifest setting" do
-        File.open(File.join(testingdir, "environment.conf"), "w") do |f|
+        File.open(File.join(testingdir, "environment.conf"), "w", :encoding => Encoding::UTF_8) do |f|
           f.puts("manifest=#{manifestsdir}")
         end
 
@@ -165,7 +165,7 @@ describe "default manifests" do
       end
 
       it "logs errors if environment.conf specifies a different manifest" do
-        File.open(File.join(testingdir, "environment.conf"), "w") do |f|
+        File.open(File.join(testingdir, "environment.conf"), "w", :encoding => Encoding::UTF_8) do |f|
           f.puts("manifest=./special_manifests")
         end
 
@@ -177,7 +177,7 @@ describe "default manifests" do
       end
 
       it "raises an error if default_manifest is not absolute" do
-        File.open(File.join(confdir, "puppet.conf"), "w") do |f|
+        File.open(File.join(confdir, "puppet.conf"), "w", :encoding => Encoding::UTF_8) do |f|
           f.puts(<<-EOF)
   environmentpath=#{environmentpath}
   default_manifest=./relative

data/spec/integration/environments/setting_hooks_spec.rb

@@ -14,7 +14,7 @@ describe "setting hooks" do
     it "accesses correct directory environment settings after initializing a setting with an on_write hook" do
       expect(Puppet.settings.setting(:certname).call_hook).to eq(:on_write_only) 
 
-      File.open(File.join(confdir, "puppet.conf"), "w") do |f|
+      File.open(File.join(confdir, "puppet.conf"), "w:UTF-8") do |f|
         f.puts("environmentpath=#{environmentpath}")
         f.puts("certname=something")
       end

data/spec/integration/test/test_helper_spec.rb

@@ -7,12 +7,16 @@ describe "Windows UTF8 environment variables", :if => Puppet.features.microsoft_
   # Do not use before and after hooks in these tests as it may have unintended consequences
 
   before(:all) {
-    @varname = 'test-helper-foo'
+    @varname = 'test_helper_spec-test_variable'
     @rune_utf8 = "\u16A0\u16C7\u16BB\u16EB\u16D2\u16E6\u16A6\u16EB\u16A0\u16B1\u16A9\u16A0\u16A2\u16B1\u16EB\u16A0\u16C1\u16B1\u16AA\u16EB\u16B7\u16D6\u16BB\u16B9\u16E6\u16DA\u16B3\u16A2\u16D7"
 
     Puppet::Util::Windows::Process.set_environment_variable(@varname, @rune_utf8)
   }
-
+  after(:all) {
+    # Need to cleanup this environment variable otherwise it contaminates any subsequent tests
+    Puppet::Util::Windows::Process.set_environment_variable(@varname, nil)
+  }
+  
   it "#after_each_test should preserve UTF8 environment variables" do
     envhash = Puppet::Util::Windows::Process.get_environment_strings
     expect(envhash[@varname]).to eq(@rune_utf8)

data/spec/integration/transaction_spec.rb

@@ -266,6 +266,80 @@ describe Puppet::Transaction do
     expect(Puppet::FileSystem.exist?(newfile)).to be_truthy
   end
 
+  # Ensure when resources have been generated with eval_generate that event
+  # propagation still works when filtering with tags
+  context "when filtering with tags" do
+    context "when resources are dependent on dynamically generated resources" do
+      it "should trigger (only) appropriately tagged dependent resources" do
+        source = dir_containing('sourcedir', {'foo' => 'bar'})
+        target = tmpdir('targetdir')
+        file1 = tmpfile("file1")
+        file2 = tmpfile("file2")
+
+        file = Puppet::Type.type(:file).new(
+          :path    => target,
+          :source  => source,
+          :ensure  => :present,
+          :recurse => true,
+          :tag     => "foo_tag",
+        )
+
+        exec1 = Puppet::Type.type(:exec).new(
+          :path        => ENV["PATH"],
+          :command     => touch(file1),
+          :refreshonly => true,
+          :subscribe   => file,
+          :tag         => "foo_tag",
+        )
+
+        exec2 = Puppet::Type.type(:exec).new(
+          :path        => ENV["PATH"],
+          :command     => touch(file2),
+          :refreshonly => true,
+          :subscribe   => file,
+        )
+
+        Puppet[:tags] = "foo_tag"
+        catalog = mk_catalog(file, exec1, exec2)
+        catalog.apply
+        expect(Puppet::FileSystem.exist?(file1)).to be_truthy
+        expect(Puppet::FileSystem.exist?(file2)).to be_falsey
+      end
+
+      it "should trigger implicitly tagged dependent resources, ie via type name" do
+        file1 = tmpfile("file1")
+        file2 = tmpfile("file2")
+
+        exec1 = Puppet::Type.type(:exec).new(
+          :name        => "exec1",
+          :path        => ENV["PATH"],
+          :command     => touch(file1),
+        )
+
+        exec1.stubs(:eval_generate).returns(
+          [ (Puppet::Type.type(:notify).new :name => "eval1_notify")]
+        )
+
+        exec2 = Puppet::Type.type(:exec).new(
+          :name        => "exec2",
+          :path        => ENV["PATH"],
+          :command     => touch(file2),
+          :refreshonly => true,
+          :subscribe   => exec1,
+        )
+        exec2.stubs(:eval_generate).returns(
+          [ (Puppet::Type.type(:notify).new :name => "eval2_notify")]
+        )
+
+        Puppet[:tags] = "exec"
+        catalog = mk_catalog(exec1, exec2)
+        catalog.apply
+        expect(Puppet::FileSystem.exist?(file1)).to be_truthy
+        expect(Puppet::FileSystem.exist?(file2)).to be_truthy
+      end
+    end
+  end
+
   describe "skipping resources" do
     let(:fname) { tmpfile("exec") }
 

data/spec/integration/util/execution_spec.rb

@@ -17,6 +17,14 @@ describe Puppet::Util::Execution do
     end
   end
 
+  describe "#execute (non-Windows)", :if => !Puppet.features.microsoft_windows? do
+    it "should execute basic shell command" do
+      result = Puppet::Util::Execution.execute("ls /tmp", :failonfail => true)
+      expect(result.exitstatus).to eq(0)
+      expect(result.to_s).to_not be_nil
+    end
+  end
+
   describe "#execute (Windows)", :if => Puppet.features.microsoft_windows? do
     let(:utf8text) do
       # Japanese Lorem Ipsum snippet

data/spec/lib/puppet_spec/module_tool/shared_functions.rb

@@ -31,7 +31,7 @@ module PuppetSpec
         if options.nil?
           expect(release).to be_nil
         else
-          from = options.keys.find { |k| k.nil? || k.is_a?(Semantic::Version) }
+          from = options.keys.find { |k| k.nil? || k.is_a?(SemanticPuppet::Version) }
           to   = options.delete(from)
 
           if to or from
@@ -49,7 +49,7 @@ module PuppetSpec
       end
 
       def v(str)
-        Semantic::Version.parse(str)
+        SemanticPuppet::Version.parse(str)
       end
     end
   end

data/spec/lib/puppet_spec/module_tool/stub_source.rb

@@ -1,6 +1,6 @@
 module PuppetSpec
   module ModuleTool
-    class StubSource < Semantic::Dependency::Source
+    class StubSource < SemanticPuppet::Dependency::Source
       def inspect; "Stub Source"; end
       def host
         "http://nowhe.re"

data/spec/lib/puppet_spec/unindent.rb

@@ -1,5 +1,5 @@
 class String
-  def unindent
-    gsub(/^#{scan(/^\s*/).min_by{ |l| l.length }}/, '')
+  def unindent(left_padding = '')
+    gsub(/^#{scan(/^\s*/).min_by{ |l| l.length }}/, left_padding)
   end
 end

data/spec/unit/application/face_base_spec.rb

@@ -267,6 +267,22 @@ describe Puppet::Application::FaceBase do
       app.expects(:render).with(app.arguments.length + 1, ["myname", "myarg"])
       expect { app.main }.to exit_with(0)
     end
+
+    it "should issue a deprecation warning if the face is deprecated" do
+      # since app is shared across examples, stub to avoid affecting shared context
+      app.face.stubs(:deprecated?).returns(true)
+      app.face.expects(:foo).with(*app.arguments)
+      Puppet.expects(:deprecation_warning).with(regexp_matches(/'puppet basetest' is deprecated/))
+      expect { app.main }.to exit_with(0)
+    end
+
+    it "should not issue a deprecation warning if the face is not deprecated" do
+      Puppet.expects(:deprecation_warning).never
+      # since app is shared across examples, stub to avoid affecting shared context
+      app.face.stubs(:deprecated?).returns(false)
+      app.face.expects(:foo).with(*app.arguments)
+      expect { app.main }.to exit_with(0)
+    end
   end
 
   describe "error reporting" do

data/spec/unit/application/lookup_spec.rb

@@ -4,6 +4,18 @@ require 'puppet/pops/lookup'
 
 describe Puppet::Application::Lookup do
 
+  def run_lookup(lookup)
+    capture = StringIO.new
+    saved_stdout = $stdout
+    begin
+      $stdout = capture
+      expect { lookup.run_command }.to exit_with(0)
+    ensure
+      $stdout = saved_stdout
+    end
+    capture.string.strip
+  end
+
   context "when running with incorrect command line options" do
     let (:lookup) { Puppet::Application[:lookup] }
 
@@ -51,7 +63,7 @@ describe Puppet::Application::Lookup do
 
       (Puppet::Pops::Lookup).expects(:lookup).with(['atton', 'kreia'], nil, nil, false, expected_merge, anything).returns('rand')
 
-      expect { lookup.run_command }.to output("rand\n").to_stdout
+      expect(run_lookup(lookup)).to eql("rand")
     end
 
     %w(first unique hash deep).each do |opt|
@@ -62,7 +74,7 @@ describe Puppet::Application::Lookup do
         lookup.command_line.stubs(:args).returns(['atton', 'kreia'])
         lookup.stubs(:generate_scope).yields('scope')
         Puppet::Pops::Lookup.stubs(:lookup).returns('rand')
-        expect { lookup.run_command }.to output("--- rand\n...\n").to_stdout
+        expect(run_lookup(lookup)).to eql("--- rand\n...")
       end
     end
 
@@ -73,7 +85,7 @@ describe Puppet::Application::Lookup do
 
       Puppet::Pops::Lookup.stubs(:lookup).returns('rand')
 
-      expect { lookup.run_command }.to output("--- rand\n...\n").to_stdout
+      expect(run_lookup(lookup)).to eql("--- rand\n...")
     end
   end
 
@@ -88,69 +100,161 @@ describe Puppet::Application::Lookup do
 
     let(:node) { Puppet::Node.new("testnode", :facts => facts, :environment => 'production') }
 
-    let(:expected_json_hash) { {
-      'type' => 'merge',
-      'merge' => 'first',
-      'event' => 'result',
-      'value' => 'This is A',
-      'branches' => [
-      { 'key' => 'a',
-        'event' => 'not_found',
-        'type' => 'global',
-        'name' => 'hiera'
-      },
+    let(:expected_json_hash) {
       {
-        'type' => 'data_provider',
-        'name' => 'Hiera Data Provider, version 4',
-        'configuration_path' => "#{environmentpath}/production/hiera.yaml",
-        'branches' => [
-        {
-          'name' => 'common',
-          'type' => 'data_provider',
-          'branches' => [
-          {
-            'key' => 'a',
-            'value' => 'This is A',
-            'event' => 'found',
-            'type' => 'path',
-            'original_path' => 'common',
-            'path' => "#{environmentpath}/production/data/common.yaml",
-          }]
-        }]
-      }]
-    } }
-
-    let(:expected_yaml_hash) { {
-      :type => :merge,
-      :merge => :first,
-      :event => :result,
-      :value => 'This is A',
-      :branches => [
-        { :key => 'a',
-          :event => :not_found,
-          :type => :global,
-          :name => :hiera
-        },
-        {
-          :type => :data_provider,
-          :name => 'Hiera Data Provider, version 4',
-          :configuration_path => "#{environmentpath}/production/hiera.yaml",
-          :branches => [
+        'branches' =>
+          [
             {
-              :type => :data_provider,
-              :name => 'common',
-              :branches => [
+              'branches'=>
+                [
+                  {
+                    'key'=>'lookup_options',
+                    'event'=>'not_found',
+                    'type'=>'data_provider',
+                    'name'=>'Global Data Provider (hiera configuration version 5)'
+                  },
+                  {
+                    'branches'=>
+                      [
+                        {
+                          'branches'=>
+                            [
+                              {
+                                'key' => 'lookup_options',
+                                'value' => {'a'=>'first'},
+                                'event'=>'found',
+                                'type'=>'path',
+                                'original_path'=>'common.yaml',
+                                'path'=>"#{environmentpath}/production/data/common.yaml"
+                              }
+                            ],
+                          'type'=>'data_provider',
+                          'name'=>'Hierarchy entry "Common"'
+                        }
+                      ],
+                    'type'=>'data_provider',
+                    'name'=>'Environment Data Provider (hiera configuration version 5)'
+                  }
+                ],
+              'key'=>'lookup_options',
+              'type'=>'root'
+            },
+            {
+              'branches'=>
+                [
+                  {
+                    'key'=>'a',
+                    'event'=>'not_found',
+                    'type'=>'data_provider',
+                    'name'=>'Global Data Provider (hiera configuration version 5)'
+                  },
+                  {
+                    'branches'=>
+                      [
+                        {
+                          'branches'=>
+                            [
+                              {
+                                'key'=>'a',
+                                'value'=>'This is A',
+                                'event'=>'found',
+                                'type'=>'path',
+                                'original_path'=>'common.yaml',
+                                'path'=>"#{environmentpath}/production/data/common.yaml"
+                              }
+                            ],
+                          'type'=>'data_provider',
+                          'name'=>'Hierarchy entry "Common"'
+                        }
+                      ],
+                    'type'=>'data_provider',
+                    'name'=>'Environment Data Provider (hiera configuration version 5)'
+                  }
+                ],
+              'key'=>'a',
+              'type'=>'root'
+            }
+          ]
+      }
+    }
+
+    let(:expected_yaml_hash) {
+      {
+      :branches =>
+        [
+          {
+            :branches=>
+              [
                 {
-                  :key => 'a',
-                  :value => 'This is A',
-                  :event => :found,
-                  :type => :path,
-                  :original_path => 'common',
-                  :path => "#{environmentpath}/production/data/common.yaml",
-                }]
-            }]
-        }]
-    } }
+                  :key=>'lookup_options',
+                  :event=>:not_found,
+                  :type=>:data_provider,
+                  :name=>'Global Data Provider (hiera configuration version 5)'
+                },
+                {
+                  :branches=>
+                    [
+                      {
+                        :branches=>
+                          [
+                            {
+                              :key => 'lookup_options',
+                              :value => {'a'=>'first'},
+                              :event=>:found,
+                              :type=>:path,
+                              :original_path=>'common.yaml',
+                              :path=>"#{environmentpath}/production/data/common.yaml"
+                            }
+                          ],
+                        :type=>:data_provider,
+                        :name=>'Hierarchy entry "Common"'
+                      }
+                  ],
+                  :type=>:data_provider,
+                  :name=>'Environment Data Provider (hiera configuration version 5)'
+                }
+              ],
+            :key=>'lookup_options',
+            :type=>:root
+          },
+          {
+            :branches=>
+              [
+                {
+                  :key=>'a',
+                  :event=>:not_found,
+                  :type=>:data_provider,
+                  :name=>'Global Data Provider (hiera configuration version 5)'
+                },
+                {
+                  :branches=>
+                    [
+                      {
+                        :branches=>
+                        [
+                          {
+                            :key=>'a',
+                            :value=>'This is A',
+                            :event=>:found,
+                            :type=>:path,
+                            :original_path=>'common.yaml',
+                            :path=>"#{environmentpath}/production/data/common.yaml"
+                          }
+                        ],
+                        :type=>:data_provider,
+                        :name=>'Hierarchy entry "Common"'
+                      }
+                    ],
+                  :type=>:data_provider,
+                  :name=>'Environment Data Provider (hiera configuration version 5)'
+                }
+              ],
+            :key=>'a',
+            :type=>:root
+          }
+        ]
+      }
+    }
 
     around(:each) do |example|
       # Initialize settings to get a full compile as close as possible to a real
@@ -167,23 +271,27 @@ describe Puppet::Application::Lookup do
       lookup.options[:explain] = true
       lookup.command_line.stubs(:args).returns(['a'])
       logs = []
-      begin
-        Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
-          expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
-Merge strategy first
-  Data Binding "hiera"
+      Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
+        expect(run_lookup(lookup)).to eql(<<-EXPLANATION.chomp)
+Searching for "lookup_options"
+  Global Data Provider (hiera configuration version 5)
+    No such key: "lookup_options"
+  Environment Data Provider (hiera configuration version 5)
+    Hierarchy entry "Common"
+      Path "#{environmentpath}/production/data/common.yaml"
+        Original path: "common.yaml"
+        Found key: "lookup_options" value: {
+          "a" => "first"
+        }
+Searching for "a"
+  Global Data Provider (hiera configuration version 5)
     No such key: "a"
-  Data Provider "Hiera Data Provider, version 4"
-    ConfigurationPath "#{environmentpath}/production/hiera.yaml"
-    Data Provider "common"
+  Environment Data Provider (hiera configuration version 5)
+    Hierarchy entry "Common"
       Path "#{environmentpath}/production/data/common.yaml"
-        Original path: "common"
+        Original path: "common.yaml"
         Found key: "a" value: "This is A"
-  Merged result: "This is A"
         EXPLANATION
-          end
-      rescue SystemExit => e
-        expect(e.status).to eq(0)
       end
       expect(logs.any? { |log| log.level == :debug }).to be_falsey
     end
@@ -213,63 +321,70 @@ Merge strategy first
       lookup.command_line.stubs(:args).returns(['a'])
       Puppet.debug = true
       logs = []
-      begin
-        Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
-          expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
-Merge strategy first
-  Data Binding "hiera"
+      Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
+        expect(run_lookup(lookup)).to eql(<<-EXPLANATION.chomp)
+Searching for "lookup_options"
+  Global Data Provider (hiera configuration version 5)
+    No such key: "lookup_options"
+  Environment Data Provider (hiera configuration version 5)
+    Hierarchy entry "Common"
+      Path "#{environmentpath}/production/data/common.yaml"
+        Original path: "common.yaml"
+        Found key: "lookup_options" value: {
+          "a" => "first"
+        }
+Searching for "a"
+  Global Data Provider (hiera configuration version 5)
     No such key: "a"
-  Data Provider "Hiera Data Provider, version 4"
-    ConfigurationPath "#{environmentpath}/production/hiera.yaml"
-    Data Provider "common"
+  Environment Data Provider (hiera configuration version 5)
+    Hierarchy entry "Common"
       Path "#{environmentpath}/production/data/common.yaml"
-        Original path: "common"
+        Original path: "common.yaml"
         Found key: "a" value: "This is A"
-  Merged result: "This is A"
-          EXPLANATION
-        end
-      rescue SystemExit => e
-        expect(e.status).to eq(0)
+        EXPLANATION
       end
       logs = logs.select { |log| log.level == :debug }.map { |log| log.message }
       expect(logs).to include(<<-EXPLANATION.chomp)
 Lookup of 'a'
-  Merge strategy first
-    Data Binding "hiera"
+  Searching for "lookup_options"
+    Global Data Provider (hiera configuration version 5)
+      No such key: "lookup_options"
+    Environment Data Provider (hiera configuration version 5)
+      Hierarchy entry "Common"
+        Path "#{environmentpath}/production/data/common.yaml"
+          Original path: "common.yaml"
+          Found key: "lookup_options" value: {
+            "a" => "first"
+          }
+  Searching for "a"
+    Global Data Provider (hiera configuration version 5)
       No such key: "a"
-    Data Provider "Hiera Data Provider, version 4"
-      ConfigurationPath "#{environmentpath}/production/hiera.yaml"
-      Data Provider "common"
+    Environment Data Provider (hiera configuration version 5)
+      Hierarchy entry "Common"
         Path "#{environmentpath}/production/data/common.yaml"
-          Original path: "common"
+          Original path: "common.yaml"
           Found key: "a" value: "This is A"
-    Merged result: "This is A"
       EXPLANATION
     end
 
     it '--explain-options produces human readable text of a hash merge' do
       lookup.options[:node] = node
       lookup.options[:explain_options] = true
-      begin
-        expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
+      expect(run_lookup(lookup)).to eql(<<-EXPLANATION.chomp)
 Merge strategy hash
-  Data Binding "hiera"
+  Global Data Provider (hiera configuration version 5)
     No such key: "lookup_options"
-  Data Provider "Hiera Data Provider, version 4"
-    ConfigurationPath "#{environmentpath}/production/hiera.yaml"
-    Data Provider "common"
+  Environment Data Provider (hiera configuration version 5)
+    Hierarchy entry "Common"
       Path "#{environmentpath}/production/data/common.yaml"
-        Original path: "common"
+        Original path: "common.yaml"
         Found key: "lookup_options" value: {
           "a" => "first"
         }
   Merged result: {
     "a" => "first"
   }
-        EXPLANATION
-      rescue SystemExit => e
-        expect(e.status).to eq(0)
-      end
+      EXPLANATION
     end
 
     it '--explain-options produces human readable text of a hash merge and --debug produces the same output to debug logger' do
@@ -277,17 +392,15 @@ Merge strategy hash
       lookup.options[:explain_options] = true
       Puppet.debug = true
       logs = []
-      begin
-        Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
-          expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
+      Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
+        expect(run_lookup(lookup)).to eql(<<-EXPLANATION.chomp)
 Merge strategy hash
-  Data Binding "hiera"
+  Global Data Provider (hiera configuration version 5)
     No such key: "lookup_options"
-  Data Provider "Hiera Data Provider, version 4"
-    ConfigurationPath "#{environmentpath}/production/hiera.yaml"
-    Data Provider "common"
+  Environment Data Provider (hiera configuration version 5)
+    Hierarchy entry "Common"
       Path "#{environmentpath}/production/data/common.yaml"
-        Original path: "common"
+        Original path: "common.yaml"
         Found key: "lookup_options" value: {
           "a" => "first"
         }
@@ -295,28 +408,24 @@ Merge strategy hash
     "a" => "first"
   }
           EXPLANATION
-        end
-      rescue SystemExit => e
-        expect(e.status).to eq(0)
-      end
       logs = logs.select { |log| log.level == :debug }.map { |log| log.message }
       expect(logs).to include(<<-EXPLANATION.chomp)
 Lookup of '__global__'
   Merge strategy hash
-    Data Binding "hiera"
+    Global Data Provider (hiera configuration version 5)
       No such key: "lookup_options"
-    Data Provider "Hiera Data Provider, version 4"
-      ConfigurationPath "#{environmentpath}/production/hiera.yaml"
-      Data Provider "common"
+    Environment Data Provider (hiera configuration version 5)
+      Hierarchy entry "Common"
         Path "#{environmentpath}/production/data/common.yaml"
-          Original path: "common"
+          Original path: "common.yaml"
           Found key: "lookup_options" value: {
             "a" => "first"
           }
     Merged result: {
       "a" => "first"
     }
-      EXPLANATION
+        EXPLANATION
+      end
     end
 
     it '--explain produces human readable text of a hash merge when using both --explain and --explain-options' do
@@ -324,38 +433,26 @@ Lookup of '__global__'
       lookup.options[:explain] = true
       lookup.options[:explain_options] = true
       lookup.command_line.stubs(:args).returns(['a'])
-      begin
-        expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
+      expect(run_lookup(lookup)).to eql(<<-EXPLANATION.chomp)
 Searching for "lookup_options"
-  Merge strategy hash
-    Data Binding "hiera"
-      No such key: "lookup_options"
-    Data Provider "Hiera Data Provider, version 4"
-      ConfigurationPath "#{environmentpath}/production/hiera.yaml"
-      Data Provider "common"
-        Path "#{environmentpath}/production/data/common.yaml"
-          Original path: "common"
-          Found key: "lookup_options" value: {
-            "a" => "first"
-          }
-    Merged result: {
-      "a" => "first"
-    }
+  Global Data Provider (hiera configuration version 5)
+    No such key: "lookup_options"
+  Environment Data Provider (hiera configuration version 5)
+    Hierarchy entry "Common"
+      Path "#{environmentpath}/production/data/common.yaml"
+        Original path: "common.yaml"
+        Found key: "lookup_options" value: {
+          "a" => "first"
+        }
 Searching for "a"
-  Merge strategy first
-    Data Binding "hiera"
-      No such key: "a"
-    Data Provider "Hiera Data Provider, version 4"
-      ConfigurationPath "#{environmentpath}/production/hiera.yaml"
-      Data Provider "common"
-        Path "#{environmentpath}/production/data/common.yaml"
-          Original path: "common"
-          Found key: "a" value: "This is A"
-    Merged result: "This is A"
-        EXPLANATION
-      rescue SystemExit => e
-        expect(e.status).to eq(0)
-      end
+  Global Data Provider (hiera configuration version 5)
+    No such key: "a"
+  Environment Data Provider (hiera configuration version 5)
+    Hierarchy entry "Common"
+      Path "#{environmentpath}/production/data/common.yaml"
+        Original path: "common.yaml"
+        Found key: "a" value: "This is A"
+      EXPLANATION
     end
 
     it 'can produce a yaml explanation' do
@@ -363,17 +460,7 @@ Searching for "a"
       lookup.options[:explain] = true
       lookup.options[:render_as] = :yaml
       lookup.command_line.stubs(:args).returns(['a'])
-      save_stdout = $stdout
-      output = nil
-      begin
-        $stdout = StringIO.new
-        lookup.run_command
-        output = $stdout.string
-      rescue SystemExit => e
-        expect(e.status).to eq(0)
-      ensure
-        $stdout = save_stdout
-      end
+      output = run_lookup(lookup)
       expect(YAML.load(output)).to eq(expected_yaml_hash)
     end
 
@@ -382,17 +469,7 @@ Searching for "a"
       lookup.options[:explain] = true
       lookup.options[:render_as] = :json
       lookup.command_line.stubs(:args).returns(['a'])
-      save_stdout = $stdout
-      output = nil
-      begin
-        $stdout = StringIO.new
-        lookup.run_command
-        output = $stdout.string
-      rescue SystemExit => e
-        expect(e.status).to eq(0)
-      ensure
-        $stdout = save_stdout
-      end
+      output = run_lookup(lookup)
       expect(JSON.parse(output)).to eq(expected_json_hash)
     end
 
@@ -400,17 +477,7 @@ Searching for "a"
       lookup.options[:node] = node
       lookup.options[:render_as] = :json
       lookup.command_line.stubs(:args).returns(['d.one.two.three'])
-      save_stdout = $stdout
-      output = nil
-      begin
-        $stdout = StringIO.new
-        lookup.run_command
-        output = $stdout.string
-      rescue SystemExit => e
-        expect(e.status).to eq(0)
-      ensure
-        $stdout = save_stdout
-      end
+      output = run_lookup(lookup)
       expect(JSON.parse("[#{output}]")).to eq(['the value'])
     end
 
@@ -418,17 +485,7 @@ Searching for "a"
       lookup.options[:node] = node
       lookup.options[:render_as] = :json
       lookup.command_line.stubs(:args).returns(['"e.one.two.three"'])
-      save_stdout = $stdout
-      output = nil
-      begin
-        $stdout = StringIO.new
-        lookup.run_command
-        output = $stdout.string
-      rescue SystemExit => e
-        expect(e.status).to eq(0)
-      ensure
-        $stdout = save_stdout
-      end
+      output = run_lookup(lookup)
       expect(JSON.parse("[#{output}]")).to eq(['the value'])
     end
 
@@ -436,17 +493,7 @@ Searching for "a"
       lookup.options[:node] = node
       lookup.options[:render_as] = :json
       lookup.command_line.stubs(:args).returns(['"f.one"."two.three".1'])
-      save_stdout = $stdout
-      output = nil
-      begin
-        $stdout = StringIO.new
-        lookup.run_command
-        output = $stdout.string
-      rescue SystemExit => e
-        expect(e.status).to eq(0)
-      ensure
-        $stdout = save_stdout
-      end
+      output = run_lookup(lookup)
       expect(JSON.parse("[#{output}]")).to eq(['second value'])
     end
 
@@ -454,18 +501,14 @@ Searching for "a"
       it "is unaffected by global variables unless '--compile' is used" do
         lookup.options[:node] = node
         lookup.command_line.stubs(:args).returns(['c'])
-        expect { lookup.run_command }.to output("--- This is\n...\n").to_stdout
+        expect(run_lookup(lookup)).to eql("--- This is\n...")
       end
 
       it "is affected by global variables when '--compile' is used" do
         lookup.options[:node] = node
         lookup.options[:compile] = true
         lookup.command_line.stubs(:args).returns(['c'])
-        begin
-          expect { lookup.run_command }.to output("--- This is C from site.pp\n...\n").to_stdout
-        rescue SystemExit => e
-          expect(e.status).to eq(0)
-        end
+        expect(run_lookup(lookup)).to eql("--- This is C from site.pp\n...")
       end
     end
 
@@ -475,22 +518,14 @@ Searching for "a"
       it "works OK in the absense of '--compile'" do
         lookup.options[:node] = node
         lookup.command_line.stubs(:args).returns(['c'])
-        begin
-          expect { lookup.run_command }.to output("--- This is C from data.pp\n...\n").to_stdout
-        rescue SystemExit => e
-          expect(e.status).to eq(0)
-        end
+        expect(run_lookup(lookup)).to eql("--- This is C from data.pp\n...")
       end
 
       it "global scope is affected by global variables when '--compile' is used" do
         lookup.options[:node] = node
         lookup.options[:compile] = true
         lookup.command_line.stubs(:args).returns(['c'])
-        begin
-          expect { lookup.run_command }.to output("--- This is C from site.pp\n...\n").to_stdout
-        rescue SystemExit => e
-          expect(e.status).to eq(0)
-        end
+        expect(run_lookup(lookup)).to eql("--- This is C from site.pp\n...")
       end
     end
   end