diff options
| author | Markus Roberts <Markus@reality.com> | 2010-06-28 16:28:44 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-06-28 16:28:44 -0700 |
| commit | 85638cf427fe9b35d3e3b0fa4ce919c5806c60d3 (patch) | |
| tree | dbe2b042d55734d3a3049f632ddcc732f6bf561e /spec/unit/util/settings_spec.rb | |
| parent | 06dffc104a57e97ac5a4a8d00747354750642526 (diff) | |
| parent | ef40a56e1e13d4790292fdf202365e641ed6df2f (diff) | |
| download | puppet-85638cf427fe9b35d3e3b0fa4ce919c5806c60d3.tar.gz puppet-85638cf427fe9b35d3e3b0fa4ce919c5806c60d3.tar.xz puppet-85638cf427fe9b35d3e3b0fa4ce919c5806c60d3.zip | |
Merge branch 'testing' into tweak/testing/file_fix_root_spec_failure
Diffstat (limited to 'spec/unit/util/settings_spec.rb')
| -rwxr-xr-x | spec/unit/util/settings_spec.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/spec/unit/util/settings_spec.rb b/spec/unit/util/settings_spec.rb index e36fd3fd9..3e70cb581 100755 --- a/spec/unit/util/settings_spec.rb +++ b/spec/unit/util/settings_spec.rb @@ -531,7 +531,6 @@ describe Puppet::Util::Settings do EventLoop::Timer.expects(:new).never @settings.parse - puts "2", @settings[:filetimeout] end end end @@ -680,8 +679,6 @@ describe Puppet::Util::Settings do @settings.setdefaults :other, :otherdir => [@prefix+"/otherdir", "a"] catalog = @settings.to_catalog - p "three dirs" - p catalog [@prefix+"/maindir", @prefix+"/seconddir", @prefix+"/otherdir"].each do |path| catalog.resource(:file, path).should be_instance_of(Puppet::Resource) @@ -692,7 +689,6 @@ describe Puppet::Util::Settings do @settings.setdefaults :main, :maindir => [@prefix+"/maindir", "a"] @settings.setdefaults :other, :otherdir => [@prefix+"/otherdir", "a"] catalog = @settings.to_catalog(:main) - p catalog catalog.resource(:file, @prefix+"/otherdir").should be_nil catalog.resource(:file, @prefix+"/maindir").should be_instance_of(Puppet::Resource) end |