more auto-conversion

perl -p -i -e "s/%{([a-zA-Z0-9._-]+):([a-zA-Z0-9.]+)}/%\$1('\$2')/g"  $(git grep -lE '%\{[a-z0-9.-]+:' src/tests/keywords/ src/tests/modules)

diff --git a/src/tests/keywords/rand b/src/tests/keywords/rand
index 760d3b385bad5e62d3d0a7657b16a909bfc4ac4c..5d5441e8cc502ef5d1931d85f6947ee703eebd49 100644 (file)
--- a/src/tests/keywords/rand
+++ b/src/tests/keywords/rand
@@ -16,7 +16,7 @@ if !(&Tmp-String-0 == "") {
        test_fail
 }
 
-&Tmp-Integer-0 := %{rand:123}
+&Tmp-Integer-0 := %rand('123')
 
 if (!&Tmp-Integer-0) {
        test_fail

diff --git a/src/tests/modules/idn/idn.unlang b/src/tests/modules/idn/idn.unlang
index 4fa52e5ccddb113ed0e9bb33cc72014da46f3ce1..8ad069779878236bb860629b41671df194642fb8 100644 (file)
--- a/src/tests/modules/idn/idn.unlang
+++ b/src/tests/modules/idn/idn.unlang
@@ -2,7 +2,7 @@
 #  PRE: update if
 #
 
-&Tmp-String-0 := "%{idn:example.com}"
+&Tmp-String-0 := "%idn('example.com')"
 &Tmp-String-1 := "%{idn:èxâmpłé.com}"
 &Tmp-String-2 := "%{idn:пример.com}"
 &Tmp-String-3 := "%{idn:παράδειγμα.com}"

diff --git a/src/tests/modules/json/eval.unlang b/src/tests/modules/json/eval.unlang
index d0c06b8cf3413c42fdec8f121dd6a1e5df9c3fc3..9ea0018e786d766a8e26879062fdc94940c96ea1 100644 (file)
--- a/src/tests/modules/json/eval.unlang
+++ b/src/tests/modules/json/eval.unlang
@@ -422,7 +422,7 @@ if !(&Tmp-Integer-0 == 2147483647) {
 {\
        \"foo.bar\": \"baz\" \
 }"
-&Tmp-String-2 := "%{taint:foo.bar}"
+&Tmp-String-2 := "%taint('foo.bar')"
 
 map json &Tmp-String-0 {
        &Tmp-String-1 := "$.%{Tmp-String-2}"

diff --git a/src/tests/modules/pap/bin_random.unlang b/src/tests/modules/pap/bin_random.unlang
index b03376793f075ace41d7894d70af29ce6a0df2b3..2d94b007beca3d6b567d3981bcfa439fa683dd2d 100644 (file)
--- a/src/tests/modules/pap/bin_random.unlang
+++ b/src/tests/modules/pap/bin_random.unlang
@@ -1,5 +1,5 @@
 if (&User-Name == 'test') {
-       &User-Password := "%{randstr:bbbbbbbbbbbbbbbb}"
+       &User-Password := "%randstr('bbbbbbbbbbbbbbbb')"
        &control.Password.Cleartext := "%{User-Password}"
 
        pap.authorize

diff --git a/src/tests/modules/redis/cluster_key.unlang b/src/tests/modules/redis/cluster_key.unlang
index a053697ed859a9406fe089d0b9fd28d19c581d54..f811644a7c8b6540014a3dfc0f564e19fbd31a8b 100644 (file)
--- a/src/tests/modules/redis/cluster_key.unlang
+++ b/src/tests/modules/redis/cluster_key.unlang
@@ -10,9 +10,9 @@ $INCLUDE cluster_reset.inc
 #  - 127.0.0.1:30005 - slave
 #  - 127.0.0.1:30003 - master [10923-16383]
 #  - 127.0.0.1:30006 - slave
-&control.Tmp-String-0 := "1-%{randstr:aaaaaaaa}"
-&control.Tmp-String-1 := "2-%{randstr:aaaaaaaa}"
-&control.Tmp-String-2 := "3-%{randstr:aaaaaaaa}"
+&control.Tmp-String-0 := "1-%randstr('aaaaaaaa')"
+&control.Tmp-String-1 := "2-%randstr('aaaaaaaa')"
+&control.Tmp-String-2 := "3-%randstr('aaaaaaaa')"
 
 #  Hashes to Redis cluster node master 1 (1)
 if ("%(redis:SET b "%{control.Tmp-String-0}")" == 'OK') {

diff --git a/src/tests/modules/redis/cluster_reset.inc b/src/tests/modules/redis/cluster_reset.inc
index 677c7a1912bc1788f62e2c6aec5aea0d8fac1427..1a38550073beb1895049f4bfbc1a8285fb2ee009 100644 (file)
--- a/src/tests/modules/redis/cluster_reset.inc
+++ b/src/tests/modules/redis/cluster_reset.inc
@@ -28,9 +28,9 @@
        &Tmp-Integer-0 = 21
 }
 
-&control.Tmp-String-0 := "1-%{randstr:aaaaaaaa}"
-&control.Tmp-String-1 := "2-%{randstr:aaaaaaaa}"
-&control.Tmp-String-2 := "3-%{randstr:aaaaaaaa}"
+&control.Tmp-String-0 := "1-%randstr('aaaaaaaa')"
+&control.Tmp-String-1 := "2-%randstr('aaaaaaaa')"
+&control.Tmp-String-2 := "3-%randstr('aaaaaaaa')"
 
 if ("$ENV{REDIS_CLUSTER_CONTROL}" == '') {
        &control.Tmp-String-8 := 'scripts/ci/redis-setup.sh'