From: Alan T. DeKok Date: Sun, 20 Nov 2022 13:02:12 +0000 (-0500) Subject: remove "debug attribute lists" from tests X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fa355b465853ed23f8658acae592d84f725425d;p=thirdparty%2Ffreeradius-server.git remove "debug attribute lists" from tests if the tests fail, a developer can add those manually --- diff --git a/src/tests/keywords/base64 b/src/tests/keywords/base64 index 920f15c1329..696c26d31ac 100644 --- a/src/tests/keywords/base64 +++ b/src/tests/keywords/base64 @@ -29,8 +29,6 @@ ok &Tmp-String-9 = "%{base64:%{Tmp-Cast-Byte}}" } -%(debug_attr:request[*]) - # String - bin 0x39383730 if (&Tmp-String-0[0] != 'OTg3MA==') { test_fail diff --git a/src/tests/keywords/edit-abort.ignore b/src/tests/keywords/edit-abort.ignore index 1a4f4d82511..8ef8a09b1c6 100644 --- a/src/tests/keywords/edit-abort.ignore +++ b/src/tests/keywords/edit-abort.ignore @@ -13,9 +13,6 @@ update request { &Tmp-Integer-0 += 5 &Tmp-Integer-1 -= 16 # Run-time underflow! -# try to see what's up -%(debug_attr:request[*]) - # # The various edits above should have been reverted. # diff --git a/src/tests/keywords/edit-intersection b/src/tests/keywords/edit-intersection index 9efc6c55ba7..c64a2028b73 100644 --- a/src/tests/keywords/edit-intersection +++ b/src/tests/keywords/edit-intersection @@ -9,13 +9,11 @@ # must exist if (!&reply.Tmp-String-0) { - %(debug_attr:reply[*]) test_fail } # and have the correct value if (&reply.Tmp-String-0 != "foo") { - %(debug_attr:reply[*]) test_fail } @@ -31,7 +29,6 @@ if (&reply.Tmp-String-0 != "foo") { # must NOT exist if (&reply.Tmp-String-0) { - %(debug_attr:reply[*]) test_fail } diff --git a/src/tests/keywords/edit-leaf-octets b/src/tests/keywords/edit-leaf-octets index eb9e20b2be1..deb4ae06720 100644 --- a/src/tests/keywords/edit-leaf-octets +++ b/src/tests/keywords/edit-leaf-octets @@ -5,12 +5,10 @@ &Framed-IP-Address := 0x7f000001 if (!&Framed-IP-Address) { - %(debug_attr:request[*]) test_fail } if (&Framed-IP-Address != 127.0.0.1) { - %(debug_attr:request[*]) test_fail } diff --git a/src/tests/keywords/edit-merge b/src/tests/keywords/edit-merge index 3ae0d27cc84..6279252f1f3 100644 --- a/src/tests/keywords/edit-merge +++ b/src/tests/keywords/edit-merge @@ -20,13 +20,11 @@ if (!&Tmp-String-0) { # The original value should be unchanged if (!(&Tmp-String-0 == "foo")) { - %(debug_attr:request[*]) test_fail } # and the new value should not be there if (&Tmp-String-0 == "bar") { - %(debug_attr:request[*]) test_fail } diff --git a/src/tests/keywords/edit-merge-lhs b/src/tests/keywords/edit-merge-lhs index 57662ed6234..f65c71ac866 100644 --- a/src/tests/keywords/edit-merge-lhs +++ b/src/tests/keywords/edit-merge-lhs @@ -20,13 +20,11 @@ if (!&Tmp-String-0) { # we want the *control* version if (!(&Tmp-String-0 == "bar")) { - %(debug_attr:request[*]) test_fail } # and the original value should not be there if (&Tmp-String-0 == "foo") { - %(debug_attr:request[*]) test_fail } diff --git a/src/tests/keywords/edit-union b/src/tests/keywords/edit-union index a486f141052..e2fc655c864 100644 --- a/src/tests/keywords/edit-union +++ b/src/tests/keywords/edit-union @@ -20,13 +20,11 @@ if (!&Tmp-String-0) { # The original value should be unchanged if (&Tmp-String-0[0] != "foo") { - %(debug_attr:request[*]) test_fail } # and the new value should be there, too if (&Tmp-String-0[1] != "bar") { - %(debug_attr:request[*]) test_fail } diff --git a/src/tests/keywords/ipaddr.raw b/src/tests/keywords/ipaddr.raw index ae519a9452d..b732bdbe2b4 100644 --- a/src/tests/keywords/ipaddr.raw +++ b/src/tests/keywords/ipaddr.raw @@ -7,8 +7,6 @@ # &raw.4 = 0x010203 -debug_request - if (!&raw.4) { test_fail } diff --git a/src/tests/keywords/update-filter b/src/tests/keywords/update-filter index 2012910e29c..fdc11494f6c 100644 --- a/src/tests/keywords/update-filter +++ b/src/tests/keywords/update-filter @@ -18,8 +18,6 @@ update control { # @fixme - EDIT - all kinds of other things are broken, and no time currently to debug them. # -debug_request - # # Integer == # @@ -39,8 +37,6 @@ if ("%{Tmp-String-0[#]}" != 3) { test_fail } -debug_request - # Reset the request list &request := &control @@ -59,8 +55,6 @@ if ("%{Tmp-String-0[#]}" != 1) { test_fail } -debug_request - # Reset the request list &request := &control @@ -220,8 +214,6 @@ if ("%{Tmp-String-0[#]}" != 1) { test_fail } -debug_request - update control { &Auth-Type := Accept } diff --git a/src/tests/keywords/update-remove-index b/src/tests/keywords/update-remove-index index cb0386f8fea..3794602118b 100644 --- a/src/tests/keywords/update-remove-index +++ b/src/tests/keywords/update-remove-index @@ -12,8 +12,6 @@ update { &Tmp-IP-Address-0 += 192.0.2.4 } -debug_request - # # @fixme - EDIT - we should not be allowed to remove by both # index AND value. Or, we should... and the edit code needs @@ -23,8 +21,6 @@ update request { &Tmp-IP-Address-0[3] -= 192.0.2.2 } -debug_request - # Only the 1st, 2nd, 3rd and 5th Tmp-IP-Address attributes should still be in the list if (("%{Tmp-IP-Address-0[0]}" != '192.0.2.1') || ("%{Tmp-IP-Address-0[1]}" != '192.0.2.2') || diff --git a/src/tests/keywords/xlat-list b/src/tests/keywords/xlat-list index e683a72757d..94d8613a220 100644 --- a/src/tests/keywords/xlat-list +++ b/src/tests/keywords/xlat-list @@ -7,8 +7,6 @@ if ("%{control[#]}" != 2) { test_fail } -debug_control - if ("%{control[0]}" != 192.0.2.1) { test_fail }