diff options
author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-03-13 17:03:52 +0000 |
---|---|---|
committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-03-13 17:03:52 +0000 |
commit | 29ec7069742c73f2687ec62e2ceb6f7093b525b2 (patch) | |
tree | 674fd43453d044caf4c9a491033cda5977e361a2 | |
parent | 76474ed2b84752a4b8adcc6ab2aa85d64c3b78ef (diff) | |
download | puppet-29ec7069742c73f2687ec62e2ceb6f7093b525b2.tar.gz puppet-29ec7069742c73f2687ec62e2ceb6f7093b525b2.tar.xz puppet-29ec7069742c73f2687ec62e2ceb6f7093b525b2.zip |
adding some extra info to the ldap test
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1017 980ebf18-57e1-0310-9a29-db15c13687c0
-rwxr-xr-x | test/language/interpreter.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/language/interpreter.rb b/test/language/interpreter.rb index bd112a8da..c3503e646 100755 --- a/test/language/interpreter.rb +++ b/test/language/interpreter.rb @@ -6,6 +6,8 @@ if __FILE__ == $0 $puppetbase = "../.." end +require 'facter' + require 'puppet' require 'puppet/parser/interpreter' require 'puppet/parser/parser' @@ -69,8 +71,6 @@ class TestInterpreter < Test::Unit::TestCase assert(config != newconfig, "Configs are somehow the same") end - # Only test ldap stuff on luke's network, since that's the only place we - # have data for. if Facter["domain"].value == "madstop.com" begin require 'ldap' @@ -79,6 +79,9 @@ class TestInterpreter < Test::Unit::TestCase $stderr.puts "Missing ldap; skipping ldap source tests" $haveldap = false end + + # Only test ldap stuff on luke's network, since that's the only place we + # have data for. if $haveldap def ldapconnect @@ -161,5 +164,7 @@ class TestInterpreter < Test::Unit::TestCase } end end + else + $stderr.puts "Not in madstop.com; skipping ldap tests" end end |