the ldap/connection spec creates a mock LDAP class that causes `require 'ldap'` to explode. If `require 'ldap'` happens first, then we're OK.
Signed-off-by: Jesse Wolfe <[email protected]> --- spec/unit/util/ldap/connection.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/spec/unit/util/ldap/connection.rb b/spec/unit/util/ldap/connection.rb index 8bc85a6..bead64d 100755 --- a/spec/unit/util/ldap/connection.rb +++ b/spec/unit/util/ldap/connection.rb @@ -8,7 +8,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper' require 'puppet/util/ldap/connection' # So our mocks and such all work, even when ldap isn't available. -unless defined?(LDAP::Conn) +unless Puppet.features.ldap? class LDAP class Conn def initialize(*args) -- 1.6.5 -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
