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 f587ea56f50639f15c8e5ff81bf8033bfaa9e966..ec0f04b69ecdaa88876c1fc16bb18dbee4295255 100644 (file)
--- 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 587f6e36d1338d09a5f7553e713ebdef0e6d1e3b..a17913d0609d5f92fd73b762d533fa454b70087f 100644 (file)
--- 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 d3e46f68f228db70fc34c04f1d7cdcc8d905f358..0bdbb9c6496b6cab62f45093503d58aa9fc8aa7c 100644 (file)
--- 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 9b7fedd933a849e6680c91957205f6f5c57bb8ed..aa598308658ec7baab2593d04694ad77cf5d590b 100644 (file)
--- 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