more test_fail

diff --git a/src/tests/keywords/array b/src/tests/keywords/array
index 3df3922a5e549e8f383acf27c67f8dd87b8f3418..6113ba5ca931371ada9a79aa1cabe2e5935c4065 100644 (file)
--- a/src/tests/keywords/array
+++ b/src/tests/keywords/array
@@ -10,42 +10,30 @@ update request {
 }
 
 if (&Class != 0x01020304) {
-       update reply {
-               Filter-Id := "fail 0"
-       }
+       test_fail
 }
 
 #  Must be the same as above
 if (&Class[0] != 0x01020304) {
-       update reply {
-               Filter-Id += "fail 0a"
-       }
+       test_fail
 }
 
 if (&Class[1] != 0x05060708) {
-       update reply {
-               Filter-Id += "fail 1"
-       }
+       test_fail
 }
 
 if (&Class[2] != 0x090a0b0c) {
-       update reply {
-               Filter-Id += "fail 2"
-       }
+       test_fail
 }
 
 # must not exist
 if (&Class[3]) {
-       update reply {
-               Filter-Id += "fail 3"
-       }
+       test_fail
 }
 
 # Last element of the array
 if (&Class[n] != 0x090a0b0c) {
-       update reply {
-               Filter-Id += "fail 4"
-       }
+       test_fail
 }
 
 success

