Update LDAP accounting / send module calls in tests

These now need to be ldap.accounting.<acct status type> or
ldap.send.<packet type>

diff --git a/src/tests/modules/ldap/acct.unlang b/src/tests/modules/ldap/acct.unlang
index 07f1eeca867e2e4d84fc9dc904c550aaad009f16..9a9f86af7c0543ac32c744e0be45ddb84f2a5e6f 100644 (file)
--- a/src/tests/modules/ldap/acct.unlang
+++ b/src/tests/modules/ldap/acct.unlang
@@ -3,7 +3,7 @@ string test_string
 #  Run the "ldap" module
 #  PRE: auth
 #
-ldap.accounting {
+ldap.accounting.start {
 }
 if (!ok) {
         test_fail

diff --git a/src/tests/modules/ldap/auth.unlang b/src/tests/modules/ldap/auth.unlang
index b148419d899aa30f7df236152994623706743fe4..11fc9d3a85bb4be7970a62ce03b2e2aeeb062374 100644 (file)
--- a/src/tests/modules/ldap/auth.unlang
+++ b/src/tests/modules/ldap/auth.unlang
@@ -48,7 +48,7 @@ if !(&control.Vendor-Specific.Cisco.AVPair[*] == 'bar') {
 # Attempt a bind authentication
 ldap.authenticate
 
-ldap.send
+ldap.send.access-accept
 
 &test_string := %ldap("ldap://$ENV{TEST_SERVER}/uid=john,ou=people,dc=example,dc=com?description")
 

diff --git a/src/tests/modules/ldap/auth_nested_profile.unlang b/src/tests/modules/ldap/auth_nested_profile.unlang
index 516b58d0b63861f49bdb445e6704b8d3363e5135..b26d817c151626e7ef646b899ecfe3a052345cd6 100644 (file)
--- a/src/tests/modules/ldap/auth_nested_profile.unlang
+++ b/src/tests/modules/ldap/auth_nested_profile.unlang
@@ -22,7 +22,7 @@ if (!(&reply.Acct-Interim-Interval == 7200)) {
 # Attempt a bind authentication
 ldap.authenticate
 
-ldap.send
+ldap.send.access-accept
 
 &test_string := %ldap("ldap://$ENV{TEST_SERVER}/uid=peter,ou=people,dc=example,dc=com?description")
 

diff --git a/src/tests/modules/ldap/auth_ssl.unlang b/src/tests/modules/ldap/auth_ssl.unlang
index c55f4e01b36079ead7201a9dc901afeb3a88e7ab..dd9b68e8841d9345b9cc255e0b0dc2fe42336614 100644 (file)
--- a/src/tests/modules/ldap/auth_ssl.unlang
+++ b/src/tests/modules/ldap/auth_ssl.unlang
@@ -26,7 +26,7 @@ if (!(&reply.Session-Timeout == 7200)) {
 # Attempt a bind authentication
 ldapssl.authenticate
 
-ldapssl.send
+ldapssl.send.access-accept
 
 &test_string := %ldapssl("ldaps:///uid=fred,ou=people,dc=subdept,dc=example,dc=com?description")
 

diff --git a/src/tests/modules/ldap/auth_starttls.unlang b/src/tests/modules/ldap/auth_starttls.unlang
index 1c1fb55403759587f8dbe4d480189bce8315cda1..57c6bd8b2ba46036404b73df4373daf7543ea88c 100644 (file)
--- a/src/tests/modules/ldap/auth_starttls.unlang
+++ b/src/tests/modules/ldap/auth_starttls.unlang
@@ -27,7 +27,7 @@ if (!(&reply.Session-Timeout == 7200)) {
 # Attempt a bind authentication
 ldaptls.authenticate
 
-ldaptls.send
+ldaptls.send.access-accept
 
 &test_string := %ldaptls("ldap:///uid=joe,ou=people,dc=subdept,dc=example,dc=com?description")