Merge branch '2.7.x'

* 2.7.x:
  (#7502) Fixed parser spec for ruby 1.8.5
  (#7507) Add more 1.9 filters
  (#6395) Add extpuppet help, eval, and interfaces
  maint: move trap call to Signal so we can stub it for specs
  Updated CHANGELOG for 2.7.0rc3
  (#7259) Remove ActiveRecord requirement from indirector face spec
  (#7259) Do not try to load all Terminus classes when configuring the Indirector
  Adding a sleep state post starting master

3 files changed, 7 insertions, 7 deletions

diff --git a/spec/unit/application/device_spec.rb b/spec/unit/application/device_spec.rb
index 464827e3c..42a62da22 100755
--- a/spec/unit/application/device_spec.rb
+++ b/spec/unit/application/device_spec.rb
@@ -39,7 +39,7 @@ describe Puppet::Application::Device do
     end
 
     it "should catch INT" do
-      @device.expects(:trap).with { |arg,block| arg == :INT }
+      Signal.expects(:trap).with { |arg,block| arg == :INT }
 
       @device.preinit
     end
diff --git a/spec/unit/indirector/facts/couch_spec.rb b/spec/unit/indirector/facts/couch_spec.rb
index b6477bafe..7038a438d 100755
--- a/spec/unit/indirector/facts/couch_spec.rb
+++ b/spec/unit/indirector/facts/couch_spec.rb
@@ -4,9 +4,9 @@ require 'spec_helper'
 require 'puppet/node/facts'
 require 'puppet/indirector/facts/couch'
 
-describe "Puppet::Node::Facts::Couch" do
+describe "Puppet::Node::Facts::Couch", :'fails_on_ruby_1.9.2' => true do
   describe "when couchdb is not available", :unless => Puppet.features.couchdb? do
-    it "should fail to initialize", :'fails_in_ruby_1.9.2' => true do
+    it "should fail to initialize" do
       lambda { Puppet::Node::Facts::Couch.new }.should raise_error
     end
   end
diff --git a/spec/unit/parser/resource_spec.rb b/spec/unit/parser/resource_spec.rb
index 365c4e9c5..1190716d7 100755
--- a/spec/unit/parser/resource_spec.rb
+++ b/spec/unit/parser/resource_spec.rb
@@ -163,7 +163,7 @@ describe Puppet::Parser::Resource do
       res.evaluate
     end
 
-    it "should add an edge to any specified stage for class resources" do
+    it "should add an edge to any specified stage for class resources", :'fails_on_ruby_1.9.2' => true do
       @compiler.known_resource_types.add Puppet::Resource::Type.new(:hostclass, "foo", '')
 
       other_stage = Puppet::Parser::Resource.new(:stage, "other", :scope => @scope, :catalog => @catalog)
@@ -177,7 +177,7 @@ describe Puppet::Parser::Resource do
       @compiler.catalog.edge?(other_stage, resource).should be_true
     end
 
-    it "should fail if an unknown stage is specified" do
+    it "should fail if an unknown stage is specified", :'fails_on_ruby_1.9.2' => true do
       @compiler.known_resource_types.add Puppet::Resource::Type.new(:hostclass, "foo", '')
 
       resource = Puppet::Parser::Resource.new(:class, "foo", :scope => @scope, :catalog => @catalog)
@@ -186,7 +186,7 @@ describe Puppet::Parser::Resource do
       lambda { resource.evaluate }.should raise_error(ArgumentError, /Could not find stage other specified by/)
     end
 
-    it "should add edges from the class resources to the parent's stage if no stage is specified" do
+    it "should add edges from the class resources to the parent's stage if no stage is specified", :'fails_on_ruby_1.9.2' => true do
       main      = @compiler.catalog.resource(:stage, :main)
       foo_stage = Puppet::Parser::Resource.new(:stage, :foo_stage, :scope => @scope, :catalog => @catalog)
       @compiler.add_resource(@scope, foo_stage)
@@ -200,7 +200,7 @@ describe Puppet::Parser::Resource do
       @compiler.catalog.should be_edge(foo_stage, resource)
     end
 
-    it "should add edges from top-level class resources to the main stage if no stage is specified" do
+    it "should add edges from top-level class resources to the main stage if no stage is specified", :'fails_on_ruby_1.9.2' => true do
       main = @compiler.catalog.resource(:stage, :main)
       @compiler.known_resource_types.add Puppet::Resource::Type.new(:hostclass, "foo", '')
       resource = Puppet::Parser::Resource.new(:class, "foo", :scope => @scope, :catalog => @catalog)