puppet 3.4.3 → 3.5.0.rc1

data/spec/unit/settings/file_setting_spec.rb

@@ -139,14 +139,14 @@ describe Puppet::Settings::FileSetting do
     it "should skip non-existent files if 'create_files' is not enabled" do
       @file.expects(:create_files?).returns false
       @file.expects(:type).returns :file
-      Puppet::FileSystem::File.expects(:exist?).with(@basepath).returns false
+      Puppet::FileSystem.expects(:exist?).with(@basepath).returns false
       @file.to_resource.should be_nil
     end
 
     it "should manage existent files even if 'create_files' is not enabled" do
       @file.expects(:create_files?).returns false
       @file.expects(:type).returns :file
-      Puppet::FileSystem::File.expects(:exist?).with(@basepath).returns true
+      Puppet::FileSystem.expects(:exist?).with(@basepath).returns true
       @file.to_resource.should be_instance_of(Puppet::Resource)
     end
 

data/spec/unit/settings/ini_file_spec.rb

@@ -0,0 +1,184 @@
+require 'spec_helper'
+require 'stringio'
+
+require 'puppet/settings/ini_file'
+
+describe Puppet::Settings::IniFile do
+  it "preserves the file when no changes are made" do
+    original_config = <<-CONFIG
+    # comment
+    [section]
+    name = value
+    CONFIG
+    config_fh = a_config_file_containing(original_config)
+
+    Puppet::Settings::IniFile.update(config_fh) do; end
+
+    expect(config_fh.string).to eq original_config
+  end
+
+  it "adds a set name and value to an empty file" do
+    config_fh = a_config_file_containing("")
+
+    Puppet::Settings::IniFile.update(config_fh) do |config|
+      config.set("the_section", "name", "value")
+    end
+
+    expect(config_fh.string).to eq "[the_section]\nname = value\n"
+  end
+
+  it "does not add a [main] section to a file when it isn't needed" do
+    config_fh = a_config_file_containing(<<-CONF)
+    [section]
+    name = different value
+    CONF
+
+
+    Puppet::Settings::IniFile.update(config_fh) do |config|
+      config.set("main", "name", "value")
+    end
+
+    expect(config_fh.string).to eq(<<-CONF)
+name = value
+    [section]
+    name = different value
+    CONF
+  end
+
+  it "preserves comments when writing a new name and value" do
+    config_fh = a_config_file_containing("# this is a comment")
+
+    Puppet::Settings::IniFile.update(config_fh) do |config|
+      config.set("the_section", "name", "value")
+    end
+
+    expect(config_fh.string).to eq "# this is a comment\n[the_section]\nname = value\n"
+  end
+
+  it "updates existing names and values in place" do
+    config_fh = a_config_file_containing(<<-CONFIG)
+    # this is the preceeding comment
+     [section]
+    name = original value
+    # this is the trailing comment
+    CONFIG
+
+    Puppet::Settings::IniFile.update(config_fh) do |config|
+      config.set("section", "name", "changed value")
+    end
+
+    expect(config_fh.string).to eq <<-CONFIG
+    # this is the preceeding comment
+     [section]
+    name = changed value
+    # this is the trailing comment
+    CONFIG
+  end
+
+  it "updates only the value in the selected section" do
+    config_fh = a_config_file_containing(<<-CONFIG)
+    [other_section]
+    name = does not change
+    [section]
+    name = original value
+    CONFIG
+
+    Puppet::Settings::IniFile.update(config_fh) do |config|
+      config.set("section", "name", "changed value")
+    end
+
+    expect(config_fh.string).to eq <<-CONFIG
+    [other_section]
+    name = does not change
+    [section]
+    name = changed value
+    CONFIG
+  end
+
+  it "considers settings outside a section to be in section 'main'" do
+    config_fh = a_config_file_containing(<<-CONFIG)
+    name = original value
+    CONFIG
+
+    Puppet::Settings::IniFile.update(config_fh) do |config|
+      config.set("main", "name", "changed value")
+    end
+
+    expect(config_fh.string).to eq <<-CONFIG
+    name = changed value
+    CONFIG
+  end
+
+  it "adds new settings to an existing section" do
+    config_fh = a_config_file_containing(<<-CONFIG)
+    [section]
+    original = value
+
+    # comment about 'other' section
+    [other]
+    dont = change
+    CONFIG
+
+    Puppet::Settings::IniFile.update(config_fh) do |config|
+      config.set("section", "updated", "new")
+    end
+
+    expect(config_fh.string).to eq <<-CONFIG
+    [section]
+    original = value
+updated = new
+
+    # comment about 'other' section
+    [other]
+    dont = change
+    CONFIG
+  end
+
+  it "adds a new setting into an existing, yet empty section" do
+    config_fh = a_config_file_containing(<<-CONFIG)
+    [section]
+    [other]
+    dont = change
+    CONFIG
+
+    Puppet::Settings::IniFile.update(config_fh) do |config|
+      config.set("section", "updated", "new")
+    end
+
+    expect(config_fh.string).to eq <<-CONFIG
+    [section]
+updated = new
+    [other]
+    dont = change
+    CONFIG
+  end
+
+  it "finds settings when the section is split up" do
+    config_fh = a_config_file_containing(<<-CONFIG)
+    [section]
+    name = original value
+    [different]
+    name = other value
+    [section]
+    other_name = different original value
+    CONFIG
+
+    Puppet::Settings::IniFile.update(config_fh) do |config|
+      config.set("section", "name", "changed value")
+      config.set("section", "other_name", "other changed value")
+    end
+
+    expect(config_fh.string).to eq <<-CONFIG
+    [section]
+    name = changed value
+    [different]
+    name = other value
+    [section]
+    other_name = other changed value
+    CONFIG
+  end
+
+  def a_config_file_containing(text)
+    StringIO.new(text)
+  end
+end

