Correct tests where xlats return FR_TYPE_BOOL

diff --git a/src/tests/modules/ldap/groups_rfc2307bis.unlang b/src/tests/modules/ldap/groups_rfc2307bis.unlang
index 16b07f78af3c00e565a30f0a26fe07abd20821a7..6807499df647e43797aae1e58bad234455e2ee31 100644 (file)
--- a/src/tests/modules/ldap/groups_rfc2307bis.unlang
+++ b/src/tests/modules/ldap/groups_rfc2307bis.unlang
@@ -6,22 +6,22 @@
 #
 #  Resolve using group name attribute
 #
-if !(%ldap.memberof("foo") == true) {
+if !(%ldap.memberof("foo")) {
         test_fail
 }
 
-if !(%ldap.memberof("baz") == false) {
+if (%ldap.memberof("baz")) {
         test_fail
 }
 
 #
 #  Resolve using group DN
 #
-if !(%ldap.memberof("cn=foo,ou=groups,dc=example,dc=com") == true) {
+if !(%ldap.memberof("cn=foo,ou=groups,dc=example,dc=com")) {
         test_fail
 }
 
-if !(%ldap.memberof("cn=baz,ou=groups,dc=example,dc=com") == false) {
+if (%ldap.memberof("cn=baz,ou=groups,dc=example,dc=com")) {
         test_fail
 }
 

diff --git a/src/tests/modules/sql/groups.unlang b/src/tests/modules/sql/groups.unlang
index 6aa6622b8824e738a59f418e63add54952e87aa7..85a21ddd1e8bc0b7fc974d2db5b49af1ffa00e5d 100644 (file)
--- a/src/tests/modules/sql/groups.unlang
+++ b/src/tests/modules/sql/groups.unlang
@@ -64,20 +64,20 @@ if (&control.SQL-Group[*] == 'groups_group_c') {
 #
 #  Test paircmp group comparisons
 #
-if (%sql.group('groups_group_a') != false) {
+if (%sql.group('groups_group_a')) {
        test_fail
 }
 
-if (%sql.group('groups_group_b') != true) {
+if !(%sql.group('groups_group_b')) {
        test_fail
 }
 
-if (%sql.group('groups_group_c') != true) {
+if !(%sql.group('groups_group_c')) {
        test_fail
 }
 
 # Non-existent group
-if (%sql.group('groups_group_d') != false) {
+if (%sql.group('groups_group_d')) {
        test_fail
 }
 
@@ -86,7 +86,7 @@ if (%sql.group('groups_group_d') != false) {
 #
 &groupname := 'groups_group_b'
 
-if !(%sql.group(%{groupname}) == yes) {
+if !(%sql.group(%{groupname})) {
        test_fail
 }