From ebf6c1f39c2bfaadc11e3dee6f54aadb6dc93c4a Mon Sep 17 00:00:00 2001 From: James Jones Date: Mon, 4 Dec 2023 13:02:21 -0600 Subject: [PATCH] Start converting remaining unlang function calls to new syntax --- src/tests/modules/ldap/groups_rfc2307bis.unlang | 8 ++++---- src/tests/modules/redis/cluster_node_fail.unlang | 4 ++-- src/tests/modules/redis_ippool/pool_tool_static.unlang | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/tests/modules/ldap/groups_rfc2307bis.unlang b/src/tests/modules/ldap/groups_rfc2307bis.unlang index 8e743d3c8827f..7928111cc26a8 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) == true) { test_fail } -if !(%(ldap.memberof:baz) == false) { +if !(%ldap.memberof(baz) == false) { 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) == true) { 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) == false) { test_fail } diff --git a/src/tests/modules/redis/cluster_node_fail.unlang b/src/tests/modules/redis/cluster_node_fail.unlang index d3e46f68f228d..16f4fbc687e7d 100644 --- a/src/tests/modules/redis/cluster_node_fail.unlang +++ b/src/tests/modules/redis/cluster_node_fail.unlang @@ -12,7 +12,7 @@ if (!(%redis(SET, b, 'boom') == 'OK')) { } # Leave some time (500ms) for the synchronisation -%(delay:0.5) +%delay(0.5) # Note the current master &redismaster := %redis.node(b, 0) @@ -38,7 +38,7 @@ foreach &control.Filter-Id { if (%redis.node(b, 0) == &redisreplica) { break } - %(delay:0.5) + %delay(0.5) } if (!(%redis(GET, b) == 'boom')) { diff --git a/src/tests/modules/redis_ippool/pool_tool_static.unlang b/src/tests/modules/redis_ippool/pool_tool_static.unlang index 5e5a36f2d6a28..6afcc3f8d2af3 100644 --- a/src/tests/modules/redis_ippool/pool_tool_static.unlang +++ b/src/tests/modules/redis_ippool/pool_tool_static.unlang @@ -43,7 +43,7 @@ if !(&reply.Framed-IP-Address == 192.168.0.10) { # # Check the ZSCORE hasn't changed # -if !(%(redis:ZSCORE {%{control.IP-Pool.Name}}:pool %{reply.Framed-IP-Address}) == %{zscore}) { +if !(%(redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, %{reply.Framed-IP-Address}) == %{zscore}) { test_fail } @@ -98,7 +98,7 @@ if !(%redis(GET, {%{control.IP-Pool.Name}}:device:11:22:33:44:55:66) == '192.168 test_fail } -&zscore := %(redis:ZSCORE {%{control.IP-Pool.Name}}:pool 192.168.0.1) +&zscore := %redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, 192.168.0.1) if !(&zscore < (uint64)0x10000000000000) { test_fail }