data/spec/unit/settings_spec.rb

@@ -103,8 +103,8 @@ describe Puppet::Settings do
   end
 
   describe "#call_hooks_deferred_to_application_initialization" do
-    let (:good_default) { "yay" }
-    let (:bad_default) { "$doesntexist" }
+    let(:good_default) { "yay" }
+    let(:bad_default) { "$doesntexist" }
     before(:each) do
       @settings = Puppet::Settings.new
     end
@@ -148,7 +148,7 @@ describe Puppet::Settings do
             )
             expect do
               @settings.send(:call_hooks_deferred_to_application_initialization, options)
-            end.to raise_error Puppet::Settings::InterpolationError
+            end.to raise_error(Puppet::Settings::InterpolationError)
           end
           it "should contain the setting name in error message" do
             hook_values = []
@@ -163,7 +163,7 @@ describe Puppet::Settings do
             )
             expect do
               @settings.send(:call_hooks_deferred_to_application_initialization, options)
-            end.to raise_error Puppet::Settings::InterpolationError, /badhook/
+            end.to raise_error(Puppet::Settings::InterpolationError, /badhook/)
           end
         end
         describe "if no interpolation error" do
@@ -205,48 +205,40 @@ describe Puppet::Settings do
     end
 
     it "should support a getopt-specific mechanism for turning booleans off" do
-      @settings[:bool] = true
+      @settings.override_default(:bool, true)
       @settings.handlearg("--no-bool", "")
       @settings[:bool].should == false
     end
 
     it "should support a getopt-specific mechanism for turning booleans on" do
       # Turn it off first
-      @settings[:bool] = false
+      @settings.override_default(:bool, false)
       @settings.handlearg("--bool", "")
       @settings[:bool].should == true
     end
 
     it "should consider a cli setting with no argument to be a boolean" do
       # Turn it off first
-      @settings[:bool] = false
+      @settings.override_default(:bool, false)
       @settings.handlearg("--bool")
       @settings[:bool].should == true
     end
 
-    it "should consider a cli setting with an empty string as an argument to be a boolean, if the setting itself is a boolean" do
-      # Turn it off first
-      @settings[:bool] = false
-      @settings.handlearg("--bool", "")
-      @settings[:bool].should == true
-    end
-
     it "should consider a cli setting with an empty string as an argument to be an empty argument, if the setting itself is not a boolean" do
-      @settings[:myval] = "bob"
+      @settings.override_default(:myval, "bob")
       @settings.handlearg("--myval", "")
       @settings[:myval].should == ""
     end
 
     it "should consider a cli setting with a boolean as an argument to be a boolean" do
       # Turn it off first
-      @settings[:bool] = false
+      @settings.override_default(:bool, false)
       @settings.handlearg("--bool", "true")
       @settings[:bool].should == true
     end
 
     it "should not consider a cli setting of a non boolean with a boolean as an argument to be a boolean" do
