diff options
| author | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-05-17 14:50:40 -0700 |
|---|---|---|
| committer | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-05-17 14:50:40 -0700 |
| commit | f9e44f041b3fdc120b1c78554c35c83f7517152e (patch) | |
| tree | f5d4687277fff6fe697a92089f1fa9283dce1bb4 /spec/unit/network/handler | |
| parent | 99d437d2bbc2339f092304715ec562fbbcb0a50c (diff) | |
| parent | c8b294a0b0a1fc91a64c0a1ac3bab3b2aec92faf (diff) | |
Merge branch '2.7.x' into 2.7.next
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 |