remove more old-style function calls

diff --git a/src/tests/modules/redis/cluster_reset.inc b/src/tests/modules/redis/cluster_reset.inc
index aa598308658ec7baab2593d04694ad77cf5d590b..57eaa97d2d85ce68290a8fa2e135a7cb9d351e06 100644 (file)
--- a/src/tests/modules/redis/cluster_reset.inc
+++ b/src/tests/modules/redis/cluster_reset.inc
@@ -66,9 +66,9 @@ foreach &control.Filter-Id {
                        #  so we now need to figure out which slave each of those keys
                        #  ended up on.
                        #
-                       if ((%redis(-@%(redis.node:b 1), GET, b) == %{data1}) && \
-                           (%redis(-@%(redis.node:c 1), GET, c) == %{data2}) && \
-                           (%redis(-@%(redis.node:d 1), GET, d) == %{data3})) {
+                       if ((%redis(-@%redis.node(b, 1), GET, b) == %{data1}) && \
+                           (%redis(-@%redis.node(c, 1), GET, c) == %{data2}) && \
+                           (%redis(-@%redis.node(d 1), GET, d) == %{data3})) {
                                break
                        }
                }

diff --git a/src/tests/modules/redis_ippool/pool_tool_static.unlang b/src/tests/modules/redis_ippool/pool_tool_static.unlang
index 962a831b093c241ed6d0e3497e14308be2d5e58c..32427ccbc3a988046e3dfd4fe3d7a87864f06847 100644 (file)
--- a/src/tests/modules/redis_ippool/pool_tool_static.unlang
+++ b/src/tests/modules/redis_ippool/pool_tool_static.unlang
@@ -111,7 +111,7 @@ if !(&zscore < (uint64)0x10000000000000) {
 #
 #  Check that the ZSCORE is maintained, simply with the static bit set
 #
-if !(%redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, 192.168.0.1) == (&zscore + %(cast:uint64 0x10000000000000))) {
+if !(%redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, 192.168.0.1) == (&zscore + (uint64) 0x10000000000000)) {
        test_fail
 }
 

diff --git a/src/tests/modules/redis_ippool/static_unassign.unlang b/src/tests/modules/redis_ippool/static_unassign.unlang
index a3ea7dac2e355c9a109f2446c0839cefd85a011a..55119dd95d52058663a6268ec5fc03c70cc9c18c 100644 (file)
--- a/src/tests/modules/redis_ippool/static_unassign.unlang
+++ b/src/tests/modules/redis_ippool/static_unassign.unlang
@@ -45,7 +45,7 @@ if (!(&reply.Session-Timeout == 30)) {
 #
 #  Check ZSCORE is now < 2^52 - the "static bit"
 #
-if (%redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, %{reply.Framed-IP-Address}) >= %(cast:uint64 0x10000000000000)) {
+if (%redis(ZSCORE, {%{control.IP-Pool.Name}}:pool, %{reply.Framed-IP-Address}) >= (uint64) 0x10000000000000) {
        test_fail
 }