-      # Turn it off first
-      @settings[:myval] = "bob"
+      @settings.override_default(:myval, "bob")
       @settings.handlearg("--no-myval", "")
       @settings[:myval].should == ""
     end
@@ -257,7 +249,6 @@ describe Puppet::Settings do
     end
 
     it "should flag bool settings from the CLI" do
-      @settings[:bool] = false
       @settings.handlearg("--bool")
       @settings.set_by_cli?(:bool).should be_true
     end
@@ -269,7 +260,7 @@ describe Puppet::Settings do
 
     describe "setbycli" do
       it "should generate a deprecation warning" do
-        Puppet.expects(:deprecation_warning)
+        Puppet.expects(:deprecation_warning).at_least(1)
         @settings.setting(:myval).setbycli = true
       end
       it "should set the value" do
@@ -281,7 +272,7 @@ describe Puppet::Settings do
         @settings.handlearg("--myval", "blah")
         expect do
           @settings.setting(:myval).setbycli = nil
-        end.to raise_error ArgumentError, /unset/
+        end.to raise_error(ArgumentError, /unset/)
       end
     end
 
@@ -318,12 +309,12 @@ describe Puppet::Settings do
             it "should raise error if no hook defined" do
               expect do
                 @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :call_hook => val})
-              end.to raise_error ArgumentError, /no :hook/
+              end.to raise_error(ArgumentError, /no :hook/)
             end
             it "should include the setting name in the error message" do
               expect do
                 @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :call_hook => val})
-              end.to raise_error ArgumentError, /for :hooker/
+              end.to raise_error(ArgumentError, /for :hooker/)
             end
           end
           describe "and definition valid" do
@@ -360,7 +351,7 @@ describe Puppet::Settings do
         it "should raise an error" do
           expect do
             @settings.define_settings(:section, :hooker => {:default => "yay", :desc => "boo", :call_hook => :foo, :hook => lambda { |v| hook_values << v  }})
-          end.to raise_error ArgumentError, /invalid.*call_hook/i
+          end.to raise_error(ArgumentError, /invalid.*call_hook/i)
         end
       end
 
@@ -457,10 +448,11 @@ describe Puppet::Settings do
       @settings[:bool].should == false
     end
 
-    it "should prefer cli values to values set in Ruby code" do
-      @settings.handlearg("--myval", "cliarg")
+    it "should prefer values set in ruby to values set on the cli" do
       @settings[:myval] = "memarg"
-      @settings[:myval].should == "cliarg"
+      @settings.handlearg("--myval", "cliarg")
+
+      @settings[:myval].should == "memarg"
     end
 
     it "should clear the list of environments" do
@@ -471,7 +463,13 @@ describe Puppet::Settings do
     it "should raise an error if we try to set a setting that hasn't been defined'" do
       lambda{
         @settings[:why_so_serious] = "foo"
-      }.should raise_error(ArgumentError, /unknown configuration parameter/)
+      }.should raise_error(ArgumentError, /unknown setting/)
+    end
+
+    it "allows overriding cli args based on the cli-set value" do
+      @settings.handlearg("--myval", "cliarg")
+      @settings.set_value(:myval, "modified #{@settings[:myval]}", :cli)
+      expect(@settings[:myval]).to eq("modified cliarg")
     end
   end
 
@@ -485,7 +483,7 @@ describe Puppet::Settings do
           :three  => { :default => "$one $two THREE", :desc => "c"},
           :four   => { :default => "$two $three FOUR", :desc => "d"},
           :five   => { :default => nil, :desc => "e" }
-      Puppet::FileSystem::File.stubs(:exist?).returns true
+      Puppet::FileSystem.stubs(:exist?).returns true
     end
 
     describe "call_on_define" do
@@ -509,6 +507,20 @@ describe Puppet::Settings do
       @settings[:one].should == "other"
     end
 
+    it "setting a value to nil causes it to return to its default" do
+      default_values = { :one => "skipped value" }
+      [:logdir, :confdir, :vardir].each do |key|
+        default_values[key] = 'default value'
+      end
+      @settings.define_settings :main, PuppetSpec::Settings::TEST_APP_DEFAULT_DEFINITIONS
+      @settings.initialize_app_defaults(default_values)
+      @settings[:one] = "value will disappear"
+
+      @settings[:one] = nil
+
+      @settings[:one].should == "ONE"
+    end
+
     it "should interpolate default values for other parameters into returned parameter values" do
       @settings[:one].should == "ONE"
       @settings[:two].should == "ONE TWO"
