We don't need to do "%{Attr-Name[#]}" either

Just bare xlats are fine now

diff --git a/src/tests/keywords/if-multivalue b/src/tests/keywords/if-multivalue
index db3852f1308e3572e545fd1a758129c7511712fd..33e3e20ea98136275268ce9e8e78da62150dc51f 100644 (file)
--- a/src/tests/keywords/if-multivalue
+++ b/src/tests/keywords/if-multivalue
@@ -111,7 +111,7 @@ if (&Tmp-String-1 =~ /%{Tmp-String-2[#]}$/) {
 #
 #  XLAT virtual comparisons
 #
-if (!(&control.Tmp-Integer-0[*] == "%{control.Tmp-Integer-0[#]}")) {
+if (!(&control.Tmp-Integer-0[*] == %{control.Tmp-Integer-0[#]})) {
        test_fail
 }
 

diff --git a/src/tests/keywords/redundant-load-balance b/src/tests/keywords/redundant-load-balance
index ef1a03dfe1d176033bae519441f6085a5e1ff598..6f190053b33e8f39ab14ef064c5e4d5962a2e7bb 100644 (file)
--- a/src/tests/keywords/redundant-load-balance
+++ b/src/tests/keywords/redundant-load-balance
@@ -52,7 +52,7 @@ foreach &Tmp-Integer-1 {
        }
 }
 
-if (!(&Tmp-Integer-0 == "%{Tmp-Integer-1[#]}")) {
+if (!(&Tmp-Integer-0 == %{Tmp-Integer-1[#]})) {
        test_fail
 }
 

diff --git a/src/tests/keywords/update-attr-ref-null b/src/tests/keywords/update-attr-ref-null
index 2e787f2aad4a164454e76eba7b145f2f0cdc9f85..a93537026bcfabfd5c5a2b201792fde0c63644a6 100644 (file)
--- a/src/tests/keywords/update-attr-ref-null
+++ b/src/tests/keywords/update-attr-ref-null
@@ -10,7 +10,7 @@ update request {
        &control !* ANY
 }
 
-if (!("%{Tmp-String-0[#]}" == 2)) {
+if (!(%{Tmp-String-0[#]} == 2)) {
        test_fail
 }
 

diff --git a/src/tests/keywords/update-filter b/src/tests/keywords/update-filter
index a2bbf3c2bfa6c4e668cc15fe7bf322649a50a019..fb76eeab1e9d2b830c1cb58859534b741e30eb84 100644 (file)
--- a/src/tests/keywords/update-filter
+++ b/src/tests/keywords/update-filter
@@ -29,11 +29,11 @@ if (!(&Tmp-Integer-0[0] == 10)) {
        test_fail
 }
 
-if (!("%{Tmp-Integer-0[#]}" == 1)) {
+if (!(%{Tmp-Integer-0[#]} == 1)) {
        test_fail
 }
 
-if (!("%{Tmp-String-0[#]}" == 3)) {
+if (!(%{Tmp-String-0[#]} == 3)) {
        test_fail
 }
 
@@ -51,7 +51,7 @@ if (!(&Tmp-String-0[0] == 'baz')) {
        test_fail
 }
 
-if (!("%{Tmp-String-0[#]}" == 1)) {
+if (!(%{Tmp-String-0[#]} == 1)) {
        test_fail
 }
 
@@ -69,11 +69,11 @@ if (!(&Tmp-Integer-0[0] == 5)) {
        test_fail
 }
 
-if (!("%{Tmp-Integer-0[#]}" == 1)) {
+if (!(%{Tmp-Integer-0[#]} == 1)) {
        test_fail
 }
 
-if (!("%{Tmp-String-0[#]}" == 3)) {
+if (!(%{Tmp-String-0[#]} == 3)) {
        test_fail
 }
 
@@ -96,11 +96,11 @@ if (!(&Tmp-Integer-0[1] == 20)) {
 }
 
 
-if (!("%{Tmp-Integer-0[#]}" == 2)) {
+if (!(%{Tmp-Integer-0[#]} == 2)) {
        test_fail
 }
 
-if (!("%{Tmp-String-0[#]}" == 3)) {
+if (!(%{Tmp-String-0[#]} == 3)) {
        test_fail
 }
 
@@ -123,11 +123,11 @@ if (!(&Tmp-Integer-0[1] == 10)) {
        test_fail
 }
 
-if (!("%{Tmp-Integer-0[#]}" == 2)) {
+if (!(%{Tmp-Integer-0[#]} == 2)) {
        test_fail
 }
 
-if (!("%{Tmp-String-0[#]}" == 3)) {
+if (!(%{Tmp-String-0[#]} == 3)) {
        test_fail
 }
 
@@ -153,11 +153,11 @@ if (!(&Tmp-Integer-0[2] == 20)) {
        test_fail
 }
 
-if (!("%{Tmp-Integer-0[#]}" == 3)) {
+if (!(%{Tmp-Integer-0[#]} == 3)) {
        test_fail
 }
 
-if (!("%{Tmp-String-0[#]}" == 3)) {
+if (!(%{Tmp-String-0[#]} == 3)) {
        test_fail
 }
 
@@ -183,11 +183,11 @@ if (!(&Tmp-Integer-0[2] == 20)) {
        test_fail
 }
 
-if (!("%{Tmp-Integer-0[#]}" == 3)) {
+if (!(%{Tmp-Integer-0[#]} == 3)) {
        test_fail
 }
 
-if (!("%{Tmp-String-0[#]}" == 3)) {
+if (!(%{Tmp-String-0[#]} == 3)) {
        test_fail
 }
 
@@ -210,7 +210,7 @@ if (!(&Tmp-String-0[0] == &Tmp-String-1[0])) {
        test_fail
 }
 
-if (!("%{Tmp-String-0[#]}" == 1)) {
+if (!(%{Tmp-String-0[#]} == 1)) {
        test_fail
 }
 

diff --git a/src/tests/keywords/update-index b/src/tests/keywords/update-index
index a7c3baa33e8ff2da5d2f67aba801d6b90e369a5c..c4164ff524981671730f966fd716d3345f0ab705 100644 (file)
--- a/src/tests/keywords/update-index
+++ b/src/tests/keywords/update-index
@@ -31,7 +31,7 @@ if (!((&control.Reply-Message[0] == 'a')) || (!(&control.Reply-Message[1] == 'd'
 
 # Verify we haven't acquired any extra..
 
-if (!("%{control.Reply-Message[#]}" == 3)) {
+if (!(%{control.Reply-Message[#]} == 3)) {
        test_fail
 }
 

diff --git a/src/tests/keywords/xlat-virtual-attr b/src/tests/keywords/xlat-virtual-attr
index ef5778cab815cc24d83bf17b13f66eda041536f8..a434c5edbdb3d48da01a48824468a02c1201a7df 100644 (file)
--- a/src/tests/keywords/xlat-virtual-attr
+++ b/src/tests/keywords/xlat-virtual-attr
@@ -71,7 +71,7 @@ if (!("%{Virtual-Server[*]}" == 'default')) {
        test_fail
 }
 
-if (!("%{Virtual-Server[#]}" == 1)) {
+if (!(%{Virtual-Server[#]} == 1)) {
        test_fail
 }