summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-03-22 13:53:50 -0700
committerJesse Wolfe <jes5199@gmail.com>2010-03-22 14:58:39 -0700
commit88d6cd5368668b0cf203f6363032adc8d166e876 (patch)
tree792137b0f222248cb3e643b12d122be11b99ebed
parentd9920bc4fdad38c7c753bf9cc137c064c33ae7a6 (diff)
downloadpuppet-88d6cd5368668b0cf203f6363032adc8d166e876.tar.gz
puppet-88d6cd5368668b0cf203f6363032adc8d166e876.tar.xz
puppet-88d6cd5368668b0cf203f6363032adc8d166e876.zip
Bug #3401 Spec failed due to missing manditory setting in mock
Puppet::Util::Settings#use now requires the :noop setting to exist, and this test was not providing one in its mocked default structure.
-rwxr-xr-xspec/integration/util/settings.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/spec/integration/util/settings.rb b/spec/integration/util/settings.rb
index 146b988fd..826bfc97e 100755
--- a/spec/integration/util/settings.rb
+++ b/spec/integration/util/settings.rb
@@ -7,9 +7,13 @@ require 'puppet_spec/files'
describe Puppet::Util::Settings do
include PuppetSpec::Files
+ def minimal_default_settings
+ { :noop => {:default => false, :desc => "noop"} }
+ end
+
it "should be able to make needed directories" do
settings = Puppet::Util::Settings.new
- settings.setdefaults :main, :maindir => [tmpfile("main"), "a"]
+ settings.setdefaults :main, minimal_default_settings.update( :maindir => [tmpfile("main"), "a"] )
settings.use(:main)
@@ -18,7 +22,7 @@ describe Puppet::Util::Settings do
it "should make its directories with the corret modes" do
settings = Puppet::Util::Settings.new
- settings.setdefaults :main, :maindir => {:default => tmpfile("main"), :desc => "a", :mode => 0750}
+ settings.setdefaults :main, minimal_default_settings.update( :maindir => {:default => tmpfile("main"), :desc => "a", :mode => 0750} )
settings.use(:main)