diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-07-27 15:59:10 -0700 |
|---|---|---|
| committer | Josh Cooper <josh@puppetlabs.com> | 2011-07-27 15:59:10 -0700 |
| commit | 0668c5e4ef080c5dd7e37f35b72b484ca6574fdb (patch) | |
| tree | 75c6acb3bd90de43e5d7fbfb519c28333e281fc0 /spec/integration | |
| parent | e6fb1480eb2d6271dd05e11ab6cff70c70414c6f (diff) | |
| parent | e0d3f11fc7b580aedec5350dc41a01417d6acd8d (diff) | |
Merge branch 'ticket/master/8663-windows-spec-tests'
* ticket/master/8663-windows-spec-tests:
(#8663) Drive letters are not valid absolute paths on Windows
(#8663) Update the run_mode spec test on Windows to match the code
(#8663) The ssh_authorized_key type is not supported on Windows
(#8663) Reenable spec tests on Windows that now pass
Diffstat (limited to 'spec/integration')
| -rwxr-xr-x | spec/integration/parser/ruby_manifest_spec.rb | 2 | ||||
| -rwxr-xr-x | spec/integration/resource/type_collection_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/integration/parser/ruby_manifest_spec.rb b/spec/integration/parser/ruby_manifest_spec.rb index b04baf5e0..7f3bb71e9 100755 --- a/spec/integration/parser/ruby_manifest_spec.rb +++ b/spec/integration/parser/ruby_manifest_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' require 'tempfile' require 'puppet_spec/files' -describe "Pure ruby manifests", :fails_on_windows => true do +describe "Pure ruby manifests" do include PuppetSpec::Files before do diff --git a/spec/integration/resource/type_collection_spec.rb b/spec/integration/resource/type_collection_spec.rb index 0852a9850..6ea2e7fe7 100755 --- a/spec/integration/resource/type_collection_spec.rb +++ b/spec/integration/resource/type_collection_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' require 'puppet_spec/files' require 'puppet/resource/type_collection' -describe Puppet::Resource::TypeCollection, :fails_on_windows => true do +describe Puppet::Resource::TypeCollection do describe "when autoloading from modules" do include PuppetSpec::Files |