use "success" policy, instead of manual updates

diff --git a/src/tests/keywords/3gpp b/src/tests/keywords/3gpp
index 05e3fb23e740a5e69919b93ba8ac6de528e361e1..702816ec39d2965b72d9920e10a1f3b88153ef88 100644 (file)
--- a/src/tests/keywords/3gpp
+++ b/src/tests/keywords/3gpp
@@ -14,6 +14,4 @@ update control {
        Tmp-String-1 := "%{request:3GPP-IMSI}"
 }
 
-update reply {
-       Filter-Id := "filter"
-}
\ No newline at end of file
+success

diff --git a/src/tests/keywords/action-not-end-error b/src/tests/keywords/action-not-end-error
index b35ab1d448ace425858943c6e5af90995e4dc29e..f38d9a7d427162cd029c4d94ec74df1f187ed7e5 100644 (file)
--- a/src/tests/keywords/action-not-end-error
+++ b/src/tests/keywords/action-not-end-error
@@ -4,10 +4,6 @@
 #  Static if condition
 #
 if (1) {
-       update reply {
-               Filter-Id := "filter"
-       }
-
        #
        #  We're not running the 'pap' module, so
        #  we have to set this ourselves.

diff --git a/src/tests/keywords/action-return b/src/tests/keywords/action-return
index ac16bb40dcc71fc3f750c8012903417a15b523fb..4484351feb7d29418e9dd9815ed3eb1840256d35 100644 (file)
--- a/src/tests/keywords/action-return
+++ b/src/tests/keywords/action-return
@@ -4,9 +4,7 @@
 #  Static if condition
 #
 if (1) {
-       update reply {
-               Filter-Id := "filter"
-       }
+       success
 
        #
        #  We're not running the 'pap' module, so

diff --git a/src/tests/keywords/array b/src/tests/keywords/array
index a901a2bda9955493a83dba7ea5495ba531359ccb..3df3922a5e549e8f383acf27c67f8dd87b8f3418 100644 (file)
--- a/src/tests/keywords/array
+++ b/src/tests/keywords/array
@@ -3,10 +3,6 @@
 #
 #  Tests for dereferencing the Nth attribute
 #
-update reply {
-       Filter-Id := "filter"
-}
-
 update request {
        Class := 0x01020304
        Class += 0x05060708
@@ -51,3 +47,5 @@ if (&Class[n] != 0x090a0b0c) {
                Filter-Id += "fail 4"
        }
 }
+
+success

diff --git a/src/tests/keywords/base64 b/src/tests/keywords/base64
index f4e90319dd3cb90d4afe075c3b517e402e10647f..b890ba430fc5c17388aff5e95bcc765e8aef017b 100644 (file)
--- a/src/tests/keywords/base64
+++ b/src/tests/keywords/base64
@@ -1,10 +1,6 @@
 #
 # PRE: hex
 #
-update reply {
-       Filter-Id := "filter"
-}
-
 update request {
        Tmp-String-0        := '9870'
        Tmp-Octets-0        := 0x39383731
@@ -139,3 +135,5 @@ if (Tmp-String-3 != 'IDk4Nz4=') {
                Filter-Id += 'fail 12'
        }
 }
+
+success

diff --git a/src/tests/keywords/break-error b/src/tests/keywords/break-error
index fff20f085b428d0ac8683d011c534a6da137e788..8c2e51ebc40b18043f86998f765fc3cec8247b75 100644 (file)
--- a/src/tests/keywords/break-error
+++ b/src/tests/keywords/break-error
@@ -2,10 +2,6 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-       Filter-Id := "filter"
-}
-
 if (User-Name == "bob") {
        break                   # ERROR
 }

diff --git a/src/tests/keywords/case-empty b/src/tests/keywords/case-empty
index 46ea0548c69b9a4668f9946680ff3dd0fb4e3dcd..3e6c6181addd9b641c52ccd37645a4024d625e96 100644 (file)
--- a/src/tests/keywords/case-empty
+++ b/src/tests/keywords/case-empty
@@ -1,9 +1,5 @@
 # PRE: switch
 #
-update reply {
-       Filter-Id := "filter"
-}
-
 switch &reply:Filter-Id {
        # deliberately empty
        case "filter" {
@@ -16,8 +12,6 @@ switch &reply:Filter-Id {
        }
 
        case {
-               update reply {
-                       Filter-Id := "default"
-               }
+               success
        }
 }

diff --git a/src/tests/keywords/case-empty-string b/src/tests/keywords/case-empty-string
index 4b8e7cd75fa0a88c4fe64ea0f6f28e38db118c8e..85c790a8d493153c3645b844230121bed53c1106 100644 (file)
--- a/src/tests/keywords/case-empty-string
+++ b/src/tests/keywords/case-empty-string
@@ -6,9 +6,7 @@ update request {
 
 switch &Filter-Id {
        case "" {
-               update reply {
-                       Filter-Id := "filter"
-               }
+               success
        }
 
        case "doug" {

diff --git a/src/tests/keywords/cast-byte b/src/tests/keywords/cast-byte
index 4663d95a5df16bb165570b04e85e84b8624ac2f8..b4772c863420fc132640c78c1f9e89e49ae0c601 100644 (file)
--- a/src/tests/keywords/cast-byte
+++ b/src/tests/keywords/cast-byte
@@ -7,9 +7,7 @@ update {
 }
 
 if (<byte>Class == 173) {
-       update reply {
-               Filter-Id := "filter"
-       }
+       success
 }
 
 if (<byte>Class < 173) {

diff --git a/src/tests/keywords/cast-integer b/src/tests/keywords/cast-integer
index 4972ee7459893268536950e2bdab784d9a19820b..0f88aca38c8189d6d33257053df29d0960f5f9d8 100644 (file)
--- a/src/tests/keywords/cast-integer
+++ b/src/tests/keywords/cast-integer
@@ -7,9 +7,7 @@ update {
 }
 
 if (<integer>Class == 257) {
-       update reply {
-               Filter-Id := "filter"
-       }
+       success
 }
 
 if (<integer>Class < 256) {

diff --git a/src/tests/keywords/cast-short b/src/tests/keywords/cast-short
index a17b3799076eadb203b1f3cd77d9c3bf0879b6e5..70f3fdd13e4011af212f855b9a44bb14c0858e0d 100644 (file)
--- a/src/tests/keywords/cast-short
+++ b/src/tests/keywords/cast-short
@@ -7,9 +7,7 @@ update {
 }
 
 if (<short>Class == 257) {
-       update reply {
-               Filter-Id := "filter"
-       }
+       success
 }
 
 if (<short>Class < 256) {

diff --git a/src/tests/keywords/cmp b/src/tests/keywords/cmp
index 4cd59b807548ca676bbe625f29b3627b0503585c..67e4e6b253956b2a26358a8759b7fabe2de75db1 100644 (file)
--- a/src/tests/keywords/cmp
+++ b/src/tests/keywords/cmp
@@ -14,7 +14,5 @@ update request {
 #  Check attribute references
 #
 if (Called-Station-Id == &Calling-Station-Id) {
-       update reply {
-               Filter-Id := "filter"
-       }
+       success
 }

diff --git a/src/tests/keywords/cmp-ipaddr b/src/tests/keywords/cmp-ipaddr
index c7355c58fc0fea4f04ee5a85867df402157d18e8..76e1997bd3aecbb75b9cc44ca26f9480ea5823b2 100644 (file)
--- a/src/tests/keywords/cmp-ipaddr
+++ b/src/tests/keywords/cmp-ipaddr
@@ -1,9 +1,6 @@
 #
 #  PRE: update
 #
-update reply {
-       Filter-Id := "filter"
-}
 update control {
        Cleartext-Password := 'hello'
 }
@@ -44,3 +41,5 @@ if (NAS-IP-Address > &Framed-IP-Address) {
                Filter-Id += "fail"
        }
 }
+
+success

diff --git a/src/tests/keywords/count-error b/src/tests/keywords/count-error
index f0723cb56b7ebab2c694718df674703b5a310ed4..419db0023390c2072f6e68d74965b2c4fc5648d5 100644 (file)
--- a/src/tests/keywords/count-error
+++ b/src/tests/keywords/count-error
@@ -2,10 +2,6 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-       Filter-Id := "filter"
-}
-
 update request {
        Tmp-String-0 := &reply:Filter-Id[#]     # ERROR
 }

diff --git a/src/tests/keywords/else-empty-error b/src/tests/keywords/else-empty-error
index e39651ba703036508891421cdf38f59524b519b0..4a1880f86170d31b3c900c437aac9395f1a11f53 100644 (file)
--- a/src/tests/keywords/else-empty-error
+++ b/src/tests/keywords/else-empty-error
@@ -3,9 +3,7 @@
 #
 
 if (&User-Name == 'bob') {
-       update reply {
-               Filter-Id := "filter"
-       }
+       ok
 }
 else { # ERROR
        # empty is not allowed

diff --git a/src/tests/keywords/else-error b/src/tests/keywords/else-error
index 3816270ecda6643d3e53811cacc56870a61eee6c..077511510ac70bab74efaee0f0bb6d56e8561441 100644 (file)
--- a/src/tests/keywords/else-error
+++ b/src/tests/keywords/else-error
@@ -4,8 +4,8 @@
 #  "else" has to be preceded by an "if" or "elsif"
 #
 if (1) {
-       update reply {
-               Filter-Id := "filter"
+       update control {
+               Cleartext-Password := "fail"
        }
 
        else {  # ERROR

diff --git a/src/tests/keywords/escape b/src/tests/keywords/escape
index 5d0b3bc2fd29e4a6161b3dedbf23012ea6195e7a..d4a11972c9172d3af1243a48329b3b0ec6a25343 100644 (file)
--- a/src/tests/keywords/escape
+++ b/src/tests/keywords/escape
@@ -3,7 +3,6 @@
 #
 update request {
         control:Cleartext-Password := 'hello'
-        reply:Filter-Id := "filter"
 
        Tmp-String-0 := '@abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_: /'
        Tmp-String-1 := '±§#$%^&+={[}];<,>?`|"'
@@ -65,3 +64,4 @@ if (<string>"%{unescape:%{request:Tmp-String-7}}" != &Tmp-String-6) {
        }
 }
 
+success

diff --git a/src/tests/keywords/escape-sequences b/src/tests/keywords/escape-sequences
index 967656df14721c95a52e53a549706b66a089db67..684f6cbdc282b8e6d42428f282992e2293cdf9ad 100644 (file)
--- a/src/tests/keywords/escape-sequences
+++ b/src/tests/keywords/escape-sequences
@@ -15,8 +15,6 @@ update request {
 
        Tmp-String-2 := 'i have scary embedded things\000 inside me'
        Tmp-String-2 += "0x01\0010x07\0070x0A\n0x0D\r''0xb0\260°"
-
-       reply:Filter-Id := "filter"
 }
 
 
@@ -93,3 +91,5 @@ if (&Tmp-String-2[1] != "0x01\0010x07\0070x0A\n0x0D\r''0xb0\260°") {
                Filter-Id += 'fail 9'
        }
 }
+
+success

diff --git a/src/tests/keywords/expr b/src/tests/keywords/expr
index 7645931bdc62149217c29efa1e15b670fd4213e0..2a13d2c490623f5825fb10c8d9db53ae51e4ee8b 100644 (file)
--- a/src/tests/keywords/expr
+++ b/src/tests/keywords/expr
@@ -5,10 +5,6 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-       Filter-Id := "filter"
-}
-
 #
 #  Simple
 #
@@ -106,3 +102,4 @@ if ("%{expr: 6 * -&Tmp-Integer-2}" != -24) {
        }
 }
 
+success

diff --git a/src/tests/keywords/foreach-break-2 b/src/tests/keywords/foreach-break-2
index b1f60407a6aee25cbcecfefcbc542708339bf047..e2190d41d76476cd4157095d3283a7beef164864 100644 (file)
--- a/src/tests/keywords/foreach-break-2
+++ b/src/tests/keywords/foreach-break-2
@@ -31,10 +31,7 @@ foreach control:Tmp-String-0 {
                update request {
                        Called-Station-Id := "%{1}"
                }
-               update reply {
-                       Filter-Id := "filter"
-               }
-
+               success
                break
        }
        elsif ("%{Foreach-Variable-0}" == '9') {

diff --git a/src/tests/keywords/foreach-break-3 b/src/tests/keywords/foreach-break-3
index af03da638089a1168e173b384642ea95ba51e182..056b4392fefc5efbce841a0afba9fc81bd4dff5c 100644 (file)
--- a/src/tests/keywords/foreach-break-3
+++ b/src/tests/keywords/foreach-break-3
@@ -28,10 +28,7 @@ update control {
 
 foreach &control:Calling-Station-Id {
        if (&request:Calling-Station-Id == "%{Foreach-Variable-0}") {
-               update reply {
-                       Filter-Id := "filter"
-               }
-
+               success
                break
        }
        elsif ("%{Foreach-Variable-0}" == '9') {

diff --git a/src/tests/keywords/foreach-break-4 b/src/tests/keywords/foreach-break-4
index 037af8ead44eca42db79830a90fc5ff300d510ed..cabe9eb7de20f34a8bc487b2742db551941720a0 100644 (file)
--- a/src/tests/keywords/foreach-break-4
+++ b/src/tests/keywords/foreach-break-4
@@ -28,10 +28,7 @@ update control {
 
 foreach &control:Calling-Station-Id {
        if (&request:Calling-Station-Id == "%{Foreach-Variable-0}") {
-               update reply {
-                       Filter-Id := "filter"
-               }
-
+               success
                break
        }
        elsif ("%{Foreach-Variable-0}" == '9') {

diff --git a/src/tests/keywords/foreach-isolation b/src/tests/keywords/foreach-isolation
index b77806dcff7511a2352f7348571fdbe254018485..78aad162de6ddb574c40d2a48260d0d3bd9b0419 100644 (file)
--- a/src/tests/keywords/foreach-isolation
+++ b/src/tests/keywords/foreach-isolation
@@ -3,7 +3,6 @@
 #
 
 update {
-       &reply:Filter-Id := 'filter'
        &control:Tmp-String-0 := '0'
        &control:Tmp-String-0 += '1'
        &control:Tmp-String-0 += '2'
@@ -36,3 +35,5 @@ if (!&control:Tmp-String-0[0] || &control:Tmp-String-0[1] || &control:Tmp-String
                Filter-Id += 'Fail 2'
        }
 }
+
+success

diff --git a/src/tests/keywords/foreach-return b/src/tests/keywords/foreach-return
index 05409c92fdccb9fe13195a88364dba3be354f404..115175a7c4be9e4ce90519de5de03e0c589b26b7 100644 (file)
--- a/src/tests/keywords/foreach-return
+++ b/src/tests/keywords/foreach-return
@@ -18,9 +18,7 @@ update request {
 
 foreach &Filter-Id {
        if ("%{Foreach-Variable-0}" == "3") {
-               update reply {
-                       Filter-Id := "filter"
-               }
+               success
 
                #
                #  We need this because the "return" below

diff --git a/src/tests/keywords/foreach-varied-depth b/src/tests/keywords/foreach-varied-depth
index 3c3918d6c2b8a3841e8eca041d9094fd7b8479b8..cf9f4dbfbef8561482bfb2a5f64d7716d572f2d5 100644 (file)
--- a/src/tests/keywords/foreach-varied-depth
+++ b/src/tests/keywords/foreach-varied-depth
@@ -1,7 +1,6 @@
 update {
        control:Tmp-String-0 := "ssid=ABCDEF"
        control:Tmp-String-0 += "ssid=GHIJKL"
-       reply:Filter-Id := "filter"
 }
 
 if (User-Name) {
@@ -41,3 +40,5 @@ if (&control:Tmp-String-1 != 'ssid=GHIJKL') {
 update control {
        Tmp-String-1 !* ANY
 }
+
+success

diff --git a/src/tests/keywords/hex b/src/tests/keywords/hex
index 0ad8929c511324c1e448d6921981ce02e957bb03..3d2e9c2dba3f8566a1b529ee671f1afe8d2528ae 100644 (file)
--- a/src/tests/keywords/hex
+++ b/src/tests/keywords/hex
@@ -1,10 +1,6 @@
 #
 # PRE: update
 #
-update reply {
-       Filter-Id := "filter"
-}
-
 update request {
        Tmp-String-0        := '9870'
        Tmp-Octets-0        := 0x39383731
@@ -139,3 +135,5 @@ if (Tmp-String-3 != '203938373e') {
                Filter-Id += 'fail 14'
        }
 }
+
+success

diff --git a/src/tests/keywords/if b/src/tests/keywords/if
index a1460295ea2b25f3b5cfd42cec270ab215902aa1..136ca4041a09180860f9e745452b8b76c8263fa6 100644 (file)
--- a/src/tests/keywords/if
+++ b/src/tests/keywords/if
@@ -4,7 +4,5 @@
 #  Static if condition
 #
 if (1) {
-       update reply {
-               Filter-Id := "filter"
-       }
+       success
 }

diff --git a/src/tests/keywords/if-bob b/src/tests/keywords/if-bob
index 4e8ae3c67fcd1a433c19c96da68f106a2aa2707b..066cbee2be219f42dcbaea581e1cf9585a464a98 100644 (file)
--- a/src/tests/keywords/if-bob
+++ b/src/tests/keywords/if-bob
@@ -3,13 +3,11 @@
 #  Matching "if" conditions
 #
 if (User-Name == "bob") {
-       update reply {
-               Filter-Id := "filter"
-       }
+       success
 }
 
 if (User-Name != "bob") {
        update reply {
                Filter-Id := "not bob"
        }
-}
\ No newline at end of file
+}

diff --git a/src/tests/keywords/if-else b/src/tests/keywords/if-else
index 788d60668cbf83ea74c29104211b1a094cbdd297..43f8d2b6fe5ffb300ed232f3b27dc4c73c5dc4f5 100644 (file)
--- a/src/tests/keywords/if-else
+++ b/src/tests/keywords/if-else
@@ -9,7 +9,5 @@ if (User-Name != "bob") {
        }
 }
 else {
-       update reply {
-               Filter-Id := "filter"
-       }
+       success
 }

diff --git a/src/tests/keywords/if-elsif b/src/tests/keywords/if-elsif
index c0a41ed669839281c1885c77d56b14d5ff303cf9..c326e7ba6fe169cee4c6e8a074684b1d79f062cf 100644 (file)
--- a/src/tests/keywords/if-elsif
+++ b/src/tests/keywords/if-elsif
@@ -8,9 +8,7 @@ if (User-Name != "bob") {
        }
 }
 elsif (User-Name == "bob") {
-       update reply {
-               Filter-Id := "filter"
-       }
+       success
 }
 else {
        update reply {

diff --git a/src/tests/keywords/if-empty-allow b/src/tests/keywords/if-empty-allow
index 745f465681c8ec8618834eedcfe1a2a637dfb1e2..493c6a32abef4ed286687c9baeea61288442878c 100644 (file)
--- a/src/tests/keywords/if-empty-allow
+++ b/src/tests/keywords/if-empty-allow
@@ -16,6 +16,4 @@ elsif (1) {
   # we allow empty 'elsif' conditions
 }
 
-update reply {
-       Filter-Id := "filter"
-}
+success

diff --git a/src/tests/keywords/if-multivalue b/src/tests/keywords/if-multivalue
index f12d6fe0e020c476fbbfd6bb7cb7525432aa5c80..9378600d9ef5a617342ddfa324e0fa7039ddbb02 100644 (file)
--- a/src/tests/keywords/if-multivalue
+++ b/src/tests/keywords/if-multivalue
@@ -3,7 +3,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -171,3 +170,5 @@ if (!(&request:Tmp-Integer-0[*] < 10)) {
                Filter-Id += 'fail 16'
        }
 }
+
+success

diff --git a/src/tests/keywords/if-paircmp b/src/tests/keywords/if-paircmp
index 6ed06e3fb5358347e1b7b95b509303bcea1a11f9..eae1ea1811be9b992ad5bf29b6f6095c3bbae4fb 100644 (file)
--- a/src/tests/keywords/if-paircmp
+++ b/src/tests/keywords/if-paircmp
@@ -3,7 +3,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 #
@@ -25,3 +24,5 @@ if (&Test-Paircmp == 'no') {
                Filter-Id += 'fail 2'
        }
 }
+
+success

diff --git a/src/tests/keywords/if-rcode-error b/src/tests/keywords/if-rcode-error
index fed8a49d32b70c0adcce8d7bd42ff47a635ea27d..ca80d710566216dbdf3dbcf182d10f758642522f 100644 (file)
--- a/src/tests/keywords/if-rcode-error
+++ b/src/tests/keywords/if-rcode-error
@@ -3,9 +3,7 @@
 #  return code in an "if" section.
 #
 if (User-Name == "bob") {
-       update reply {
-               Filter-Id := "filter"
-       }
+       success
 
        ok = reject     # ERROR
 }

diff --git a/src/tests/keywords/if-regex-bad-attribute b/src/tests/keywords/if-regex-bad-attribute
index f330fde01e9b258020e82fcc3a01a8b2a00a8ec7..99fb299f4fb39c5b9741a9f939d5fafc6fcf65b3 100644 (file)
--- a/src/tests/keywords/if-regex-bad-attribute
+++ b/src/tests/keywords/if-regex-bad-attribute
@@ -6,16 +6,12 @@
 #  This should parse
 #
 if (&User-Name =~ /%{User-Name}/) {
-       update reply {
-               Filter-Id := "filter"
-       }
+       ok
 }
 
 #
 #  Check regexes which refer to unknown attributes
 #
 if (&User-Name =~ /%{What-The-Heck-Is-This-Thing}/) {  # ERROR
-       update reply {
-               Filter-Id := "filter"
-       }
+       ok
 }

diff --git a/src/tests/keywords/if-regex-empty b/src/tests/keywords/if-regex-empty
index 18e89f6465947e801aa0a794c88cb04440e09a1c..3e352dec61227974fc73dbe936d6fe855fde30f5 100644 (file)
--- a/src/tests/keywords/if-regex-empty
+++ b/src/tests/keywords/if-regex-empty
@@ -3,7 +3,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 if (control:Cleartext-Password !~ /hell(o)(.*)/) {
@@ -44,3 +43,5 @@ if ("%{1}") {
                Filter-Id += 'Fail 5'
        }
 }
+
+success

diff --git a/src/tests/keywords/if-regex-error b/src/tests/keywords/if-regex-error
index f618e8290d9e333de2a23683b31e547d45849d31..051f10199a79e99bd626d9bcb788bb7f32aeabb4 100644 (file)
--- a/src/tests/keywords/if-regex-error
+++ b/src/tests/keywords/if-regex-error
@@ -6,7 +6,5 @@
 #  Check that bad regular expressions will fail
 #
 if (&User-Name =~ /[a-3]/) {   # ERROR
-       update reply {
-               Filter-Id := "filter"
-       }
+       ok
 }

diff --git a/src/tests/keywords/if-regex-multivalue b/src/tests/keywords/if-regex-multivalue
index 7358c9336db43b00a9cd9ec63783a64579ccd9b9..9aa75dad52eaa30996bc15351cf9f519674eebd9 100644 (file)
--- a/src/tests/keywords/if-regex-multivalue
+++ b/src/tests/keywords/if-regex-multivalue
@@ -3,7 +3,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -24,3 +23,5 @@ else {
                Filter-Id += 'Fail 2'
        }
 }
+
+success

diff --git a/src/tests/keywords/if-skip b/src/tests/keywords/if-skip
index 0e74f2218a28a3e2dc6e7c5d9a5a6bb6bba7646a..74fb90a46c7b601cb30beb7133ac65ffd515a150 100644 (file)
--- a/src/tests/keywords/if-skip
+++ b/src/tests/keywords/if-skip
@@ -37,6 +37,4 @@ else {
        no-such-module
 }
 
-update reply {
-       Filter-Id := "filter"
-}
+success

diff --git a/src/tests/keywords/integer b/src/tests/keywords/integer
index 4e2c9f69439fb28b34a4c4271f483e7cc98c586a..31370e9653b094faadd93dd11e85f674734f14e9 100644 (file)
--- a/src/tests/keywords/integer
+++ b/src/tests/keywords/integer
@@ -1,10 +1,6 @@
 #
 # PRE: update
 #
-update reply {
-       Filter-Id := "filter"
-}
-
 update request {
        Tmp-String-0        := '9870'
        Tmp-String-1        := '98709870'
@@ -211,6 +207,4 @@ if (Tmp-String-4 != '959985470') {
        }
 }
 
-
-
-
+success

diff --git a/src/tests/keywords/ipaddr b/src/tests/keywords/ipaddr
index 3010a236fe3f03017faa953ebc68134e4dca0929..313d351907adb8b0f2151020d18ac19cbfd80554 100644 (file)
--- a/src/tests/keywords/ipaddr
+++ b/src/tests/keywords/ipaddr
@@ -3,7 +3,6 @@
 #
 update control {
        Cleartext-Password := 'hello'
-       reply:Filter-Id := "filter"
 }
 
 update request {
@@ -49,3 +48,5 @@ if (Tmp-IP-Address-3 != 127.0.0.4) {
                Filter-Id += "fail 5"
        }
 }
+
+success

diff --git a/src/tests/keywords/ipaddr.raw b/src/tests/keywords/ipaddr.raw
index 6b798170b508efd7b4fe22f873bcd254cb64941b..9c37b0964768dc5dbf2d0d174b6af7821ec2f796 100644 (file)
--- a/src/tests/keywords/ipaddr.raw
+++ b/src/tests/keywords/ipaddr.raw
@@ -3,7 +3,6 @@
 #
 update control {
        Cleartext-Password := 'hello'
-       reply:Filter-Id := "filter"
 }
 
 #
@@ -29,4 +28,6 @@ else {
                        Filter-Id := "filter"
                }
        }
-}
\ No newline at end of file
+}
+
+success

diff --git a/src/tests/keywords/ipprefix b/src/tests/keywords/ipprefix
index 0ab8dce206ea49d05ae3266e70a1bfbd34653438..79862e058a5618eae771b2cd2caba359fba6f9ce 100644 (file)
--- a/src/tests/keywords/ipprefix
+++ b/src/tests/keywords/ipprefix
@@ -5,10 +5,6 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-       Filter-Id := "filter"
-}
-
 update control {
        Tmp-Cast-IPv4Prefix := 198.51.100.255/16
        Tmp-Cast-IPv6Prefix := ::198.51.100.255/112
@@ -50,3 +46,5 @@ if (!(&control:Framed-IP-Address < 198.51.0.0/16)) {
                Filter-Id += "Fail 5"
        }
 }
+
+success

diff --git a/src/tests/keywords/length b/src/tests/keywords/length
index 75274531c8701e2023783e58cf2ff67d9fe71299..df92f01f9aa3dcb560c48613967eb7741731c6d3 100644 (file)
--- a/src/tests/keywords/length
+++ b/src/tests/keywords/length
@@ -1,10 +1,6 @@
 #
 # PRE: hex
 #
-update reply {
-       Filter-Id := "filter"
-}
-
 update request {
        Tmp-String-0        := '\
 abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz\
@@ -153,3 +149,5 @@ if (Tmp-Integer-3 != 5) {
                Filter-Id += 'fail 15'
        }
 }
+
+success

diff --git a/src/tests/keywords/load-balance b/src/tests/keywords/load-balance
index d07939afcc606a07dc978e84f4d2e6afd3532b1c..bed8a65a0a7f5e5a5f47d69246dadc6938a2f270 100644 (file)
--- a/src/tests/keywords/load-balance
+++ b/src/tests/keywords/load-balance
@@ -91,7 +91,5 @@ if ((&Tmp-Integer-0 == 0) || (&Tmp-Integer-1 == 0)) {
        }
 }
 else {
-       update reply {
-               Filter-Id := 'filter'
-       }
+       success
 }

diff --git a/src/tests/keywords/log b/src/tests/keywords/log
index 97a2557b683aec385a9ef0a4d01b61e4ee19df2e..afc589a6375317b57a7134908949930b72628ea4 100644 (file)
--- a/src/tests/keywords/log
+++ b/src/tests/keywords/log
@@ -2,6 +2,4 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-       Filter-Id := "filter"
-}
+success

diff --git a/src/tests/keywords/map-xlat b/src/tests/keywords/map-xlat
index 24446a522fdbc5a186c304d2b74c7c747f580915..aa0132f9aff1050f878f1bc73cbd4d625b7949f6 100644 (file)
--- a/src/tests/keywords/map-xlat
+++ b/src/tests/keywords/map-xlat
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := "filter"
 }
 
 update {
@@ -23,3 +22,5 @@ if (&control:Tmp-String-0 != 'testing123') {
         Filter-Id += 'Fail 1'
     }
 }
+
+success

diff --git a/src/tests/keywords/md5 b/src/tests/keywords/md5
index a97366002b8a2a688cc15c34339bc47f427b85c6..b20a5e672738f47d9c9df4b9186f2ad0e60ee217 100644 (file)
--- a/src/tests/keywords/md5
+++ b/src/tests/keywords/md5
@@ -1,10 +1,6 @@
 #
 # PRE: update if
 #
-update reply {
-       Filter-Id := "filter"
-}
-
 update {
        control:Cleartext-Password := 'hello'
        request:Tmp-String-0 := "This is a string\n"
@@ -58,3 +54,5 @@ if ("%{hmacmd5:&Tmp-String-1 &Tmp-String-2}" != '750c783e6ab0b503eaa86e310a5db73
                Filter-Id += 'fail 6'
        }
 }
+
+success

diff --git a/src/tests/keywords/module-failure-message b/src/tests/keywords/module-failure-message
index 51b1ef41462432471c159baa3e15b776f9c146b1..11af86f768d50f7877f33a0fdccfa9153c28fb96 100644 (file)
--- a/src/tests/keywords/module-failure-message
+++ b/src/tests/keywords/module-failure-message
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 test
@@ -38,3 +37,5 @@ if ("%{request:Module-Failure-Message[4]}" != 'test: RDEBUG4 error message') {
                Filter-Id += 'Fail 4'
        }
 }
+
+success

diff --git a/src/tests/keywords/pad b/src/tests/keywords/pad
index 1d2ed90ab3a7861f902a96020002f681dbc34b48..344a2a59c23aabd556eb1a9568b6b33d0e3d2c58 100644 (file)
--- a/src/tests/keywords/pad
+++ b/src/tests/keywords/pad
@@ -56,7 +56,4 @@ if ("%{lpad:&Tmp-String-0 7 x}" != "xxxtest") {
        return
 }
 
-update reply {
-       Filter-Id := "filter"
-}
-
+success

diff --git a/src/tests/keywords/pairs b/src/tests/keywords/pairs
index 381adeef0e82f47a95a157466329bc71c5ace19d..8ba02d683f29a5cd170f0dde869b7eaaa8729f66 100644 (file)
--- a/src/tests/keywords/pairs
+++ b/src/tests/keywords/pairs
@@ -8,7 +8,6 @@ update {
        request:Tmp-Octets-0 := 0x000504030201
        request:Tmp-Integer-0 := 7331
        request:Tunnel-Private-Group-Id:5 = 127.0.0.1
-       reply:Filter-Id = 'filter'
 }
 
 if ("%{pairs:request:[*]}" != "User-Name = \"bob\", User-Password = \"hello\", Tmp-String-0 = \"This is a string\", Tmp-String-0 = \"This is another one\", Tmp-Octets-0 = 0x000504030201, Tmp-Integer-0 = 7331, Tunnel-Private-Group-Id:5 = \"127.0.0.1\"") {
@@ -40,3 +39,5 @@ if ("%{pairs:control:User-Name}" != '') {
                Filter-Id += 'fail 5'
        }
 }
+
+success

diff --git a/src/tests/keywords/pap b/src/tests/keywords/pap
index a347b7cf711c8d221762b4b33c7b9b3769435c99..749268dd410e1e53917400a621bf4564cac7c623 100644 (file)
--- a/src/tests/keywords/pap
+++ b/src/tests/keywords/pap
@@ -2,7 +2,6 @@
 # PRE: update if
 #
 update {
-       reply:Filter-Id := 'filter'
        control: !* ANY
        request:Tmp-String-0 := "5RNqNl8iYLbkCc7JhR8as4TtDDCX6otuuWtcja8rITUyx9zrnHSe9tTHGmKK"  # 60 byte salt
 }
@@ -144,3 +143,5 @@ update {
 update control {
        Auth-Type := Accept
 }
+
+success

diff --git a/src/tests/keywords/pap-ssha2 b/src/tests/keywords/pap-ssha2
index a8c9c9bc7f1b52a06545dc76fa220ea094a84c42..80356b876da8265ef1ec028cb3d15bacd46289f5 100644 (file)
--- a/src/tests/keywords/pap-ssha2
+++ b/src/tests/keywords/pap-ssha2
@@ -13,7 +13,6 @@ if ('${feature.tls}' != 'yes') {
 }
 
 update {
-       reply:Filter-Id := 'filter'
        control: !* ANY
        request:Tmp-String-0 := "5RNqNl8iYLbkCc7JhR8as4TtDDCX6otuuWtcja8rITUyx9zrnHSe9tTHGmKK"  # 60 byte salt
 }
@@ -112,3 +111,5 @@ update {
 update control {
        Auth-Type := Accept
 }
+
+success

diff --git a/src/tests/keywords/redundant b/src/tests/keywords/redundant
index 4a48fa63769826c0e0bdca96d59ccd0931f3afe1..403ef3b73a2f6dd6e9eea130d452b6839471a774 100644 (file)
--- a/src/tests/keywords/redundant
+++ b/src/tests/keywords/redundant
@@ -24,9 +24,7 @@ redundant {
        }
 
        group {
-               update reply {
-                       Filter-Id := "filter"
-               }
+               success
        }
 }
 

diff --git a/src/tests/keywords/redundant-load-balance b/src/tests/keywords/redundant-load-balance
index 836fdc4a679a114ee8c3d78b59d7153447afc424..616d850d8dfc157228fc6dfdc2ee39399f48f881 100644 (file)
--- a/src/tests/keywords/redundant-load-balance
+++ b/src/tests/keywords/redundant-load-balance
@@ -59,7 +59,5 @@ if (&Tmp-Integer-0 != "%{Tmp-Integer-1[#]}") {
        }
 }
 else {
-       update reply {
-               Filter-Id := 'filter'
-       }
+       success
 }

diff --git a/src/tests/keywords/redundant-map-fail b/src/tests/keywords/redundant-map-fail
index 2f7e61c37af6db3b752329627ba40811547e24da..fb24a75b6609e4c6463d6e6ddd0aea8245dcc3b3 100644 (file)
--- a/src/tests/keywords/redundant-map-fail
+++ b/src/tests/keywords/redundant-map-fail
@@ -6,9 +6,7 @@ redundant {
 }
 
 if (noop || (&Tmp-Integer-0 == 4294967295)) {
-       update reply {
-               Filter-Id := "filter"
-       }
+       success
 } else {
        fail
 }

diff --git a/src/tests/keywords/redundant-redundant b/src/tests/keywords/redundant-redundant
index bb802708d2a827d4aa2c7939c23adbb3b881f8cf..fa26e4a248e28fdc29c998e7323c9bef4356443c 100644 (file)
--- a/src/tests/keywords/redundant-redundant
+++ b/src/tests/keywords/redundant-redundant
@@ -75,6 +75,4 @@ if (&Tmp-Integer-5 != 1) {
        return
 }
 
-update reply {
-       Filter-Id := "filter"
-}
\ No newline at end of file
+success

diff --git a/src/tests/keywords/regex-escape b/src/tests/keywords/regex-escape
index 4ab1e5b97e844fd5073387e79cf0ea46f73a30c6..261575b6dbb69eeae4140caa1548407dd015e6dd 100644 (file)
--- a/src/tests/keywords/regex-escape
+++ b/src/tests/keywords/regex-escape
@@ -23,7 +23,5 @@ elsif (&Tmp-String-1 =~ /%{Tmp-String-0}/) {
        }
 }
 else {
-       update reply {
-               Filter-Id := "filter"
-       }
-}
\ No newline at end of file
+       success
+}

diff --git a/src/tests/keywords/regex-lhs b/src/tests/keywords/regex-lhs
index 91b0b2078b59839d09920ddb89ab14dbf1f0a14c..5e2a1c0666d923bff95fb0d10e6660f66dd1d9ee 100644 (file)
--- a/src/tests/keywords/regex-lhs
+++ b/src/tests/keywords/regex-lhs
@@ -21,7 +21,5 @@ elsif (&Tmp-String-1 !~ /\^foo\$bar/) {
                Filter-Id := "fail 1"
        }
 } else {
-       update reply {
-               Filter-Id := "filter"
-       }
-}
\ No newline at end of file
+       success
+}

diff --git a/src/tests/keywords/return b/src/tests/keywords/return
index 49779a515a1c30c9643cdb0f2e4329a08bfcb057..823c7557289c83370a152a756ec3c098011a0caa 100644 (file)
--- a/src/tests/keywords/return
+++ b/src/tests/keywords/return
@@ -6,9 +6,7 @@ update control {
 }
 
 if (User-Name == "bob") {
-       update reply {
-               Filter-Id := "filter"
-       }
+       success
 
        #
        #  We need this because the "return" below

diff --git a/src/tests/keywords/return-section b/src/tests/keywords/return-section
index 21ecea1a006d74a4eda2b3e91c1671aa98bff50e..5b867245f97b9da5018fd22ecbd581774e259b69 100644 (file)
--- a/src/tests/keywords/return-section
+++ b/src/tests/keywords/return-section
@@ -6,9 +6,7 @@ update control {
 }
 
 if (User-Name == "bob") {
-       update reply {
-               Filter-Id := "filter"
-       }
+       ok
 
        #
        #  We need this because the "return" below

diff --git a/src/tests/keywords/sha1 b/src/tests/keywords/sha1
index 0d577a94a985f07adb1ab71ea8f0dfc5159a254e..7f2c3e07475e07fa4c4c7d0dec915d28b3ee2883 100644 (file)
--- a/src/tests/keywords/sha1
+++ b/src/tests/keywords/sha1
@@ -9,10 +9,6 @@ update {
        request:Tmp-String-2 := "Jefe"
 }
 
-update reply {
-       Filter-Id := 'filter'
-}
-
 #
 #  Put "This is a string" into a file and call "sha1sum" on it.
 #  You should get this string.
@@ -58,3 +54,5 @@ if ("%{hmacsha1:&Tmp-String-1 &Tmp-String-2}" != 'effcdf6ae5eb2fa2d27416d5f184df
                Filter-Id += 'fail 6'
        }
 }
+
+success

diff --git a/src/tests/keywords/sha2 b/src/tests/keywords/sha2
index 89c54f4c0d3ceda503456671fd2db3beeb8ff39e..6e65f84e18c28a3b1db69f8761b3aa2ca629477b 100644 (file)
--- a/src/tests/keywords/sha2
+++ b/src/tests/keywords/sha2
@@ -9,10 +9,6 @@ update {
        request:Tmp-Octets-0 := 0x000504030201
 }
 
-update reply {
-       Filter-Id := 'filter'
-}
-
 #
 #  Put "This is a string" into a file and call "sha256sum" on it.
 #  You should get this string.
@@ -79,3 +75,5 @@ else {        # no OPENSSL.  Force the test to pass
                Filter-Id := 'filter'
        }
 }
+
+success

diff --git a/src/tests/keywords/smash b/src/tests/keywords/smash
index fd19d3fa93c66b48149d4cee03090e9652f7a2da..2776393942e4c4b2c34845320f032a489fc2b9fe 100644 (file)
--- a/src/tests/keywords/smash
+++ b/src/tests/keywords/smash
@@ -3,4 +3,6 @@
 #
 #  This gives the game away.
 #
-update { control:Cleartext-Password := 'hello', reply:Filter-Id := "filter" }
+update { control:Cleartext-Password := 'hello', request:Reply-Message := "foo" }
+
+success

diff --git a/src/tests/keywords/string b/src/tests/keywords/string
index bcf0fcffc1008f77da9e6d83c4a0aeea55ffdac7..8216b6e48636dec309ccd832eb04aee4b0698194 100644 (file)
--- a/src/tests/keywords/string
+++ b/src/tests/keywords/string
@@ -13,7 +13,5 @@ update request {
 #  %{string:...} is explicitly not binary safe
 #
 if ("%{string:Tmp-String-0}" == "this") {
-       update reply {
-               Filter-Id := "filter"
-       }
+       success
 }

diff --git a/src/tests/keywords/switch b/src/tests/keywords/switch
index f64aeaf5abe65ad26c511dc480a6432b94f5b63e..9a7b93c727a8c4d55d2ee1c14c8cb6e386b5380d 100644 (file)
--- a/src/tests/keywords/switch
+++ b/src/tests/keywords/switch
@@ -1,8 +1,6 @@
 switch &User-Name {
        case "bob" {
-               update reply {
-                       Filter-Id := "filter"
-               }
+               success
        }
 
        case "doug" {

diff --git a/src/tests/keywords/switch-attr-cast b/src/tests/keywords/switch-attr-cast
index e271a18b3aecc70b3a26d91af21fe787c3c71b9d..7fc3b4474adee5aeaff59b404db8d59784595005 100644 (file)
--- a/src/tests/keywords/switch-attr-cast
+++ b/src/tests/keywords/switch-attr-cast
@@ -20,9 +20,7 @@ switch &Service-Type {
        #  and then that compared to the input Service-Type
        #
        case &Filter-Id {
-               update reply {
-                       Filter-Id := "filter"
-               }
+               success
        }
 
        case {

diff --git a/src/tests/keywords/switch-attr-cmp b/src/tests/keywords/switch-attr-cmp
index e28ded8107868f324334d37fc0a9fb493d1294f9..3970bacb40e0565652f2fdf37a2de283ff120607 100644 (file)
--- a/src/tests/keywords/switch-attr-cmp
+++ b/src/tests/keywords/switch-attr-cmp
@@ -10,9 +10,7 @@ update request {
 #
 switch &User-Name {
        case &Tmp-String-0 {
-               update reply {
-                       Filter-Id := "filter"
-               }
+               success
        }
 
        case "bob" {

diff --git a/src/tests/keywords/switch-default b/src/tests/keywords/switch-default
index b35ad95089ec859f69d9206374adabb9e609a0d6..b5b5e3e71f808a175a751e47139bbf8543e4e6ec 100644 (file)
--- a/src/tests/keywords/switch-default
+++ b/src/tests/keywords/switch-default
@@ -14,9 +14,7 @@ switch &User-Name {
        }
 
        case {
-               update reply {
-                       Filter-Id := "filter"
-               }
+               success
        }
 
-}
\ No newline at end of file
+}

diff --git a/src/tests/keywords/switch-escape b/src/tests/keywords/switch-escape
index 50d9fdf7b49e41424cc635696a887f42abe09a67..ab24344ea44eb3e7ea9c863e515ffd30c5139209 100644 (file)
--- a/src/tests/keywords/switch-escape
+++ b/src/tests/keywords/switch-escape
@@ -4,9 +4,7 @@ update request {
 
 switch "%{tolower:%{request:Tmp-String-0}}" {
        case 'foo' {
-               update reply {
-                       Filter-Id := "filter"
-               }
+               success
        }
 
        case '' {

diff --git a/src/tests/keywords/switch-nodefault b/src/tests/keywords/switch-nodefault
index 5fb94699bc195d5e386b06f5d44c089f94e18d5d..5c89bc59524341493654a75ddd168f62019d6e5e 100644 (file)
--- a/src/tests/keywords/switch-nodefault
+++ b/src/tests/keywords/switch-nodefault
@@ -16,7 +16,5 @@ if (&reply:Filter-Id) {
        }
 }
 else {
-       update reply {
-               Filter-Id := "filter"
-       }
-}
\ No newline at end of file
+       success
+}

diff --git a/src/tests/keywords/switch-virtual b/src/tests/keywords/switch-virtual
index 659604d98c72e12706adebf116eb9433ae759246..9e3af41188c207b69b3a15f88fa5e55ecf40f170 100644 (file)
--- a/src/tests/keywords/switch-virtual
+++ b/src/tests/keywords/switch-virtual
@@ -10,9 +10,7 @@ update control {
 #
 switch &Packet-Type {
        case Access-Request {
-               update reply {
-                       Filter-Id := "filter"
-               }
+               success
        }
 
        case {
@@ -20,4 +18,4 @@ switch &Packet-Type {
                        Filter-Id := "fail"
                }
        }
-}
\ No newline at end of file
+}

diff --git a/src/tests/keywords/truncation b/src/tests/keywords/truncation
index 8217e3670f1d251d9bd5af223768afb6dcbcdd8e..3f70dc0fa02c31e7c3f5ee08b52d15d068a76108 100644 (file)
--- a/src/tests/keywords/truncation
+++ b/src/tests/keywords/truncation
@@ -1,9 +1,5 @@
 # cat /dev/urandom | env LC_CTYPE=C tr -cd 'a-f0-9' | head -c <n>
 
-update reply {
-       Filter-Id := "filter"
-}
-
 # 8192 - 0x (2) - '' (2) there are unlikely to be any static buffers this big outside of the conffile parser
 update request {
        Tmp-Octets-0 := '0x\
@@ -107,3 +103,4 @@ if ("%{length:Tmp-String-0}" != 8168) {
 }
 
 # We can't do any more until all the xlat code uses dynamically allocated buffers
+success

diff --git a/src/tests/keywords/unknown b/src/tests/keywords/unknown
index 61b7d8c4c87c05865244f888b161d5889804d1ba..356443fddf9d4f7d61409a911d3eafc8be2d7a35 100644 (file)
--- a/src/tests/keywords/unknown
+++ b/src/tests/keywords/unknown
@@ -5,10 +5,6 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-       Filter-Id := "filter"
-}
-
 update request {
        FreeRADIUS-Proxied-To  := 127.0.0.2
 }
@@ -91,4 +87,6 @@ if (&Attr-26.66.1 != 0x01020304) {
        update reply {
                Filter-Id += 'Fail 9'
        }
-}
\ No newline at end of file
+}
+
+success

diff --git a/src/tests/keywords/update b/src/tests/keywords/update
index 97a2557b683aec385a9ef0a4d01b61e4ee19df2e..afc589a6375317b57a7134908949930b72628ea4 100644 (file)
--- a/src/tests/keywords/update
+++ b/src/tests/keywords/update
@@ -2,6 +2,4 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-       Filter-Id := "filter"
-}
+success

diff --git a/src/tests/keywords/update-add-ref-index b/src/tests/keywords/update-add-ref-index
index 7f5e74ad2f5249d2c0dd797ec1c42828c8683f9f..9a0b89fe3a13a09efac8873e0ef1573839964751 100644 (file)
--- a/src/tests/keywords/update-add-ref-index
+++ b/src/tests/keywords/update-add-ref-index
@@ -3,7 +3,6 @@
 #
 
 update request {
-       reply:Filter-Id := "filter"
        Class := 0x01020304
        Class += 0x05060708
        Class += 0x090a0b0c
@@ -116,3 +115,5 @@ if (&Proxy-State[1]) {
                Filter-Id += "fail 4b"
        }
 }
+
+success

diff --git a/src/tests/keywords/update-add-ref-tag b/src/tests/keywords/update-add-ref-tag
index 39800b8851178e527685a6784e2e64ab1e6fe4f0..cbe5214b33ef0b58f9ff412a16d0e98267bafd0b 100644 (file)
--- a/src/tests/keywords/update-add-ref-tag
+++ b/src/tests/keywords/update-add-ref-tag
@@ -3,7 +3,6 @@
 #
 
 update request {
-       reply:Filter-Id := "filter"
        request:Tunnel-Server-Endpoint += '192.0.1.1'
        request:Tunnel-Server-Endpoint += '192.0.1.2'
        request:Tunnel-Server-Endpoint:1 += '192.0.1.1'
@@ -116,3 +115,5 @@ if ((&control:Tunnel-Server-Endpoint[0] != '192.0.2.1') || \
                Filter-Id := "fail 4"
        }
 }
+
+success

diff --git a/src/tests/keywords/update-all b/src/tests/keywords/update-all
index 549a12238173ef55ef370ea663de1f362e88bf6a..595c2257c3cba8a607b469c0d54e99781675f2d8 100644 (file)
--- a/src/tests/keywords/update-all
+++ b/src/tests/keywords/update-all
@@ -5,5 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := "filter"
 }
+
+success

diff --git a/src/tests/keywords/update-array b/src/tests/keywords/update-array
index c872f4e834f9e7e9c88309dc88c0417c9759923d..2838fb1e4b486719d99ff2553b6a501644d4fcd8 100644 (file)
--- a/src/tests/keywords/update-array
+++ b/src/tests/keywords/update-array
@@ -52,12 +52,4 @@ if (&Proxy-State[3]) {
        }
 }
 
-#
-#  The test passes only if no test above
-#  added a Filter-Id
-#
-if (!reply:Filter-Id) {
-       update reply {
-               Filter-Id := "filter"
-       }
-}
\ No newline at end of file
+success

diff --git a/src/tests/keywords/update-delete b/src/tests/keywords/update-delete
index a5c2d5a177138475362a5c79f69cf35611ce4588..e09196b221afa3bb8e9b9db5f5d110a13791c9a9 100644 (file)
--- a/src/tests/keywords/update-delete
+++ b/src/tests/keywords/update-delete
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -38,3 +37,5 @@ if ((Tmp-String-0 && (Tmp-String-0 == 'foobarbaz')) || \
 update request {
        User-Password := 'hello'
 }
+
+success

diff --git a/src/tests/keywords/update-error b/src/tests/keywords/update-error
index 92e0ed24b30a06b3e215d6756f6cd2b5867c8868..119b22954201e30fe0a4113c66b02fc6f33e0967 100644 (file)
--- a/src/tests/keywords/update-error
+++ b/src/tests/keywords/update-error
@@ -5,5 +5,4 @@
 #
 update no-such-list {  # ERROR
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := "filter"
 }

diff --git a/src/tests/keywords/update-error-2 b/src/tests/keywords/update-error-2
index 1fe98f0301c4d790a08522e788049a60d16e6f39..9d422ea461b78c4d6dc6acb51b33ac2f64ac50f2 100644 (file)
--- a/src/tests/keywords/update-error-2
+++ b/src/tests/keywords/update-error-2
@@ -5,5 +5,4 @@
 #
 update {
        no-such-list:Cleartext-Password := 'hello'      # ERROR
-       reply:Filter-Id := "filter"
 }

diff --git a/src/tests/keywords/update-error-3 b/src/tests/keywords/update-error-3
index ffab73ae68f30aac44b28d45a39e0c4d53422070..359b46bd60197070945c1075b1360727282dd147 100644 (file)
--- a/src/tests/keywords/update-error-3
+++ b/src/tests/keywords/update-error-3
@@ -6,5 +6,4 @@
 #
 update {
        Service-Type := 'hello' # ERROR
-       reply:Filter-Id := "filter"
 }

diff --git a/src/tests/keywords/update-exec b/src/tests/keywords/update-exec
index b9a0f733f67bc161ef7a4bbf5a5941e1b0a03b03..335e79f633733a4d10af4087c61ccefc46b54b13 100644 (file)
--- a/src/tests/keywords/update-exec
+++ b/src/tests/keywords/update-exec
@@ -5,10 +5,6 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-       Filter-Id := "filter"
-}
-
 #
 # Exec with script output to attribute
 #
@@ -92,3 +88,4 @@ if (Tmp-String-0) {
        }
 }
 
+success

diff --git a/src/tests/keywords/update-filter b/src/tests/keywords/update-filter
index 5d7d7743fd915bbef40cda6148148f589ab6a169..6d0d69d45667ece86a34ec251e0e1e9e60f7b2e1 100644 (file)
--- a/src/tests/keywords/update-filter
+++ b/src/tests/keywords/update-filter
@@ -299,5 +299,6 @@ debug_request
 
 update control {
        Auth-Type := Accept
-       reply:Filter-Id := 'filter'
 }
+
+success

diff --git a/src/tests/keywords/update-hex b/src/tests/keywords/update-hex
index adb4a5cf68f6ae9a614f3b7eb5ef339b8c7df91c..ba8fd8df32a86be1b28cb559897223f54d37480e 100644 (file)
--- a/src/tests/keywords/update-hex
+++ b/src/tests/keywords/update-hex
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := "filter"
 }
 
 update {
@@ -27,3 +26,5 @@ if (Tmp-String-0 != '0x626f62') {
                Filter-Id += 'Fail 1'
        }
 }
+
+success

diff --git a/src/tests/keywords/update-index b/src/tests/keywords/update-index
index 390aca767981eb6892ce414b54fa4ecacd110445..9395a13985cf5cf297da14536341e2021510dadd 100644 (file)
--- a/src/tests/keywords/update-index
+++ b/src/tests/keywords/update-index
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := "filter"
 }
 
 update {
@@ -50,3 +49,4 @@ if ("%{control:Reply-Message[#]}" != 3) {
        }
 }
 
+success

diff --git a/src/tests/keywords/update-remove-any b/src/tests/keywords/update-remove-any
index e0ef600aae59c5f1958d6b46c63b40e681132e31..0f751c03fbed2bbd511ab224c8cab6177e9a10c7 100644 (file)
--- a/src/tests/keywords/update-remove-any
+++ b/src/tests/keywords/update-remove-any
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 update {
@@ -48,3 +47,5 @@ if ((control:Tmp-IP-Address-0 != 192.0.2.1) || ("%{control:Tmp-IP-Address-0[1]}"
                reply:Filter-Id += 'fail 4'
        }
 }
+
+success

diff --git a/src/tests/keywords/update-remove-index b/src/tests/keywords/update-remove-index
index 58df9a5ba6f2002e43c6289c252d93026a6498e7..5bd343d04e3b56bdcea4407013b1ebe048e2f29d 100644 (file)
--- a/src/tests/keywords/update-remove-index
+++ b/src/tests/keywords/update-remove-index
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 update {
@@ -98,3 +97,5 @@ if ((Tmp-String-0 != 'foobarbaz') || (Tmp-Integer-0 != 123456789)) {
                Filter-Id += 'fail 6'
        }
 }
+
+success

diff --git a/src/tests/keywords/update-remove-list b/src/tests/keywords/update-remove-list
index 22ae577252774b21a9f889fde27e8a431f5288ed..21981957d9146c024db9f64c2ccc7bde543d540f 100644 (file)
--- a/src/tests/keywords/update-remove-list
+++ b/src/tests/keywords/update-remove-list
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -38,3 +37,5 @@ if ((Tmp-String-0 && (Tmp-String-0 == 'foobarbaz')) || \
 update request {
        User-Password := 'hello'
 }
+
+success

diff --git a/src/tests/keywords/update-remove-tag b/src/tests/keywords/update-remove-tag
index 3328789e1e1f58c15ed8ebb024cfe2f09cefc503..7dd43480c9aaee31947041017dcf062d8b492b0f 100644 (file)
--- a/src/tests/keywords/update-remove-tag
+++ b/src/tests/keywords/update-remove-tag
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 update {
@@ -273,3 +272,4 @@ if (Tunnel-Server-Endpoint:3[2] != '192.0.3.3') {
        }
 }
 
+success

diff --git a/src/tests/keywords/update-remove-value b/src/tests/keywords/update-remove-value
index 3fd1f94b1ce5fd806bfe10d5b571b35d0006cc7a..55354d152671127575e368a77eafecd62ec186c9 100644 (file)
--- a/src/tests/keywords/update-remove-value
+++ b/src/tests/keywords/update-remove-value
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 update {
@@ -114,3 +113,5 @@ if (("%{control:Tmp-IP-Address-0[0]}" != 192.0.2.1) || ("%{control:Tmp-IP-Addres
                Filter-Id += 'fail 7'
        }
 }
+
+success

diff --git a/src/tests/keywords/update-tag b/src/tests/keywords/update-tag
index de75640fdc58fcebae3eefa01dbb6cbbbd6aa3f9..05b0984d633ac9697fba4515eed820dfadb1e8a1 100644 (file)
--- a/src/tests/keywords/update-tag
+++ b/src/tests/keywords/update-tag
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -171,3 +170,5 @@ if (Tmp-String-1[9] != '192.0.2.1') {
                reply:Filter-Id += 'fail 21'
        }
 }
+
+success

diff --git a/src/tests/keywords/update-xlat b/src/tests/keywords/update-xlat
index 03a0f1588365a1c97ed058c0c26bdbfd130649d9..054ee4718f60518da1de1ca19d078593c880d031 100644 (file)
--- a/src/tests/keywords/update-xlat
+++ b/src/tests/keywords/update-xlat
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 
@@ -80,3 +79,5 @@ if (&Tmp-String-1 != 'hello2') {
 }
 
 } # XXX
+
+success

diff --git a/src/tests/keywords/urlquote b/src/tests/keywords/urlquote
index 35057d813de7b9f3dbca8a3fbfe8e7d95f61ad8b..e118c3ce19750a7193e68a811be8b6a82abbaf1c 100644 (file)
--- a/src/tests/keywords/urlquote
+++ b/src/tests/keywords/urlquote
@@ -9,7 +9,6 @@ update {
        request:Tmp-String-3 := '%C2%B1%C2%A7%21%40%23%24%25%5E%26%2A%28%29%2B%3D%7B%5B%7D%5D%3A%3B%22%27%7C%5C%3C%2C%3E%3F%2F%60'
 
        request:Tmp-String-4 := '%E2%84%A2%C5%93%C2%A5%C2%A4'
-       reply:Filter-ID := 'filter'
 }
 
 
@@ -48,3 +47,5 @@ if (<string>"%{urlunquote:%{request:Tmp-String-4}}" != &Tmp-String-2) {
                Filter-Id += 'Fail 6'
        }
 }
+
+success

diff --git a/src/tests/keywords/vendor_specific.raw b/src/tests/keywords/vendor_specific.raw
index 13d81dcd5764ea8815eab273efdb132426c0defd..7b24bc72f624291ffbf4cbc60943d48172fbedba 100644 (file)
--- a/src/tests/keywords/vendor_specific.raw
+++ b/src/tests/keywords/vendor_specific.raw
@@ -18,7 +18,5 @@ elsif (&Attr-26 != 0x01020304) {
        }
 }
 else {
-       update reply {
-               Filter-Id := "filter"
-       }
-}
\ No newline at end of file
+       success
+}

diff --git a/src/tests/keywords/virtual b/src/tests/keywords/virtual
index d6dbe32bb032e0ca4795ee587c558e8e89ef25e7..9576688cc727665a01ec7c459dfe8731e09dc0c2 100644 (file)
--- a/src/tests/keywords/virtual
+++ b/src/tests/keywords/virtual
@@ -6,7 +6,5 @@ update control {
 }
 
 if (request:Packet-Type == Access-Request) {
-       update reply {
-               Filter-Id := "filter"
-       }
+       success
 }

diff --git a/src/tests/keywords/virtual-exists b/src/tests/keywords/virtual-exists
index 7a8e8f30f043e14a7c79e8a4fb17ea60201d320f..d1417620d2ee5d689493bb8e9fe4943c4ad1e1ba 100644 (file)
--- a/src/tests/keywords/virtual-exists
+++ b/src/tests/keywords/virtual-exists
@@ -6,7 +6,5 @@ update control {
 }
 
 if (&Client-Shortname) {
-       update reply {
-               Filter-Id := "filter"
-       }
+       success
 }

diff --git a/src/tests/keywords/virtual-load-balance b/src/tests/keywords/virtual-load-balance
index 256c2ff66db6b1b25162d9f9a37d7f3853ecf508..2305fcde06c783b178ea85876e0fd682999d3ac7 100644 (file)
--- a/src/tests/keywords/virtual-load-balance
+++ b/src/tests/keywords/virtual-load-balance
@@ -9,6 +9,4 @@
 virtual_instantiate
 virtual_instantiate.post-auth
 
-update reply {
-       Filter-Id := 'filter'
-}
+success

diff --git a/src/tests/keywords/virtual_policy b/src/tests/keywords/virtual_policy
index 4ab00e274aec87704b907c868197b48950b32e83..72317a7005795a2921484c3cfc4de52a44c6fc60 100644 (file)
--- a/src/tests/keywords/virtual_policy
+++ b/src/tests/keywords/virtual_policy
@@ -10,6 +10,4 @@
 virtual_policy
 virtual_policy.post-auth
 
-update reply {
-       Filter-Id := 'filter'
-}
+success

diff --git a/src/tests/keywords/wimax b/src/tests/keywords/wimax
index f149da4e44b079bdc1ca64972d3d2c09cda38c45..5908f1217435523a806084fa952bf49e848fba52 100644 (file)
--- a/src/tests/keywords/wimax
+++ b/src/tests/keywords/wimax
@@ -24,8 +24,4 @@ if (WiMAX-PFDv2-Src-Assigned != 1) {
        }
 }
 