@@ -542,20 +554,6 @@ describe Puppet::Settings do
       @settings[:two].should == "one TWO"
     end
 
-    describe "caching values that evaluate to false" do
-      it "caches nil" do
-        @settings.expects(:convert).once.returns nil
-        @settings[:five].should be_nil
-        @settings[:five].should be_nil
-      end
-
-      it "caches false" do
-        @settings.expects(:convert).once.returns false
-        @settings[:five].should == false
-        @settings[:five].should == false
-      end
-    end
-
     it "should not cache values such that information from one environment is returned for another environment" do
       text = "[env1]\none = oneval\n[env2]\none = twoval\n"
       @settings.stubs(:read_file).returns(text)
@@ -569,6 +567,13 @@ describe Puppet::Settings do
       @settings.preferred_run_mode.should == :user
     end
 
+    it "interpolates a boolean false without raising an error" do
+      @settings.define_settings(:section,
+          :trip_wire => { :type => :boolean, :default => false, :desc => "a trip wire" },
+          :tripping => { :default => '$trip_wire', :desc => "once tripped if interpolated was false" })
+      @settings[:tripping].should == "false"
+    end
+
     describe "setbycli" do
       it "should generate a deprecation warning" do
         @settings.handlearg("--one", "blah")
@@ -589,7 +594,7 @@ describe Puppet::Settings do
         :config => { :type => :file, :default => "/my/file", :desc => "a" },
         :one => { :default => "ONE", :desc => "a" },
         :two => { :default => "TWO", :desc => "b" }
-      Puppet::FileSystem::File.stubs(:exist?).returns true
+      Puppet::FileSystem.stubs(:exist?).returns true
       @settings.preferred_run_mode = :agent
     end
 
@@ -606,12 +611,6 @@ describe Puppet::Settings do
       @settings[:one].should == "clival"
     end
 
-    it "should return values set on the cli before values set in Ruby" do
-      @settings[:one] = "rubyval"
-      @settings.handlearg("--one", "clival")
-      @settings[:one].should == "clival"
-    end
-
     it "should return values set in the mode-specific section before values set in the main section" do
       text = "[main]\none = mainval\n[agent]\none = modeval\n"
       @settings.stubs(:read_file).returns(text)
@@ -666,8 +665,8 @@ describe Puppet::Settings do
     describe "when root" do
       it "should look for the main config file default location config settings haven't been overridden'" do
         Puppet.features.stubs(:root?).returns(true)
-        Puppet::FileSystem::File.expects(:exist?).with(main_config_file_default_location).returns(false)
-        Puppet::FileSystem::File.expects(:exist?).with(user_config_file_default_location).never
+        Puppet::FileSystem.expects(:exist?).with(main_config_file_default_location).returns(false)
+        Puppet::FileSystem.expects(:exist?).with(user_config_file_default_location).never
 
         @settings.send(:parse_config_files)
       end
@@ -678,7 +677,7 @@ describe Puppet::Settings do
         Puppet.features.stubs(:root?).returns(false)
 
         seq = sequence "load config files"
-        Puppet::FileSystem::File.expects(:exist?).with(user_config_file_default_location).returns(false).in_sequence(seq)
+        Puppet::FileSystem.expects(:exist?).with(user_config_file_default_location).returns(false).in_sequence(seq)
 
         @settings.send(:parse_config_files)
       end
@@ -699,8 +698,8 @@ describe Puppet::Settings do
           :two => { :default => "$one TWO", :desc => "b" },
           :three => { :default => "$one $two THREE", :desc => "c" }
       @settings.stubs(:user_config_file).returns(@userconfig)
-      Puppet::FileSystem::File.stubs(:exist?).with(@file).returns true
-      Puppet::FileSystem::File.stubs(:exist?).with(@userconfig).returns false
+      Puppet::FileSystem.stubs(:exist?).with(@file).returns true
+      Puppet::FileSystem.stubs(:exist?).with(@userconfig).returns false
     end
 
     it "should not ignore the report setting" do
@@ -712,7 +711,7 @@ describe Puppet::Settings do
         [puppetd]
           report=true
       CONF
-      Puppet::FileSystem::File.expects(:exist?).with(myfile).returns(true)
+      Puppet::FileSystem.expects(:exist?).with(myfile).returns(true)
       @settings.expects(:read_file).returns(text)
       @settings.send(:parse_config_files)
       @settings[:report].should be_true
