Regression test for multiple !* ANY maps

diff --git a/src/tests/keywords/update-remove-any b/src/tests/keywords/update-remove-any
index 519b4ba291c3fb476dfb00ec519cc3087afb4723..54e3cf896794da357fab553805b30abc991d61ba 100644 (file)
--- a/src/tests/keywords/update-remove-any
+++ b/src/tests/keywords/update-remove-any
@@ -4,39 +4,49 @@
 #  Remove all attributes in a list
 #
 update {
-       control:Cleartext-Password := 'hello'
+       &control:Cleartext-Password := 'hello'
 }
 
 update {
-       request:Tmp-String-0 := 'foobarbaz'
-       request:Tmp-Integer-0 := 123456789
-       request:Tmp-IP-Address-0 := 192.0.2.1
-       request:Tmp-IP-Address-0 += 192.0.2.2
-       control:Tmp-IP-Address-0 := 192.0.2.1
-       control:Tmp-IP-Address-0 += 192.0.2.3
+       &request:Tmp-String-0 := 'foobarbaz'
+       &request:Tmp-Integer-0 := 123456789
+       &request:Tmp-IP-Address-0 := 192.0.2.1
+       &request:Tmp-IP-Address-0 += 192.0.2.2
+       &control:Tmp-IP-Address-0 := 192.0.2.1
+       &control:Tmp-IP-Address-0 += 192.0.2.3
+       &control:Tmp-IP-Address-1 := 192.0.3.1
 }
 
 if (("%{Tmp-IP-Address-0[0]}" != 192.0.2.1) || ("%{Tmp-IP-Address-0[1]}" != 192.0.2.2)) {
        test_fail
 }
 
-# Remove all attributes in the control list
+# Remove all attributes in the request list
 update {
-       request:Tmp-IP-Address-0 !* ANY
+       &request:Tmp-IP-Address-0 !* ANY
 }
 
 # Non Tmp-IP-Address-0 address attributes should still be in the request list
-if ((Tmp-String-0 != 'foobarbaz') || (Tmp-Integer-0 != 123456789)) {
+if ((&Tmp-String-0 != 'foobarbaz') || (&Tmp-Integer-0 != 123456789)) {
        test_fail
 }
 
 # There should be no Tmp-IP-Address attributes in the request list
-if (Tmp-IP-Address-0 || ("%{Tmp-IP-Address-0[1]}" != '')) {
+if (&Tmp-IP-Address-0 || ("%{Tmp-IP-Address-0[1]}" != '')) {
        test_fail
 }
 
 # But there should still be some in the control list
-if ((control:Tmp-IP-Address-0 != 192.0.2.1) || ("%{control:Tmp-IP-Address-0[1]}" != 192.0.2.3)) {
+if ((&control:Tmp-IP-Address-0 != 192.0.2.1) || ("%{control:Tmp-IP-Address-0[1]}" != 192.0.2.3)) {
+       test_fail
+}
+
+update {
+       &control:Tmp-IP-Address-0 !* ANY
+       &control:Tmp-IP-Address-1 !* ANY
+}
+
+if (&control:Tmp-IP-Address-0 || &control:Tmp-IP-Address-1) {
        test_fail
 }