Merge branch '2.7.x' into 2.7.next

4 files changed, 5 insertions, 5 deletions

diff --git a/spec/unit/application/cert_spec.rb b/spec/unit/application/cert_spec.rb
index 1b1c61ab4..7510f0783 100755
--- a/spec/unit/application/cert_spec.rb
+++ b/spec/unit/application/cert_spec.rb
@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'puppet/application/cert'
 
-describe Puppet::Application::Cert do
+describe Puppet::Application::Cert, :'fails_on_ruby_1.9.2' => true do
   before :each do
     @cert_app = Puppet::Application[:cert]
     Puppet::Util::Log.stubs(:newdestination)
diff --git a/spec/unit/application/face_base_spec.rb b/spec/unit/application/face_base_spec.rb
index 2a9a22356..3318e061e 100755
--- a/spec/unit/application/face_base_spec.rb
+++ b/spec/unit/application/face_base_spec.rb
@@ -148,7 +148,7 @@ describe Puppet::Application::FaceBase do
       end
     end
 
-    it "should handle application-level options" do
+    it "should handle application-level options", :'fails_on_ruby_1.9.2' => true do
       app.command_line.stubs(:args).returns %w{basetest --verbose return_true}
       app.preinit
       app.parse_options
diff --git a/spec/unit/application/facts_spec.rb b/spec/unit/application/facts_spec.rb
index 2981dc805..e11ea165c 100755
--- a/spec/unit/application/facts_spec.rb
+++ b/spec/unit/application/facts_spec.rb
@@ -15,7 +15,7 @@ describe Puppet::Application::Facts do
     @logs.first.to_s.should =~ /puppet facts find takes 1 argument, but you gave 0/
   end
 
-  it "should return facts if a key is given to find" do
+  it "should return facts if a key is given to find", :'fails_on_ruby_1.9.2' => true do
     subject.command_line.stubs(:args).returns %w{find whatever --render-as yaml}
 
     expect {
diff --git a/spec/unit/application/resource_spec.rb b/spec/unit/application/resource_spec.rb
index 9ee6dd71b..a6564cae5 100755
--- a/spec/unit/application/resource_spec.rb
+++ b/spec/unit/application/resource_spec.rb
@@ -35,13 +35,13 @@ describe Puppet::Application::Resource do
   end
 
   describe "in preinit" do
-    it "should set hosts to nil" do
+    it "should set hosts to nil", :'fails_on_ruby_1.9.2' => true do
       @resource.preinit
 
       @resource.host.should be_nil
     end
 
-    it "should init extra_params to empty array" do
+    it "should init extra_params to empty array", :'fails_on_ruby_1.9.2' => true do
       @resource.preinit
 
       @resource.extra_params.should == []