From: Alan T. DeKok Date: Mon, 25 Mar 2024 14:11:59 +0000 (-0400) Subject: move %(foo:bar) to %foo(bar) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e15c12812d8e5765e4e357e613f33abf5cff5010;p=thirdparty%2Ffreeradius-server.git move %(foo:bar) to %foo(bar) --- diff --git a/src/tests/modules/cache_rbtree/cache-bin.unlang b/src/tests/modules/cache_rbtree/cache-bin.unlang index f587ea56f50..ec0f04b69ec 100644 --- a/src/tests/modules/cache_rbtree/cache-bin.unlang +++ b/src/tests/modules/cache_rbtree/cache-bin.unlang @@ -41,7 +41,7 @@ if (!updated) { test_fail } -if (%(length:%{Callback-Id}) != 11) { +if (%length(%{Callback-Id}) != 11) { test_fail } diff --git a/src/tests/modules/perl/test.pl b/src/tests/modules/perl/test.pl index 587f6e36d13..a17913d0609 100644 --- a/src/tests/modules/perl/test.pl +++ b/src/tests/modules/perl/test.pl @@ -71,7 +71,7 @@ sub authenticate { return RLM_MODULE_NOTFOUND; } else { # Accept user and set some attribute - if (&radiusd::xlat("%(client:group)") eq 'UltraAllInclusive') { + if (&radiusd::xlat("%client(group)") eq 'UltraAllInclusive') { # User called from NAS with unlim plan set, set higher limits # TODO - re-enabled when nested attributes are handled # $RAD_REPLY{'Vendor-Specific.Cisco.h323-credit-amount'} = "1000000"; diff --git a/src/tests/modules/redis/cluster_node_fail.unlang b/src/tests/modules/redis/cluster_node_fail.unlang index d3e46f68f22..0bdbb9c6496 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')) { @@ -51,7 +51,7 @@ if (%redis(@%redis.node(b), DEBUG, SEGFAULT)) { } # No alternatives... -%(delay:0.5) +%delay(0.5) if (%redis(GET, b) == 'boom') { test_fail } diff --git a/src/tests/modules/redis/cluster_reset.inc b/src/tests/modules/redis/cluster_reset.inc index 9b7fedd933a..aa598308658 100644 --- a/src/tests/modules/redis/cluster_reset.inc +++ b/src/tests/modules/redis/cluster_reset.inc @@ -80,7 +80,7 @@ foreach &control.Filter-Id { # # The cluster tends to come up within a couple of seconds, but it takes longer # for the replicas to be displayed in cluster slot output (usually ~5 seconds). - %(delay:0.5) + %delay(0.5) # # If the cluster is still not behaving