summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorSteve Kemp <steve@steve.org.uk>2013-02-13 10:24:16 +0000
committerSteve Kemp <steve@steve.org.uk>2013-02-13 10:24:16 +0000
commit7ad2c440a5a5a882611af3b3b389f981eae099ae (patch)
tree0507c3c529648da5f5f856e27307cf06ef082f69 /t
parent7f869861d27977d8f439d88a67806ae2be4d9eda (diff)
Updated test-suite now a username/password is required for LDAP
Diffstat (limited to 't')
-rwxr-xr-xt/test-custodian-parser.rb1
-rwxr-xr-xt/test-custodian-testfactory.rb5
2 files changed, 2 insertions, 4 deletions
diff --git a/t/test-custodian-parser.rb b/t/test-custodian-parser.rb
index 1a5be6e..5676d5b 100755
--- a/t/test-custodian-parser.rb
+++ b/t/test-custodian-parser.rb
@@ -284,7 +284,6 @@ EOF
"foo must not run ssh otherwise 'fail'" => "fail",
"foo must not run ssh otherwise 'fail'." => "fail",
"foo must run redis otherwise 'memorystorage service is dead'" => "memorystorage service is dead",
- "foo must run ldap otherwise 'ldap dead?'" => "ldap dead?",
"foo must run ping otherwise 'don't you love me?'" => "don"
}
diff --git a/t/test-custodian-testfactory.rb b/t/test-custodian-testfactory.rb
index e8e7d27..953016e 100755
--- a/t/test-custodian-testfactory.rb
+++ b/t/test-custodian-testfactory.rb
@@ -191,7 +191,6 @@ class TestTestFactory < Test::Unit::TestCase
"foo must run ping otherwise" => false,
"foo must not run ping otherwise" => true,
"foo must not run ssh otherwise" => true,
- "foo must not run ldap otherwise" => true,
}
#
@@ -229,9 +228,9 @@ class TestTestFactory < Test::Unit::TestCase
tst = $1.dup.downcase
#
- # NOTE: Skip the DNS test - it is more complex.
+ # NOTE: Skip the DNS and LDAP tests - they are more complex.
#
- next if ( tst =~ /^(dns)$/ )
+ next if ( tst =~ /^(ldap|dns)$/ )
# normal
test_one = "http://foo/ must run #{tst} on 1234"