Merge branch '0.24.x'

1 files changed, 3 insertions, 10 deletions

diff --git a/spec/integration/indirector/node/ldap.rb b/spec/integration/indirector/node/ldap.rb
index 34f4cb159..82273111f 100755
--- a/spec/integration/indirector/node/ldap.rb
+++ b/spec/integration/indirector/node/ldap.rb
@@ -5,17 +5,10 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'puppet/indirector/node/ldap'
 
 describe Puppet::Node::Ldap do
-    before do
-        Puppet[:node_terminus] = :ldap
-        Puppet::Node.stubs(:terminus_class).returns :ldap
-    end
-
-    after do
-        Puppet.settings.clear
-    end
-
     it "should use a restrictive filter when searching for nodes in a class" do
-        Puppet::Node.indirection.terminus(:ldap).expects(:ldapsearch).with("(&(objectclass=puppetClient)(puppetclass=foo))")
+        ldap = Puppet::Node.indirection.terminus(:ldap)
+        Puppet::Node.indirection.stubs(:terminus).returns ldap
+        ldap.expects(:ldapsearch).with("(&(objectclass=puppetClient)(puppetclass=foo))")
 
         Puppet::Node.search "eh", :class => "foo"
     end