diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2009-12-10 15:36:48 -0800 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-12-11 18:59:05 +1100 |
| commit | 6dfac977d355593ee13dcb80f25ad02da466062c (patch) | |
| tree | c3518a4d96ec3a049af83192035b8ac54fc50e36 | |
| parent | 1c8d272a7728387d0355704a5cb7bed3d1fbdddd (diff) | |
| download | puppet-6dfac977d355593ee13dcb80f25ad02da466062c.tar.gz puppet-6dfac977d355593ee13dcb80f25ad02da466062c.tar.xz puppet-6dfac977d355593ee13dcb80f25ad02da466062c.zip | |
Fixing 2907 rspec crash when spec/unit/application/puppetrun.rb is run after spec/unit/util/ldap/connection.rb
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 <jes5199@gmail.com>
| -rwxr-xr-x | 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 8bc85a620..bead64d01 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) |