From 6be8c29f04023889262afb31f163c24888073d97 Mon Sep 17 00:00:00 2001 From: Nick Porter Date: Fri, 26 Apr 2024 12:09:17 +0100 Subject: [PATCH] Correct tests where xlats return FR_TYPE_BOOL --- src/tests/modules/ldap/groups_rfc2307bis.unlang | 8 ++++---- src/tests/modules/sql/groups.unlang | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/tests/modules/ldap/groups_rfc2307bis.unlang b/src/tests/modules/ldap/groups_rfc2307bis.unlang index 16b07f78af..6807499df6 100644 --- 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 6aa6622b88..85a21ddd1e 100644 --- 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 } -- 2.47.3