diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-05-17 10:16:03 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-05-17 10:16:03 -0700 |
| commit | 5457c70a66ef95482391e39e43f1fa99ac83e721 (patch) | |
| tree | 4404cb2a154461798374e93f99d989325a1a76d4 /spec/unit/network/handler | |
| parent | 009c961ec6e71621cd984b98a5d4e3c855dbaee4 (diff) | |
| parent | 9da1454e71b8330e929ac5616eefa44388c90832 (diff) | |
Merge branch 'ticket/2.7.x/7507-filter_19_failures' into 2.7.x
* ticket/2.7.x/7507-filter_19_failures:
(#7507) Add ability to filter Ruby 1.9 spec failures
(#7507) Fix when_invoked action specs in Ruby 1.9
Diffstat (limited to 'spec/unit/network/handler')
| -rwxr-xr-x | spec/unit/network/handler/fileserver_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/network/handler/fileserver_spec.rb b/spec/unit/network/handler/fileserver_spec.rb index 52c4a71f5..08852634d 100755 --- a/spec/unit/network/handler/fileserver_spec.rb +++ b/spec/unit/network/handler/fileserver_spec.rb @@ -123,7 +123,7 @@ describe Puppet::Network::Handler::FileServer do list.sort.should == [ ["/aFile", "file"], ["/", "directory"] ].sort end - describe Puppet::Network::Handler::FileServer::PluginMount do + describe Puppet::Network::Handler::FileServer::PluginMount, :'fails_on_ruby_1.9.2' => true do PLUGINS = Puppet::Network::Handler::FileServer::PLUGINS # create a module plugin hierarchy |