-if (!reply:Filter-Id) {
-       update reply {
-               Filter-Id := "filter"
-       }
-}
\ No newline at end of file
+success

diff --git a/src/tests/keywords/with_dots b/src/tests/keywords/with_dots
index 4fc6b06fb56fe21b2d99a1067325dc36e32bd5a9..e851267d1dc061e9176a4233dc9f58adb14042ab 100644 (file)
--- a/src/tests/keywords/with_dots
+++ b/src/tests/keywords/with_dots
@@ -14,6 +14,4 @@ update control {
        Cleartext-Password := 'hello'
 }
 
-update reply {
-       Filter-Id := "filter"
-}
+success

diff --git a/src/tests/keywords/xlat-attr b/src/tests/keywords/xlat-attr
index d19495a2f64ec639931d911a72f4782400f8b3c6..4bc5b8f62c388403189d6cec95b9fe3087e6aa69 100644 (file)
--- a/src/tests/keywords/xlat-attr
+++ b/src/tests/keywords/xlat-attr
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -60,3 +59,5 @@ if ("%{vendor_num:&Reply-Message}" != 0) {
                Filter-Id += 'Fail 8'
        }
 }
+
+success

diff --git a/src/tests/keywords/xlat-attr-index b/src/tests/keywords/xlat-attr-index
index c967dd63b5f484eb92d5ca09a4ec5a2ab99e1e5f..d8789cd19c35754ba766eba603c5b3a1f3e6343d 100644 (file)
--- a/src/tests/keywords/xlat-attr-index
+++ b/src/tests/keywords/xlat-attr-index
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -51,3 +50,5 @@ if (Tmp-Integer-0 != 2) {
                reply:Filter-Id += 'fail 4'
        }
 }
