diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-01-05 17:22:30 -0800 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-01-06 15:19:42 -0800 |
| commit | b16e10dba6606b808ef195f4b57f2e8c66cf65ab (patch) | |
| tree | bdacf054c1e877166217336322050ee03f28d607 /spec/integration/application | |
| parent | fb8509acbd947712cac094a49227d28a16a366aa (diff) | |
| parent | 19eb1e78e115d10bfb822e510213e4fab9cd2599 (diff) | |
| download | puppet-b16e10dba6606b808ef195f4b57f2e8c66cf65ab.tar.gz puppet-b16e10dba6606b808ef195f4b57f2e8c66cf65ab.tar.xz puppet-b16e10dba6606b808ef195f4b57f2e8c66cf65ab.zip | |
Merge branch '2.6.x' into next
Conflicts:
Rakefile
lib/puppet/resource/type_collection.rb
lib/puppet/simple_graph.rb
lib/puppet/transaction.rb
lib/puppet/transaction/report.rb
lib/puppet/util/metric.rb
spec/integration/indirector/report/rest_spec.rb
spec/spec_specs/runnable_spec.rb
spec/unit/configurer_spec.rb
spec/unit/indirector_spec.rb
spec/unit/transaction/change_spec.rb
Diffstat (limited to 'spec/integration/application')
| -rwxr-xr-x | spec/integration/application/apply_spec.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/integration/application/apply_spec.rb b/spec/integration/application/apply_spec.rb index 382449e75..876f55568 100755 --- a/spec/integration/application/apply_spec.rb +++ b/spec/integration/application/apply_spec.rb @@ -9,8 +9,7 @@ require 'puppet/application/apply' describe "apply" do include PuppetSpec::Files - describe "when applying provided catalogs" do - confine "PSON library is missing; cannot test applying catalogs" => Puppet.features.pson? + describe "when applying provided catalogs", :if => Puppet.features.pson? do it "should be able to apply catalogs provided in a file in pson" do file_to_create = tmpfile("pson_catalog") catalog = Puppet::Resource::Catalog.new |