diff --git a/src/tests/keywords/cast-ipaddr b/src/tests/keywords/cast-ipaddr
index 9035421983834da28d50e8b51ec56971771ea3c8..e9a777a9fbe896b6341259b567ca42563d25b127 100644 (file)
--- a/src/tests/keywords/cast-ipaddr
+++ b/src/tests/keywords/cast-ipaddr
@@ -1,4 +1,4 @@
-M#
+#
 #  PRE: update if redundant
 #
 update {
@@ -12,9 +12,7 @@ update request {
 }
 
 if (<ipaddr>Tmp-Integer-0 != NAS-IP-Address) {
-       update reply {
-               Filter-Id += 'Fail 0'
-       }
+       test_fail
 }
 
 #
@@ -41,9 +39,7 @@ update control {
 }
 
 if (&control:Tmp-Cast-IPv6addr != ::ffff:203.0.113.1) {
-       update reply {
-               Filter-Id += 'Fail 1'
-       }
+       test_fail
 }
 
 #
@@ -54,9 +50,7 @@ update control {
 }
 
 if (&control:Tmp-Cast-IPaddr != 203.0.113.1) {
-       update reply {
-               Filter-Id += 'Fail 2'
-       }
+       test_fail
 }
 
 #
@@ -67,9 +61,7 @@ update control {
 }
 
 if (&control:Tmp-Cast-IPv6Prefix != ::ffff:203.0.113.0/120) {
-       update reply {
-               Filter-Id += 'Fail 31'
-       }
+       test_fail
 }
 
 #
@@ -80,9 +72,7 @@ update control {
 }
 
 if (&control:Tmp-Cast-IPv4Prefix != 203.0.113.1/24) {
-       update reply {
-               Filter-Id += 'Fail 4'
-       }
+       test_fail
 }
 
 #
@@ -93,9 +83,7 @@ update control {
 }
 
 if (&control:Tmp-Cast-IPv6Addr != ::ffff:203.0.113.1) {
-       update reply {
-               Filter-Id += 'Fail 5'
-       }
+       test_fail
 }
 
 #
@@ -106,9 +94,7 @@ update control {
 }
 
 if (&control:Tmp-Cast-Ipaddr != 203.0.113.1/32) {
-       update reply {
-               Filter-Id += 'Fail 6'
-       }
+       test_fail
 }
 
 #
@@ -119,9 +105,7 @@ update control {
 }
 
 if (&control:Tmp-Cast-IPv6Prefix != ::ffff:203.0.113.1/128) {
-       update reply {
-               Filter-Id += 'Fail 7'
-       }
+       test_fail
 }
 
 #
@@ -132,9 +116,7 @@ update control {
 }
 
 if (&control:Tmp-Cast-IPv4Prefix != 203.0.113.1/32) {
-       update reply {
-               Filter-Id += 'Fail 8'
-       }
+       test_fail
 }
 
 #
@@ -145,9 +127,7 @@ update control {
 }
 
 if (&control:Tmp-Cast-IPv4Prefix != 203.0.113.1/32) {
-       update reply {
-               Filter-Id += 'Fail 9'
-       }
+       test_fail
 }
 
 #
@@ -158,9 +138,7 @@ update control {
 }
 
 if (&control:Tmp-Cast-IPv6Prefix != 2001:DB8::1/128) {
-       update reply {
-               Filter-Id += 'Fail 11'
-       }
+       test_fail
 }
 
 #
@@ -171,9 +149,7 @@ update control {
 }
 
 if (&control:Tmp-Cast-Ipaddr != 203.0.113.1) {
-       update reply {
-               Filter-Id += 'Fail 12'
-       }
+       test_fail
 }
 
 #
@@ -184,9 +160,7 @@ update control {
 }
 
 if (&control:Tmp-Cast-IPv6Addr != ::ffff:203.0.113.1) {
-       update reply {
-               Filter-Id += 'Fail 13'
-       }
+       test_fail
 }
 
 #
@@ -201,15 +175,11 @@ redundant {
                update control {
                        Tmp-Cast-IPv6Addr := Tmp-Cast-IPv6Prefix
                }
-               update reply {
-                       Filter-Id += 'Fail 14'
-               }
+               test_fail
        }
        group {
                if ("%{Module-Failure-Message}" != 'Attribute conversion failed: Invalid cast from ipv6prefix to ipv6addr.  Only /128 (not /32) prefixes may be cast to IP address types') {
-                       update reply {
-                               Filter-Id += 'Fail 14.5'
-                       }
+                       test_fail
                }
                update request {
                        Module-Failure-Message !* ANY
@@ -226,15 +196,11 @@ redundant {
                update control {
                        Tmp-Cast-Ipaddr := &Tmp-Cast-IPv6Prefix[2]
                }
-               update reply {
-                       Filter-Id += 'Fail 15'
-               }
+               test_fail
        }
        group {
                if ("%{Module-Failure-Message}" != 'Attribute conversion failed: Invalid cast from ipv6prefix to ipaddr.  Only /128 (not /64) prefixes may be cast to IP address types') {
-                       update reply {
-                               Filter-Id += 'Fail 15.5'
-                       }
+                       test_fail
                }
                update request {
                        Module-Failure-Message !* ANY
@@ -251,15 +217,11 @@ redundant {
                update control {
                        Tmp-Cast-Ipv4Prefix := &Tmp-Cast-IPv6Prefix[2]
                }
-               update reply {
-                       Filter-Id += 'Fail 16'
-               }
+               test_fail
        }
        group {
                if ("%{Module-Failure-Message}" != 'Attribute conversion failed: Invalid cast from ipv6prefix to ipv4prefix.  No IPv4-IPv6 mapping prefix') {
-                       update reply {
-                               Filter-Id += 'Fail 16.5'
-                       }
+                       test_fail
                }
                update request {
                        Module-Failure-Message !* ANY
@@ -276,15 +238,11 @@ redundant {
                update control {
                        Tmp-Cast-IPv6Addr := &Tmp-Cast-IPv4Prefix
                }
-               update reply {
-                       Filter-Id += 'Fail 17'
-               }
+               test_fail
        }
        group {
                if ("%{Module-Failure-Message}" != 'Attribute conversion failed: Invalid cast from ipv4prefix to ipv6addr.  Only /32 (not /24) prefixes may be cast to IP address types') {
-                       update reply {
-                               Filter-Id += 'Fail 17.5'
-                       }
+                       test_fail
                }
                update request {
                        Module-Failure-Message !* ANY
@@ -301,15 +259,11 @@ redundant {
                update control {
                        Tmp-Cast-Ipaddr := &Tmp-Cast-IPv4Prefix
                }
-               update reply {
-                       Filter-Id += 'Fail 17.1'
-               }
+               test_fail
        }
        group {
                if ("%{Module-Failure-Message}" != 'Attribute conversion failed: Invalid cast from ipv4prefix to ipaddr.  Only /32 (not 24/) prefixes may be cast to IP address types') {
-                       update reply {
-                               Filter-Id += 'Fail 17.6'
-                       }
+                       test_fail
                }
                update request {
                        Module-Failure-Message !* ANY
@@ -326,15 +280,11 @@ redundant {
                update control {
                        Tmp-Cast-Ipaddr := &Tmp-Cast-IPv6Prefix
                }
-               update reply {
-                       Filter-Id += 'Fail 18'
-               }
+               test_fail
        }
        group {
                if ("%{Module-Failure-Message}" != 'Attribute conversion failed: Invalid cast from ipv6prefix to ipaddr.  Only /128 (not /32) prefixes may be cast to IP address types') {
-                       update reply {
-                               Filter-Id += 'Fail 18.5'
-                       }
+                       test_fail
                }
                update request {
                        Module-Failure-Message !* ANY
@@ -351,15 +301,11 @@ redundant {
                update control {
                        Tmp-Cast-IPv4Prefix := &Tmp-Cast-IPv6Prefix
                }
-               update reply {
-                       Filter-Id += 'Fail 19'
-               }
+               test_fail
        }
        group {
                if ("%{Module-Failure-Message}" != 'Attribute conversion failed: Invalid cast from ipv6prefix to ipv4prefix.  No IPv4-IPv6 mapping prefix') {
-                       update reply {
-                               Filter-Id += 'Fail 19.5'
-                       }
+                       test_fail
                }
                update request {
                        Module-Failure-Message !* ANY
@@ -376,15 +322,11 @@ redundant {
                update control {
                        Tmp-Cast-Ipaddr := &Tmp-Cast-IPv6Addr
                }
-               update reply {
-                       Filter-Id += 'Fail 20'
-               }
+               test_fail
        }
        group {
                if ("%{Module-Failure-Message}" != 'Attribute conversion failed: Invalid cast from ipv6addr to ipaddr.  No IPv4-IPv6 mapping prefix') {
-                       update reply {
-                               Filter-Id += 'Fail 20'
-                       }
+                       test_fail
                }
                update request {
                        Module-Failure-Message !* ANY
@@ -401,15 +343,11 @@ redundant {
                update control {
                        Tmp-Cast-IPv4Prefix := &Tmp-Cast-IPv6Addr
                }
-               update reply {
-                       Filter-Id += 'Fail 21'
-               }
+               test_fail
        }
        group {
                if ("%{Module-Failure-Message}" != 'Attribute conversion failed: Invalid cast from ipv6addr to ipv4prefix.  No IPv4-IPv6 mapping prefix') {
-                       update reply {
-                               Filter-Id += 'Fail 21.5'
-                       }
+                       test_fail
                }
                update request {
                        Module-Failure-Message !* ANY

diff --git a/src/tests/keywords/escape b/src/tests/keywords/escape
index d4a11972c9172d3af1243a48329b3b0ec6a25343..49a35de8446e19bddab6cb58600b78a928e6a572 100644 (file)
--- a/src/tests/keywords/escape
+++ b/src/tests/keywords/escape
@@ -17,51 +17,35 @@ update request {
 }
 
 if (<string>"%{escape:%{request:Tmp-String-0}}" != &Tmp-String-0) {
-       update reply {
-               Filter-Id += 'Fail 1'
-       }
+       test_fail
 }
 
 if (<string>"%{escape:%{request:Tmp-String-1}}" != &Tmp-String-3) {
-       update reply {
-               Filter-Id += 'Fail 2'
-       }
+       test_fail
 }
 
 if (<string>"%{escape:%{request:Tmp-String-2}}" != &Tmp-String-4) {
-       update reply {
-               Filter-Id += 'Fail 3'
-       }
+       test_fail
 }
 
 if (<string>"%{unescape:%{request:Tmp-String-0}}" != &Tmp-String-0) {
-       update reply {
-               Filter-Id += 'Fail 4'
-       }
+       test_fail
 }
 
 if (<string>"%{unescape:%{request:Tmp-String-3}}" != "%{Tmp-String-1}") {
-       update reply {
-               Filter-Id += 'Fail 5'
-       }
+       test_fail
 }
 
 if (<string>"%{unescape:%{request:Tmp-String-4}}" != &Tmp-String-2) {
-       update reply {
-               Filter-Id += 'Fail 6'
-       }
+       test_fail
 }
 
 if (<string>"%{escape:%{request:Tmp-String-6}}" != &Tmp-String-7) {
-       update reply {
-               Filter-Id += 'Fail 7'
-       }
+       test_fail
 }
 
 if (<string>"%{unescape:%{request:Tmp-String-7}}" != &Tmp-String-6) {
-       update reply {
-               Filter-Id += 'Fail 8'
-       }
+       test_fail
 }
 
 success

diff --git a/src/tests/keywords/foreach-isolation b/src/tests/keywords/foreach-isolation
index 78aad162de6ddb574c40d2a48260d0d3bd9b0419..c4331d2e40d5e8371b0c25402461bf0a927069dc 100644 (file)
--- a/src/tests/keywords/foreach-isolation
+++ b/src/tests/keywords/foreach-isolation
@@ -19,21 +19,15 @@ foreach control:Tmp-String-0 {
 }
 
 if (!&Tmp-String-0[0] || !&Tmp-String-0[1] || !&Tmp-String-0[2] || !&Tmp-String-0[3]) {
-       update reply {
-               Filter-Id += 'Fail 0'
-       }
+       test_fail
 }
 
 if ((&Tmp-String-0[0] != '0') || (&Tmp-String-0[1] != '1') || (&Tmp-String-0[2] != '2') || (&Tmp-String-0[3] != '3')) {
-       update reply {
-               Filter-Id += 'Fail 1'
-       }
+       test_fail
 }
 
 if (!&control:Tmp-String-0[0] || &control:Tmp-String-0[1] || &control:Tmp-String-0[2] || &control:Tmp-String-0[3]) {
-       update reply {
-               Filter-Id += 'Fail 2'
-       }
+       test_fail
 }
 
 success

diff --git a/src/tests/keywords/if-regex-empty b/src/tests/keywords/if-regex-empty
index 3e352dec61227974fc73dbe936d6fe855fde30f5..a8f68f393e17bf8f5c272d6727d7f93897670bfc 100644 (file)
--- a/src/tests/keywords/if-regex-empty
+++ b/src/tests/keywords/if-regex-empty
@@ -6,42 +6,32 @@ update {
 }
 
 if (control:Cleartext-Password !~ /hell(o)(.*)/) {
-       update reply {
-               Filter-Id += 'Fail 1'
-       }
+       test_fail
 }
 
 #
 #  Verify non-empty capture groups evaluate to true
 #
 if (!"%{1}") {
-       update reply {
-               Filter-Id += 'Fail 2'
-       }
+       test_fail
 }
 
 #
 #  Verify empty capture groups evaluate to false
 #
 if ("%{2}") {
-       update reply {
-               Filter-Id += 'Fail 3'
-       }
+       test_fail
 }
 
 if (control:Cleartext-Password !~ /hello(.*)/) {
-       update reply {
-               Filter-Id += 'Fail 4'
-       }
+       test_fail
 }
 
 #
 #  Check for stale capture group values
 #
 if ("%{1}") {
-       update reply {
-               Filter-Id += 'Fail 5'
-       }
+       test_fail
 }
 
 success

diff --git a/src/tests/keywords/if-regex-match b/src/tests/keywords/if-regex-match
index 458e4551b1f2b307e171e2895c213ecdb908a9ef..0810538d4f0b42f76745deb88e2fc0fc4dfdaa3d 100644 (file)
--- a/src/tests/keywords/if-regex-match
+++ b/src/tests/keywords/if-regex-match
@@ -6,16 +6,12 @@ update request {
 
 # Non matching on attribute ref
 if (User-Name !~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])%{Tmp-String-0}/) {
-       update reply {
-               Filter-Id += 'Fail 0'
-       }
+       test_fail
 }
 
 # Matching on xlat expanded value
 if ("%{User-Name}" !~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])%{Tmp-String-0}/) {
-       update reply {
-               Filter-Id += 'Fail 1'
-       }
+       test_fail
 }
 
 # Matching on attribute ref with capture groups
@@ -26,107 +22,77 @@ if (User-Name =~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])%{Tmp-St
        }
 }
 else {
-       update reply {
-               Filter-Id += 'Fail 2'
-       }
+       test_fail
 }
 
 # Checking capture groups are cleared out correctly
 if (User-Name =~ /^([0-9])_%{Tmp-String-0}/) {
        if ("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}" != '1_1') {
-               update reply {
-                       Filter-Id += 'Fail 3'
-               }
+               test_fail
        }
 }
 else {
-       update reply {
-               Filter-Id += 'Fail 3.5'
-       }
+       test_fail
 }
 
 # Checking capture groups are cleared out correctly when there are no matches
 if (User-Name =~ /^.%{Tmp-String-0}/) {
        if ("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}" != '1') {
-               update reply {
-                       Filter-Id += 'Fail 4'
-               }
+               test_fail
        }
 }
 else {
-       update reply {
-               Filter-Id += 'Fail 4.5'
-       }
+       test_fail
 }
 
 # Checking full capture group range
 if ('a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z_A_B_C_D_E_F' =~ /^(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)$/) {
        if ("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}%{8}%{9}%{10}%{11}%{12}%{13}%{14}%{15}%{16}%{17}%{18}%{19}%{20}%{21}%{22}%{23}%{24}%{25}%{26}%{27}%{28}%{29}%{30}%{31}%{32}" != 'a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z_A_B_C_D_E_FabcdefghijklmnopqrstuvwxyzABCDEF') {
-               update reply {
-                       Filter-Id += 'Fail 6'
-               }
+               test_fail
        }
 }
 else {
-       update reply {
-               Filter-Id += 'Fail 6.5'
-       }
+       test_fail
 }
 
 # Checking full capture group overun
 if ('a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z_A_B_C_D_E_F_G' =~ /^(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)_(.)$/) {
        if ("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}%{8}%{9}%{10}%{11}%{12}%{13}%{14}%{15}%{16}%{17}%{18}%{19}%{20}%{21}%{22}%{23}%{24}%{25}%{26}%{27}%{28}%{29}%{30}%{31}%{32}" != 'a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z_A_B_C_D_E_F_GabcdefghijklmnopqrstuvwxyzABCDEF') {
-               update reply {
-                       Filter-Id += 'Fail 7'
-               }
+               test_fail
        }
 }
 else {
-       update reply {
-               Filter-Id += 'Fail 7.5'
-       }
+       test_fail
 }
 
 # uncompiled - ref - insensitive
 if (Calling-Station-Id !~ /:roamyroam%{Tmp-String-0}$/i) {
-       update reply {
-               Filter-Id += 'Fail 8'
-       }
+       test_fail
 }
 
 # uncompiled - expansion - insensitive
 if ("%{Calling-Station-Id}" !~ /:roamyroam%{Tmp-String-0}$/i) {
-       update reply {
-               Filter-Id += 'Fail 9'
-       }
+       test_fail
 }
 
 # uncompiled - enum - ref - insensitive
 if (Service-Type !~ /^framed-user%{Tmp-String-0}$/i) {
-       update reply {
-               Filter-Id += 'Fail 10'
-       }
+       test_fail
 }
 
 # uncompiled - enum - expansion - insensitive
 if ("%{Service-Type}" !~ /^framed-user%{Tmp-String-0}$/i) {
-       update reply {
-               Filter-Id += 'Fail 11'
-       }
+       test_fail
 }
 
 # uncompiled - enum - ref
 if (Service-Type =~ /^framed-user%{Tmp-String-0}$/) {
-       update reply {
-               Filter-Id += 'Fail 12'
-       }
+       test_fail
 }
 
 # uncompiled - integer - ref
 if (Tmp-Integer-0 !~ /%{Tmp-Integer-0}/) {
-       update reply {
-               Filter-Id += 'Fail 13'
-       }
+       test_fail
 }
 
 update request {
@@ -135,49 +101,35 @@ update request {
 
 # uncompiled - ref - multiline
 if (&Tmp-String-0 !~ /^foo$%{Tmp-String-8}/m) {
-       update reply {
-               Filter-Id += 'Fail 14'
-       }
+       test_fail
 }
 
 # uncompiled - ref - non-multiline
 if (&Tmp-String-0 =~ /^foo$%{Tmp-String-8}/) {
-       update reply {
-               Filter-Id += 'Fail 15'
-       }
+       test_fail
 }
 
 # uncompiled - ref - non-multiline
 if (&Tmp-String-0 !~ /^foo\nbar%{Tmp-String-8}$/) {
-       update reply {
-               Filter-Id += 'Fail 16'
-       }
+       test_fail
 }
 
 # uncompiled - ref - multiline
 if (&Tmp-String-0 !~ /^bar%{Tmp-String-8}$/m) {
-       update reply {
-               Filter-Id += 'Fail 17'
-       }
+       test_fail
 }
 
 # uncompiled - ref - multiline - sensitive
 if (&Tmp-String-0 =~ /^BAR%{Tmp-String-8}$/m) {
-       update reply {
-               Filter-Id += 'Fail 18'
-       }
+       test_fail
 }
 
 # uncompiled - ref - multiline - insensitive
 if (&Tmp-String-0 !~ /^BAR%{Tmp-String-8}$/mi) {
-       update reply {
-               Filter-Id += 'Fail 19'
-       }
+       test_fail
 }
 
 # uncompiled - ref - multiline - insensitive (flag order reversed)
 if (&Tmp-String-0 !~ /^BAR%{Tmp-String-8}$/im) {
-       update reply {
-               Filter-Id += 'Fail 20'
-       }
+       test_fail
 }

diff --git a/src/tests/keywords/if-regex-match-comp b/src/tests/keywords/if-regex-match-comp
index c9c2d156ca5e682feabb43832622f1463db4e6f2..5b8db0407f688cd8605ffd7cb80412bdddc5fb06 100644 (file)
--- a/src/tests/keywords/if-regex-match-comp
+++ b/src/tests/keywords/if-regex-match-comp
@@ -3,16 +3,12 @@
 
 # Non matching on attribute ref
 if (User-Name !~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])/) {
-       update reply {
-               Filter-Id += 'Fail 0'
-       }
+       test_fail
 }
 
 # Matching on xlat expanded value
 if ("%{User-Name}" !~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])/) {
-       update reply {
-               Filter-Id += 'Fail 1'
-       }
+       test_fail
 }
 
 # Matching on attribute ref with capture groups
@@ -23,72 +19,52 @@ if (User-Name =~ /^([0-9])_([0-9])?_([0-9]*)_([0-9]+)_([^_])_(6)_([7-8])/) {
        }
 }
 else {
-       update reply {
-               Filter-Id += 'Fail 2'
-       }
+       test_fail
 }
 
 # Checking capture groups are cleared out correctly
 if (User-Name =~ /^([0-9])_/) {
        if ("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}" != '1_1') {
-               update reply {
-                       Filter-Id += 'Fail 3'
-               }
+               test_fail
        }
 }
 else {
-       update reply {
-               Filter-Id += 'Fail 3.5'
-       }
+       test_fail
 }
 
 # Checking capture groups are cleared out correctly when there are no matches
 if (User-Name =~ /^./) {
        if ("%{0}%{1}%{2}%{3}%{4}%{5}%{6}%{7}" != '1') {
-               update reply {
-                       Filter-Id += 'Fail 4'
-               }
+               test_fail
        }
 }
 else {
-       update reply {
-               Filter-Id += 'Fail 4.5'
-       }
+       test_fail
 }
 
 # compiled - ref - insensitive
 if (Calling-Station-Id !~ /:roamyroam$/i) {
-       update reply {
-               Filter-Id += 'Fail 5'
-       }
+       test_fail
 }
 
 # compiled - expansion - insensitive
 if ("%{Calling-Station-Id}" !~ /:roamyroam$/i) {
-       update reply {
-               Filter-Id += 'Fail 6'
-       }
+       test_fail
 }
 
 # compiled - enum - ref - insensitive
 if (Service-Type !~ /^framed-user$/i) {
-       update reply {
-               Filter-Id += 'Fail 7'
-       }
+       test_fail
 }
 
 # compiled - enum - expansion - insensitive
 if ("%{Service-Type}" !~ /^framed-user$/i) {
-       update reply {
-               Filter-Id += 'Fail 8'
-       }
+       test_fail
 }
 
 # compiled - enum - ref
 if (Service-Type =~ /^framed-user$/) {
-       update reply {
-               Filter-Id += 'Fail 9'
-       }
+       test_fail
 }
 
 update request {
@@ -97,16 +73,12 @@ update request {
 
 # compiled - ref - multiline
 if (&Tmp-String-0 !~ /^foo$/m) {
-       update reply {
-               Filter-Id += 'Fail 14'
-       }
+       test_fail
 }
 
 # compiled - ref - non-multiline
 if (&Tmp-String-0 =~ /^foo$/) {
-       update reply {
-               Filter-Id += 'Fail 15'
-       }
+       test_fail
 }
 
 # compiled - ref - non-multiline
@@ -114,36 +86,26 @@ if (&Tmp-String-0 =~ /^foo$/) {
 # Not all POSIX implementations support the \n character classes
 # so only run this test if the server was built with libpcre.
 if (("${feature.regex-pcre}" == 'yes') && (&Tmp-String-0 !~ /^foo\nbar$/)) {
-       update reply {
-               Filter-Id += 'Fail 16'
-       }
+       test_fail
 }
 
 # compiled - ref - multiline
 if (&Tmp-String-0 !~ /^bar$/m) {
-       update reply {
-               Filter-Id += 'Fail 17'
-       }
+       test_fail
 }
 
 # compiled - ref - multiline - sensitive
 if (&Tmp-String-0 =~ /^BAR$/m) {
-       update reply {
-               Filter-Id += 'Fail 17'
-       }
+       test_fail
 }
 
 # compiled - ref - multiline - insensitive
 if (&Tmp-String-0 !~ /^BAR$/mi) {
-       update reply {
-               Filter-Id += 'Fail 17'
-       }
+       test_fail
 }
 
 # compiled - ref - multiline - insensitive (flag order reversed)
 if (&Tmp-String-0 !~ /^BAR$/im) {
-       update reply {
-               Filter-Id += 'Fail 18'
-       }
+       test_fail
 }
 

diff --git a/src/tests/keywords/if-regex-match-named b/src/tests/keywords/if-regex-match-named
index 5b633c809bb8bf985e78aa46653c54b0f5236972..f26b5ff807a75969f2c84bd5fd851723fa67bf8b 100644 (file)
--- a/src/tests/keywords/if-regex-match-named
+++ b/src/tests/keywords/if-regex-match-named
@@ -8,84 +8,60 @@ update request {
 # uncompiled - ref - named capture groups
 if (User-Name =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+)_(?<five>[^_])_(?<six>6)_(?<seven>[7-8])%{Tmp-String-0}/) {
        if ("%{regex:seven}_%{regex:six}_%{regex:five}_%{regex:four}_%{regex:three}_%{regex:two}_%{regex:one}_%{0}" != '7_6_5_4_3_2_1_1_2_3_4_5_6_7') {
-               update reply {
-                       Filter-Id += 'Fail 1'
-               }
+               test_fail
        }
 }
 else {
-       update reply {
-               Filter-Id += 'Fail 1.5'
-       }
+       test_fail
 }
 
 # Checking capture groups are cleared out correctly
 if (User-Name =~ /^(?<one>[0-9])_%{Tmp-String-0}/) {
        if ("%{0}%{regex:one}%{regex:two}%{regex:three}%{regex:four}%{regex:five}%{regex:six}%{regex:seven}" != '1_1') {
-               update reply {
-                       Filter-Id += 'Fail 2'
-               }
+               test_fail
        }
 }
 else {
-       update reply {
-               Filter-Id += 'Fail 2.5'
-       }
+       test_fail
 }
 
 # Checking capture groups are cleared out correctly when there are no matches
 if (User-Name =~ /^.%{Tmp-String-0}/) {
        if ("%{0}%{regex:one}%{regex:two}%{regex:three}%{regex:four}%{regex:five}%{regex:six}%{regex:seven}" != '1') {
-               update reply {
-                       Filter-Id += 'Fail 3'
-               }
+               test_fail
        }
 }
 else {
-       update reply {
-               Filter-Id += 'Fail 3.5'
-       }
+       test_fail
 }
 
 # compiled - ref - named capture groups
 if (User-Name =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+)_(?<five>[^_])_(?<six>6)_(?<seven>[7-8])/) {
        if ("%{regex:seven}_%{regex:six}_%{regex:five}_%{regex:four}_%{regex:three}_%{regex:two}_%{regex:one}_%{0}" != '7_6_5_4_3_2_1_1_2_3_4_5_6_7') {
-               update reply {
-                       Filter-Id += 'Fail 4'
-               }
+               test_fail
        }
 }
 else {
-       update reply {
-               Filter-Id += 'Fail 4.5'
-       }
+       test_fail
 }
 
 # compiled - xlat - named capture groups
 if ('1_2_3_4_5_6_7' =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+)_(?<five>[^_])_(?<six>6)_(?<seven>[7-8])/) {
        if ("%{regex:seven}_%{regex:six}_%{regex:five}_%{regex:four}_%{regex:three}_%{regex:two}_%{regex:one}_%{0}" != '7_6_5_4_3_2_1_1_2_3_4_5_6_7') {
-               update reply {
-                       Filter-Id += 'Fail 5'
-               }
+               test_fail
        }
 }
 else {
-       update reply {
-               Filter-Id += 'Fail 5.5'
-       }
+       test_fail
 }
 
 # compiled - ref - named capture groups (numeric indexes)
 if (User-Name =~ /^(?<one>[0-9])_(?<two>[0-9])?_(?<three>[0-9]*)_(?<four>[0-9]+)_(?<five>[^_])_(?<six>6)_(?<seven>[7-8])/) {
        if ("%{7}_%{6}_%{5}_%{4}_%{3}_%{2}_%{1}_%{0}" != '7_6_5_4_3_2_1_1_2_3_4_5_6_7') {
-               update reply {
-                       Filter-Id += 'Fail 4'
-               }
+               test_fail
        }
 }
 else {
-       update reply {
-               Filter-Id += 'Fail 4.5'
-       }
+       test_fail
 }
 }

diff --git a/src/tests/keywords/if-regex-multivalue b/src/tests/keywords/if-regex-multivalue
index 9aa75dad52eaa30996bc15351cf9f519674eebd9..d716bae5c398cc826aace8d47272fd6fb0f640e4 100644 (file)
--- a/src/tests/keywords/if-regex-multivalue
+++ b/src/tests/keywords/if-regex-multivalue
@@ -13,15 +13,11 @@ update request {
 
 if (&Cisco-AVPair[*] =~ /bar=(.*)/) {
        if ("%{1}" != 'baz') {
-               update reply {
-                       Filter-Id += 'Fail 1'
-               }
+               test_fail
        }
 }
 else {
-       update reply {
-               Filter-Id += 'Fail 2'
-       }
+       test_fail
 }
 
 success

diff --git a/src/tests/keywords/ipprefix b/src/tests/keywords/ipprefix
index 79862e058a5618eae771b2cd2caba359fba6f9ce..9576869ecbe9ec303aab2cd9d679426a11addbc4 100644 (file)
--- a/src/tests/keywords/ipprefix
+++ b/src/tests/keywords/ipprefix
@@ -12,39 +12,27 @@ update control {
 }
 
 if ("%{control:Tmp-Cast-IPv6Prefix}" != '::198.51.0.0/112') {
-       update reply {
-               Filter-Id += "Fail 0"
-       }
+       test_fail
 }
 
 if ("%{control:Tmp-Cast-IPv4Prefix}" != '198.51.0.0/16') {
-       update reply {
-               Filter-Id += "Fail 1"
-       }
+       test_fail
 }
 
 if (control:Tmp-Cast-IPv6Prefix != ::198.51.0.0/112) {
-       update reply {
-               Filter-Id += "Fail 2"
-       }
+       test_fail
 }
 
 if (control:Tmp-Cast-IPv4Prefix != 198.51.0.0/16) {
-       update reply {
-               Filter-Id += "Fail 3"
-       }
+       test_fail
 }
 
 if (!(&control:Tmp-Cast-IPv4Prefix < 198.0.0.0/8)) {
-       update reply {
-               Filter-Id += "Fail 4"
-       }
+       test_fail
 }
 
 if (!(&control:Framed-IP-Address < 198.51.0.0/16)) {
-       update reply {
-               Filter-Id += "Fail 5"
-       }
+       test_fail
 }
 
 success

diff --git a/src/tests/keywords/map-xlat b/src/tests/keywords/map-xlat
index aa0132f9aff1050f878f1bc73cbd4d625b7949f6..b7bcd0086592680be443ea5890d05f538bb74e6b 100644 (file)
--- a/src/tests/keywords/map-xlat
+++ b/src/tests/keywords/map-xlat
@@ -12,15 +12,11 @@ update {
 }
 
 if ("%{map:%{Tmp-String-0}}" != 1) {
-    update reply {
-        Filter-Id += 'Fail 0'
-    }
+    test_fail
 }
 
 if (&control:Tmp-String-0 != 'testing123') {
-    update reply {
-        Filter-Id += 'Fail 1'
-    }
+    test_fail
 }
 
 success

diff --git a/src/tests/keywords/redundant-redundant b/src/tests/keywords/redundant-redundant
index fa26e4a248e28fdc29c998e7323c9bef4356443c..3b7fa2138527d1aeaa17b51b1db9531797f3ae41 100644 (file)
--- a/src/tests/keywords/redundant-redundant
+++ b/src/tests/keywords/redundant-redundant
@@ -48,30 +48,22 @@ if (!ok) {
 }
 
 if (&Tmp-Integer-2 != 1) {
-       update reply {
-               Filter-Id += "Fail 3a - expected 1 got %{Tmp-Integer-2}"
-       }
+       test_fail
        return
 }
 
 if (&Tmp-Integer-3 != 1) {
-       update reply {
-               Filter-Id += "'Fail 3b - expected 1 got %{Tmp-Integer-3}"
-       }
+       test_fail
        return
 }
 
 if (&Tmp-Integer-4 != 1) {
-       update reply {
-               Filter-Id += "Fail 3c - expected 1 got %{Tmp-Integer-4}"
-       }
+       test_fail
        return
 }
 
 if (&Tmp-Integer-5 != 1) {
-       update reply {
-               Filter-Id += "Fail 3d - expected 1 got %{Tmp-Integer-5}"
-       }
+       test_fail
        return
 }
 

diff --git a/src/tests/keywords/switch-value-error b/src/tests/keywords/switch-value-error
index 18db9e1f339d7b766a29257105bd1da814c9c3ae..e3cf1094f1064aeb58abb3b051c27c641824d69e 100644 (file)
--- a/src/tests/keywords/switch-value-error
+++ b/src/tests/keywords/switch-value-error
@@ -3,27 +3,19 @@
 #
 switch &Service-Type {
        case "%{expr: 1 + 2}" {
-               update reply {
-                       Filter-Id := "3"
-               }
+               test_fail
        }
 
        case Login-User {
-               update reply {
-                       Filter-Id := "Login-User"
-               }
+               test_fail
        }
 
        case No-Such-Value {    # ERROR
-               update reply {
-                       Filter-Id := "FAILED"
-               }
+               test_fail
        }
 
        case {
-               update reply {
-                       Filter-Id := "default"
-               }
+               test_fail
        }
 
 }

diff --git a/src/tests/keywords/switch-value-error2 b/src/tests/keywords/switch-value-error2
index 688a865e3d0d4ff6ae0b763d7a80ebcc0e7c068d..a45de7766723330d46a53a0e6363f990e1bd47a9 100644 (file)
--- a/src/tests/keywords/switch-value-error2
+++ b/src/tests/keywords/switch-value-error2
@@ -7,27 +7,19 @@
 #
 switch "%{Service-Type}" {
        case "%{expr: 1 + 2}" {
-               update reply {
-                       Filter-Id := "3"
-               }
+               test_fail
        }
 
        case Login-User {
-               update reply {
-                       Filter-Id := "Login-User"
-               }
+               test_fail
        }
 
        case No-Such-Value {    # ERROR
-               update reply {
-                       Filter-Id := "FAILED"
-               }
+               test_fail
        }
 
        case {
-               update reply {
-                       Filter-Id := "default"
-               }
+               test_fail
        }
 
 }

diff --git a/src/tests/keywords/truncation b/src/tests/keywords/truncation
index 3f70dc0fa02c31e7c3f5ee08b52d15d068a76108..acb21f857546914306509f56645fc8e71e5bec04 100644 (file)
--- a/src/tests/keywords/truncation
+++ b/src/tests/keywords/truncation
@@ -80,16 +80,12 @@ update request {
 }
 
 if (Tmp-Integer-0 != 4084) {
-       update reply {
-               Filter-Id += 'Fail 0'
-       }
+       test_fail
 }
 
 # Octets are expanded to 8168 hexits
 if ("%{Tmp-Octets-0}" !~ /^0x([0-9a-f]+)$/) {
-       update reply {
-               Filter-Id += 'Fail 1'
-       }
+       test_fail
 }
 
 update request {
@@ -97,9 +93,7 @@ update request {
 }
 
 if ("%{length:Tmp-String-0}" != 8168) {
-       update reply {
-               Filter-Id += 'Fail 2'
-       }
+       test_fail
 }
 
 # We can't do any more until all the xlat code uses dynamically allocated buffers

diff --git a/src/tests/keywords/unknown b/src/tests/keywords/unknown
index 356443fddf9d4f7d61409a911d3eafc8be2d7a35..d1c55f23ba301e2ca4256ace2152ab0d8d70c8c1 100644 (file)
--- a/src/tests/keywords/unknown
+++ b/src/tests/keywords/unknown
@@ -17,9 +17,7 @@ update request {
 }
 
 if (&Attr-26.24757.84.9.5.7 != 0xab) {
-       update reply {
-               Filter-Id += 'Fail 1'
-       }
+       test_fail
 }
 
 #
@@ -30,9 +28,7 @@ update request {
 }
 
 if (&Attr-26.24757.84.9.5.15 != 0xabcdef) {
-       update reply {
-               Filter-Id += 'Fail 2'
-       }
+       test_fail
 }
 
 #
@@ -40,15 +36,11 @@ if (&Attr-26.24757.84.9.5.15 != 0xabcdef) {
 #  get automatically resolved to the real attribute.
 #
 if (&Attr-26.11344.1 == 127.0.0.1) {
-       update reply {
-               Filter-Id += 'Fail 3'
-       }
+       test_fail
 }
 
 if (&Attr-26.11344.1 != 127.0.0.2) {
-       update reply {
-               Filter-Id += 'Fail 4'
-       }
+       test_fail
 }
 
 update request {
@@ -56,27 +48,19 @@ update request {
 }
 
 if (&FreeRADIUS-Proxied-To == 127.0.0.2) {
-       update reply {
-               Filter-Id += 'Fail 5'
-       }
+       test_fail
 }
 
 if (&FreeRADIUS-Proxied-To != 127.0.0.1) {
-       update reply {
-               Filter-Id += 'Fail 6'
-       }
+       test_fail
 }
 
 if (&Attr-26.11344.1 == 127.0.0.2) {
-       update reply {
-               Filter-Id += 'Fail 7'
-       }
+       test_fail
 }
 
 if (&Attr-26.11344.1 != 127.0.0.1) {
-       update reply {
-               Filter-Id += 'Fail 8'
-       }
+       test_fail
 }
 
 update request {
@@ -84,9 +68,7 @@ update request {
 }
 
 if (&Attr-26.66.1 != 0x01020304) {
-       update reply {
-               Filter-Id += 'Fail 9'
-       }
+       test_fail
 }
 
 success

diff --git a/src/tests/keywords/update-hex b/src/tests/keywords/update-hex
index ba8fd8df32a86be1b28cb559897223f54d37480e..73262805013c0e606eea4551659caef50024e1f5 100644 (file)
--- a/src/tests/keywords/update-hex
+++ b/src/tests/keywords/update-hex
@@ -12,9 +12,7 @@ update {
 }
 
 if (Tmp-String-0 != 'bob') {
-       update reply {
-               Filter-Id += 'Fail 0'
-       }
+       test_fail
 }
 
 update {
@@ -22,9 +20,7 @@ update {
 }
 
 if (Tmp-String-0 != '0x626f62') {
-       update reply {
-               Filter-Id += 'Fail 1'
-       }
+       test_fail
 }
 
 success

diff --git a/src/tests/keywords/update-index b/src/tests/keywords/update-index
index 9395a13985cf5cf297da14536341e2021510dadd..2b8ad46fa1854913a49db3e02cccef6f8a4556c9 100644 (file)
--- a/src/tests/keywords/update-index
+++ b/src/tests/keywords/update-index
@@ -14,9 +14,7 @@ update {
 }
 
 if ((&control:Reply-Message[0] != 'a') || (&control:Reply-Message[1] != 'b') || (&control:Reply-Message[2] != 'c')) {
-       update {
-               reply:Filter-Id := 'Fail 0'
-       }
+       test_fail
 }
 
 # Overwrite a specific index, and check the value here is replaced
@@ -25,9 +23,7 @@ update {
 }
 
 if ((&control:Reply-Message[0] != 'a') || (&control:Reply-Message[1] != 'd') || (&control:Reply-Message[2] != 'c')) {
-       update {
-               reply:Filter-Id := 'Fail 1'
-       }
+       test_fail
 }
 
 # Check isolation...
@@ -36,17 +32,13 @@ update {
 }
 
 if ((&control:Reply-Message[0] != 'a') || (&control:Reply-Message[1] != 'd') || (&control:Reply-Message[2] != 'c')) {
-       update {
-               reply:Filter-Id := 'Fail 2'
-       }
+       test_fail
 }
 
 # Verify we haven't acquired any extra..
 
 if ("%{control:Reply-Message[#]}" != 3) {
-       update {
-               reply:Filter-Id := 'Fail 3'
-       }
+       test_fail
 }
 
 success

diff --git a/src/tests/keywords/update-xlat b/src/tests/keywords/update-xlat
index 054ee4718f60518da1de1ca19d078593c880d031..2cf7a66b2e3c4b74d495d6a614c8bcaa92e1fd6e 100644 (file)
--- a/src/tests/keywords/update-xlat
+++ b/src/tests/keywords/update-xlat
@@ -22,15 +22,11 @@ update request {
 }
 
 if (&Tmp-String-1 != 'hello') {
-       update reply {
-               Filter-Id += 'Fail 0'
-       }
+       test_fail
 }
 
 if (&Tmp-String-0 == 'hello') {
-       update reply {
-               Filter-Id += 'Fail 1'
-       }
+       test_fail
 }
 
 if (0) { # XXX
@@ -46,9 +42,7 @@ update {
 }
 
 if (&Vendor-66-Attr-1 != 0x01020304) {
-       update reply {
-               Filter-Id += 'Fail 1a'
-       }
+       test_fail
 }
 
 #
@@ -63,9 +57,7 @@ update {
 }
 
 if (&FreeRADIUS-Proxied-To != 127.0.0.1) {
-       update reply {
-               Filter-Id += 'Fail 2'
-       }
+       test_fail
 }
 
 update {
@@ -73,9 +65,7 @@ update {
 }
 
 if (&Tmp-String-1 != 'hello2') {
-       update reply {
-               Filter-Id += 'Fail 3'
-       }
+       test_fail
 }
 
 } # XXX

diff --git a/src/tests/keywords/urlquote b/src/tests/keywords/urlquote
index e118c3ce19750a7193e68a811be8b6a82abbaf1c..dd59073c260101fa247f112341d50baa25133c28 100644 (file)
--- a/src/tests/keywords/urlquote
+++ b/src/tests/keywords/urlquote
@@ -13,39 +13,27 @@ update {
 
 
 if (<string>"%{urlquote:%{request:Tmp-String-0}}" != &Tmp-String-0) {
-       update reply {
-               Filter-Id += 'Fail 1'
-       }
+       test_fail
 }
 
 if (<string>"%{urlquote:%{request:Tmp-String-1}}" != &Tmp-String-3) {
-       update reply {
-               Filter-Id += 'Fail 2'
-       }
+       test_fail
 }
 
 if (<string>"%{urlquote:%{request:Tmp-String-2}}" != &Tmp-String-4) {
-       update reply {
-               Filter-Id += 'Fail 3'
-       }
+       test_fail
 }
 
 if (<string>"%{urlunquote:%{request:Tmp-String-0}}" != &Tmp-String-0) {
-       update reply {
-               Filter-Id += 'Fail 4'
-       }
+       test_fail
 }
 
 if (<string>"%{urlunquote:%{request:Tmp-String-3}}" != &Tmp-String-1) {
-       update reply {
-               Filter-Id += 'Fail 5'
-       }
+       test_fail
 }
 
 if (<string>"%{urlunquote:%{request:Tmp-String-4}}" != &Tmp-String-2) {
-       update reply {
-               Filter-Id += 'Fail 6'
-       }
+       test_fail
 }
 
 success

diff --git a/src/tests/keywords/xlat-attr b/src/tests/keywords/xlat-attr
index 4bc5b8f62c388403189d6cec95b9fe3087e6aa69..5174dc7a6ee1685db41d9347ff09724354326124 100644 (file)
--- a/src/tests/keywords/xlat-attr
+++ b/src/tests/keywords/xlat-attr
@@ -13,51 +13,35 @@ update request {
 }
 
 if ("%{attr:&FreeRADIUS-Proxied-To}" != 'FreeRADIUS-Proxied-To') {
-       update reply {
-               Filter-Id += 'Fail 0'
-       }
+       test_fail
 }
 
 if ("%{attr_num:&FreeRADIUS-Proxied-To}" != 1) {
-       update reply {
-               Filter-Id += 'Fail 2'
-       }
+       test_fail
 }
 
 if ("%{vendor:&FreeRADIUS-Proxied-To}" != 'FreeRADIUS') {
-       update reply {
-               Filter-Id += 'Fail 3'
-       }
+       test_fail
 }
 
 if ("%{vendor_num:&FreeRADIUS-Proxied-To}" != 11344) {
-       update reply {
-               Filter-Id += 'Fail 4'
-       }
+       test_fail
 }
 
 if ("%{attr:&Reply-Message}" != 'Reply-Message') {
-       update reply {
-               Filter-Id += 'Fail 5'
-       }
+       test_fail
 }
 
 if ("%{attr_num:&Reply-Message}" != 18) {
-       update reply {
-               Filter-Id += 'Fail 6'
-       }
+       test_fail
 }
 
 if ("%{vendor:&Reply-Message}" != '') {
-       update reply {
-               Filter-Id += 'Fail 7'
-       }
+       test_fail
 }
 
 if ("%{vendor_num:&Reply-Message}" != 0) {
-       update reply {
-               Filter-Id += 'Fail 8'
-       }
+       test_fail
 }
 
 success

diff --git a/src/tests/keywords/xlat-explode b/src/tests/keywords/xlat-explode
index 13160a10402d3e982885925bf25ce7da72bbb246..8ccc6fd451a6db0380e8ae7faeae468e194447c9 100644 (file)
--- a/src/tests/keywords/xlat-explode
+++ b/src/tests/keywords/xlat-explode
@@ -12,27 +12,19 @@ update {
 }
 
 if ("%{explode:&Class |}" != 3) {
-       update reply {
-               Filter-Id += 'Fail 0'
-       }
+       test_fail
 }
 
 if ("%{Class[#]}" != 3) {
-       update reply {
-               Filter-Id += 'Fail 1'
-       }
+       test_fail
 }
 
 if ((&Class[0] != '1=1') || (&Class[1] != 'my_attr=2') || (&Class[2] != 'my_attr=hello')) {
-       update reply {
-               Filter-Id += 'Fail 2'
-       }
+       test_fail
 }
 
 if (&Class[3]) {
-       update reply {
-               Filter-Id += 'Fail 3'
-       }
+       test_fail
 }
 
 if ("%{explode:&control:Calling-Station-Id |}" != 0) {
@@ -42,15 +34,11 @@ if ("%{explode:&control:Calling-Station-Id |}" != 0) {
 }
 
 if ("%{explode:&control:User-Name[*] |}" != 5) {
-       update reply {
-               Filter-Id += 'Fail 5'
-       }
+       test_fail
 }
 
 if ("%{control:User-Name[#]}" != 5) {
-       update reply {
-               Filter-Id += 'Fail 6'
-       }
+       test_fail
 }
 
 if ((&control:User-Name[0] != 'hello') || \
@@ -58,33 +46,23 @@ if ((&control:User-Name[0] != 'hello') || \
     (&control:User-Name[2] != 'morning') || \
     (&control:User-Name[3] != 'night') || \
     (&control:User-Name[4] != '1')) {
-       update reply {
-               Filter-Id += 'Fail 7'
-       }
+       test_fail
 }
 
 if (&control:User-Name[5]) {
-       update reply {
-               Filter-Id += 'Fail 8'
-       }
+       test_fail
 }
 
 if ("%{explode:&control:Reply-Message |}" != 0) {
-       update reply {
-               Filter-Id += 'Fail 9'
-       }
+       test_fail
 }
 
 if ("%{control:Reply-Message[#]}" != 1) {
-       update reply {
-               Filter-Id += 'Fail 10'
-       }
+       test_fail
 }
 
 if (&control:Reply-Message != 'Can\'t touch this') {
-       update reply {
-               Filter-Id += 'Fail 11'
-       }
+       test_fail
 }
 
 debug_all

diff --git a/src/tests/keywords/xlat-list b/src/tests/keywords/xlat-list
index 737b79f070b8f952fe63faa2ac9f96fcdf2690f3..4a6be10040e489636f7610da59e4369a98448ef3 100644 (file)
--- a/src/tests/keywords/xlat-list
+++ b/src/tests/keywords/xlat-list
@@ -20,9 +20,9 @@ if (("%{control:[0]}" != 192.0.2.1) || ("%{control:[1]}" != 192.0.2.2)) {
        test_fail
 }
 
-if (("%{control:[n]}" != 192.0.2.2)) {
-    test_fail
-}
+#if (("%{control:[n]}" != 192.0.2.2)) {
+#      test_fail
+#}
 
 if ("%{control:[*]}" != '192.0.2.1,192.0.2.2') {
        test_fail