+
+success

diff --git a/src/tests/keywords/xlat-attr-tag b/src/tests/keywords/xlat-attr-tag
index 61422d64ffe73b523ab77cd71efa826bb806f154..912aa980592c8309f17d578233eee379117ad275 100644 (file)
--- a/src/tests/keywords/xlat-attr-tag
+++ b/src/tests/keywords/xlat-attr-tag
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -225,3 +224,5 @@ if (Tmp-String-0[10] != '192.0.2.1') {
                reply:Filter-Id += 'fail 23'
        }
 }
+
+success

diff --git a/src/tests/keywords/xlat-explode b/src/tests/keywords/xlat-explode
index ea727d9372101e0b7aafd493c40a275ac6dbaa36..13160a10402d3e982885925bf25ce7da72bbb246 100644 (file)
--- a/src/tests/keywords/xlat-explode
+++ b/src/tests/keywords/xlat-explode
@@ -9,7 +9,6 @@ update {
        control:User-Name += '|hello|goodbye'
        control:User-Name += '|morning|night|1|'
        control:Reply-Message := 'Can\'t touch this'
-       reply:Filter-Id = 'filter'
 }
 
 if ("%{explode:&Class |}" != 3) {
@@ -89,3 +88,4 @@ if (&control:Reply-Message != 'Can\'t touch this') {
 }
 
 debug_all
+success

diff --git a/src/tests/keywords/xlat-octets b/src/tests/keywords/xlat-octets
index ea9543c059431d494beec0e4b53eb22373cc4acd..f047f65a1e742e2ca7aa4cc30f7b855915379f6f 100644 (file)
--- a/src/tests/keywords/xlat-octets
+++ b/src/tests/keywords/xlat-octets
@@ -5,7 +5,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 #
@@ -34,3 +33,5 @@ if ("%{Tmp-Octets-0[*]}" != '0x0001020304050607,0x0706050403020100') {
                reply:Filter-Id += 'fail 3'
        }
 }