@@ -722,7 +721,7 @@ describe Puppet::Settings do
       myfile = make_absolute("/my/file") # do not stub expand_path here, as this leads to a stack overflow, when mocha tries to use it
       @settings[:config] = myfile
 
-      Puppet::FileSystem::File.expects(:exist?).with(myfile).returns(true)
+      Puppet::FileSystem.expects(:exist?).with(myfile).returns(true)
 
       File.expects(:read).with(myfile).returns "[main]"
 
@@ -730,7 +729,7 @@ describe Puppet::Settings do
     end
 
     it "should not try to parse non-existent files" do
-      Puppet::FileSystem::File.expects(:exist?).with(@file).returns false
+      Puppet::FileSystem.expects(:exist?).with(@file).returns false
 
       File.expects(:read).with(@file).never
 
@@ -777,11 +776,11 @@ describe Puppet::Settings do
       @settings.define_settings :section, :myfile => { :type => :file, :default => make_absolute("/myfile"), :desc => "a" }
 
       otherfile = make_absolute("/other/file")
-      text = "[main]
+      @settings.parse_config(<<-CONF)
+      [main]
       myfile = #{otherfile} {owner = service, group = service, mode = 644}
-      "
-      @settings.expects(:read_file).returns(text)
-      @settings.send(:parse_config_files)
+      CONF
+
       @settings[:myfile].should == otherfile
       @settings.metadata(:myfile).should == {:owner => "suser", :group => "sgroup", :mode => "644"}
     end
@@ -790,11 +789,11 @@ describe Puppet::Settings do
       @settings.define_settings :section, :myfile => { :type => :file, :default => make_absolute("/myfile"), :desc => "a" }
 
       otherfile = make_absolute("/other/file")
-      text = "[main]
+      @settings.parse_config(<<-CONF)
+      [main]
       myfile = #{otherfile} {owner = service}
-      "
-      @settings.expects(:read_file).returns(text)
-      @settings.send(:parse_config_files)
+      CONF
+
       @settings[:myfile].should == otherfile
       @settings.metadata(:myfile).should == {:owner => "suser"}
     end
@@ -826,6 +825,37 @@ describe Puppet::Settings do
       @settings.metadata(:myfile).should == {:mode => "664"}
     end
 
+    it "does not use the metadata from the same setting in a different section" do
+      default_values = {}
+      PuppetSpec::Settings::TEST_APP_DEFAULT_DEFINITIONS.keys.each do |key|
+        default_values[key] = 'default value'
+      end
+
+      file = make_absolute("/file")
+      default_mode = "0600"
+      @settings.define_settings :main, PuppetSpec::Settings::TEST_APP_DEFAULT_DEFINITIONS
+      @settings.define_settings :master, :myfile => { :type => :file, :default => file, :desc => "a", :mode => default_mode }
+
+      text = "[master]
+      myfile = #{file}/foo
+      [agent]
+      myfile = #{file} {mode = 664}
+      "
+      @settings.expects(:read_file).returns(text)
+
+      # will start initialization as user
+      @settings.preferred_run_mode.should == :user
+      @settings.send(:parse_config_files)
+
+      # change app run_mode to master
+      @settings.initialize_app_defaults(default_values.merge(:run_mode => :master))
+      @settings.preferred_run_mode.should == :master
+
+      # initializing the app should have reloaded the metadata based on run_mode
+      @settings[:myfile].should == "#{file}/foo"
+      @settings.metadata(:myfile).should == { :mode => default_mode }
+    end
+
     it "should call hooks associated with values set in the configuration file" do
       values = []
       @settings.define_settings :section, :mysetting => {:default => "defval", :desc => "a", :hook => proc { |v| values << v }}
@@ -905,7 +935,28 @@ describe Puppet::Settings do
       @settings.initialize_app_defaults(:logdir => '/path/to/logdir', :confdir => '/path/to/confdir', :vardir => '/path/to/vardir')
 
       hook_invoked.should be_true
