diff options
| author | Luke Kanies <luke@madstop.com> | 2009-08-10 04:31:26 +0000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-08-10 17:39:40 +1000 |
| commit | a88fc4d24c50d91aa764fa8f52797e86bb6d8965 (patch) | |
| tree | e4d77ea5dcdd29cf039788d5e37ac41e183bc644 /spec/unit | |
| parent | 9a356ab289a64245cf59cd763dc953a93d71682b (diff) | |
| download | puppet-a88fc4d24c50d91aa764fa8f52797e86bb6d8965.tar.gz puppet-a88fc4d24c50d91aa764fa8f52797e86bb6d8965.tar.xz puppet-a88fc4d24c50d91aa764fa8f52797e86bb6d8965.zip | |
Fixing more tests broken from missing libraries
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'spec/unit')
| -rwxr-xr-x[-rw-r--r--] | spec/unit/application/puppet.rb | 2 | ||||
| -rwxr-xr-x | spec/unit/indirector/queue.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/spec/unit/application/puppet.rb b/spec/unit/application/puppet.rb index ca1203405..00fe1ddea 100644..100755 --- a/spec/unit/application/puppet.rb +++ b/spec/unit/application/puppet.rb @@ -331,6 +331,8 @@ describe "Puppet" do end describe "the 'apply' command" do + confine "JSON library is missing; cannot test applying catalogs" => Puppet.features.json? + before do #Puppet::Resource::Catalog.stubs(:json_create).returns Puppet::Resource::Catalog.new JSON.stubs(:parse).returns Puppet::Resource::Catalog.new diff --git a/spec/unit/indirector/queue.rb b/spec/unit/indirector/queue.rb index 3bc066873..c81cefec9 100755 --- a/spec/unit/indirector/queue.rb +++ b/spec/unit/indirector/queue.rb @@ -27,6 +27,8 @@ class FooExampleData end describe Puppet::Indirector::Queue do + confine "JSON library is missing; cannot test queueing" => Puppet.features.json? + before :each do @model = mock 'model' @indirection = stub 'indirection', :name => :my_queue, :register_terminus_type => nil, :model => @model |