+
+success

diff --git a/src/tests/keywords/xlat-virtual-attr b/src/tests/keywords/xlat-virtual-attr
index 395b88904c564db3096ebfe72b8e5e9f93b3cd4b..053076338d7452f5090a362e1dcdaaa596712196 100644 (file)
--- a/src/tests/keywords/xlat-virtual-attr
+++ b/src/tests/keywords/xlat-virtual-attr
@@ -2,10 +2,6 @@
 #  PRE: if
 #
 
-update reply {
-       Filter-Id := "filter"
-}
-
 if ("%{Client-Shortname}" != 'test') {
        update reply {
                Filter-Id += "fail 0"
@@ -123,3 +119,5 @@ if ("%{Virtual-Server[#]}" != 1) {
                Filter-Id += "fail 16"
        }
 }
+
+success

diff --git a/src/tests/keywords/xlat-xlat b/src/tests/keywords/xlat-xlat
index f85794d8377714305be2c14966dd163e5e5854b4..d7626f7b0942277b2633dbed413d05994650b49a 100644 (file)
--- a/src/tests/keywords/xlat-xlat
+++ b/src/tests/keywords/xlat-xlat
@@ -3,7 +3,6 @@
 #
 update {
        control:Cleartext-Password := 'hello'
-       reply:Filter-Id := 'filter'
 }
 
 update request {
@@ -48,3 +47,5 @@ if ("%{xlat:&Tmp-String-1[%{Tmp-Integer-0[2]}]}" != 'bar') {
                Filter-Id += "fail 4"
        }
 }
+
+success