-      @settings[:deferred].should eq File.expand_path('/path/to/confdir/goose')
+      @settings[:deferred].should eq(File.expand_path('/path/to/confdir/goose'))
+    end
+
+    it "does not require the value for a setting without a hook to resolve during global setup" do
+      hook_invoked = false
+      @settings.define_settings :section, :can_cause_problems  => {:desc => '' }
+
+      @settings.define_settings(:main,
+        :logdir       => { :type => :directory, :default => nil, :desc => "logdir" },
+        :confdir      => { :type => :directory, :default => nil, :desc => "confdir" },
+        :vardir       => { :type => :directory, :default => nil, :desc => "vardir" })
+
+      text = <<-EOD
+      [main]
+      can_cause_problems=$confdir/goose
+      EOD
+
+      @settings.stubs(:read_file).returns(text)
+      @settings.initialize_global_settings
+      @settings.initialize_app_defaults(:logdir => '/path/to/logdir', :confdir => '/path/to/confdir', :vardir => '/path/to/vardir')
+
+      @settings[:can_cause_problems].should eq(File.expand_path('/path/to/confdir/goose'))
     end
 
     it "should allow empty values" do
@@ -952,7 +1003,7 @@ describe Puppet::Settings do
     context "running non-root without explicit config file" do
       before :each do
         Puppet.features.stubs(:root?).returns(false)
-        Puppet::FileSystem::File.expects(:exist?).
+        Puppet::FileSystem.expects(:exist?).
           with(user_config_file_default_location).
           returns(true).in_sequence(seq)
         @settings.expects(:read_file).
@@ -974,7 +1025,7 @@ describe Puppet::Settings do
     context "running as root without explicit config file" do
       before :each do
         Puppet.features.stubs(:root?).returns(true)
-        Puppet::FileSystem::File.expects(:exist?).
+        Puppet::FileSystem.expects(:exist?).
           with(main_config_file_default_location).
           returns(true).in_sequence(seq)
         @settings.expects(:read_file).
@@ -997,7 +1048,7 @@ describe Puppet::Settings do
       before :each do
         Puppet.features.stubs(:root?).returns(false)
         @settings[:confdir] = File.dirname(main_config_file_default_location)
-        Puppet::FileSystem::File.expects(:exist?).
+        Puppet::FileSystem.expects(:exist?).
           with(main_config_file_default_location).
           returns(true).in_sequence(seq)
         @settings.expects(:read_file).
@@ -1027,13 +1078,13 @@ describe Puppet::Settings do
           :one => { :default => "ONE", :desc => "a" },
           :two => { :default => "$one TWO", :desc => "b" },
           :three => { :default => "$one $two THREE", :desc => "c" }
-      Puppet::FileSystem::File.stubs(:exist?).with(@file).returns true
-      Puppet::FileSystem::File.stubs(:exist?).with(@userconfig).returns false
+      Puppet::FileSystem.stubs(:exist?).with(@file).returns true
+      Puppet::FileSystem.stubs(:exist?).with(@userconfig).returns false
       @settings.stubs(:user_config_file).returns(@userconfig)
     end
 
     it "does not create the WatchedFile instance and should not parse if the file does not exist" do
-      Puppet::FileSystem::File.expects(:exist?).with(@file).returns false
+      Puppet::FileSystem.expects(:exist?).with(@file).returns false
       Puppet::Util::WatchedFile.expects(:new).never
 
       @settings.expects(:parse_config_files).never
@@ -1064,7 +1115,7 @@ describe Puppet::Settings do
       it "reparses if the file has changed" do
         @watched_file.expects(:changed?).returns true
 
-        @settings.expects(:unsafe_parse).with(@file)
+        @settings.expects(:parse_config_files)
 
         @settings.reparse_config_files
       end
@@ -1372,13 +1423,20 @@ describe Puppet::Settings do
 
       @trans.expects(:any_failed?).returns(true)
 
-      report = mock 'report'
-      @trans.expects(:report).returns report
+      resource = Puppet::Type.type(:notify).new(:title => 'failed')
+      status = Puppet::Resource::Status.new(resource)
+      event = Puppet::Transaction::Event.new(
+        :name => 'failure',
+        :status => 'failure',
+        :message => 'My failure')
+      status.add_event(event)
 
-      log = mock 'log', :to_s => "My failure", :level => :err
-      report.expects(:logs).returns [log]
+      report = Puppet::Transaction::Report.new('apply')
+      report.add_resource_status(status)
+
+      @trans.expects(:report).returns report
 
-      @settings.expects(:raise).with { |msg| msg.include?("My failure") }
+      @settings.expects(:raise).with(includes("My failure"))
       @settings.use(:whatever)
     end
   end