we should use test_fail, not fail for most situations

diff --git a/src/tests/keywords/pack b/src/tests/keywords/pack
index c4ac78b54dd26fc513d9be0b99a528aff50b8137..6b075b575ecb6dd704b67c2229670fff3f5ecf37 100644 (file)
--- a/src/tests/keywords/pack
+++ b/src/tests/keywords/pack
@@ -11,7 +11,7 @@
 &Tmp-Octets-0 := "%{pack:%{Framed-IP-Address}%{NAS-Port}%{NAS-IP-Address}}"
 
 if (&Tmp-Octets-0 != 0x7f000001000008407f000002) {
-       fail
+       test_fail
 }
 
 success

diff --git a/src/tests/keywords/xlat-alternation b/src/tests/keywords/xlat-alternation
index 845f9403bfc4c3c12cf8f7683545537877a18097..6fccccd46a1ec10f1c43063bdc19478cb623e040 100644 (file)
--- a/src/tests/keywords/xlat-alternation
+++ b/src/tests/keywords/xlat-alternation
@@ -10,7 +10,7 @@
 #
 &Tmp-String-2 := "%{%{Tmp-String-0[0]}:-%{Tmp-String-1[0]}}"
 if (&Tmp-String-2[0] != 'foo') {
-       fail
+       test_fail
 }
 
 #
@@ -19,7 +19,7 @@ if (&Tmp-String-2[0] != 'foo') {
 &request -= &Tmp-String-0[*]
 &Tmp-String-2 := "%{%{Tmp-String-0[0]}:-%{Tmp-String-1[0]}}"
 if (&Tmp-String-2[0] != 'bar') {
-       fail
+       test_fail
 }
 
 #
@@ -27,7 +27,7 @@ if (&Tmp-String-2[0] != 'bar') {
 #
 &Tmp-String-2 := "%{%{Tmp-String-0[0]}:-%{Tmp-String-1[0]} foo}"
 if (&Tmp-String-2[0] != 'bar foo') {
-       fail
+       test_fail
 }
 
 #
@@ -36,7 +36,7 @@ if (&Tmp-String-2[0] != 'bar foo') {
 &request -= &Tmp-String-1[*]
 &Tmp-String-2 := "%{%{Tmp-String-0[0]}:-%{Tmp-String-1[0]}}"
 if (!&Tmp-String-2[0] || (&Tmp-String-2[0] != "")) {
-       fail
+       test_fail
 }
 
 success

diff --git a/src/tests/keywords/xlat-double-alternation b/src/tests/keywords/xlat-double-alternation
index f2e38407d4cca574093b24f8c2f3b9e7506030a8..c89e152b51b017b0b7d338a186c331f21a274a0a 100644 (file)
--- a/src/tests/keywords/xlat-double-alternation
+++ b/src/tests/keywords/xlat-double-alternation
@@ -1,7 +1,7 @@
 # Regression test for double consecutive alternations
 &Tmp-uint64-0 := "%{%{Acct-Input-Octets}:-2}%{%{Acct-Input-Gigawords}:-1}"
 if (&Tmp-uint64-0 != 21) {
-       fail
+       test_fail
 }
 
 success

diff --git a/src/tests/keywords/xlat-inline b/src/tests/keywords/xlat-inline
index e29b723b968a476851201fcf05b3890729276138..86e6d3eb705fae96bd3381e819887274dcfce5a5 100644 (file)
--- a/src/tests/keywords/xlat-inline
+++ b/src/tests/keywords/xlat-inline
@@ -3,7 +3,7 @@
 
 # Check debug level is now 4
 if ("%(debug:4)" != 4) {
-       fail
+       test_fail
 }
 
 # Set debug back to the original level
@@ -11,7 +11,7 @@ if ("%(debug:4)" != 4) {
 
 # Read out the current debug level to verify it changed
 if ("%(debug:%{Tmp-Integer-0})" != "%{Tmp-Integer-0}") {
-       fail
+       test_fail
 }
 
 # Check for 'splosions