From: Jorge Pereira <jpereira@freeradius.org>
Date: Fri, 1 Sep 2023 19:13:51 +0000 (-0300)
Subject: Fix 'concat' keyword test
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61ed33a88102a6f4025b93cf574ae4ea77fec550;p=thirdparty%2Ffreeradius-server.git

Fix 'concat' keyword test
---

diff --git a/src/tests/keywords/concat b/src/tests/keywords/concat
index 5b38669cd25..5c5fd023950 100644
--- a/src/tests/keywords/concat
+++ b/src/tests/keywords/concat
@@ -3,9 +3,11 @@
 #
 
 # this fails, so the next edit is merged in and fails, too.
-&request -= &Packet-Type
+&control -= &Password
 
-&request += {
+&control += {
+	&User-Name = &request.User-Name
+	&User-Password = &request.User-Password
 	&Tmp-String-0 = "ab c"
 	&Tmp-String-0 = "de fg"
 	&Tmp-Integer-0 = 123
@@ -13,46 +15,47 @@
 
 ok	# separate updates
 
-&request += {
-	&Tmp-String-1 = "%(concat:%{request.[*]} ', ')"
+&control += {
+	&Tmp-String-1 = "%(concat:%{control.[*]} ', ')"
 }
 
-if (!(&Tmp-String-1 == "bob, hello, ab c, de fg, 123")) {
+"%{control.Tmp-String-1}"
+if (!(&control.Tmp-String-1 == "bob, hello, ab c, de fg, 123")) {
 	test_fail
 }
 
-&request += {
-	&Tmp-String-2 = "%(concat:%{Tmp-String-0[*]} ', ')"
+&control += {
+	&Tmp-String-2 = "%(concat:%{control.Tmp-String-0[*]} ', ')"
 }
 
-if (!(&Tmp-String-2 == "ab c, de fg")) {
+if (!(&control.Tmp-String-2 == "ab c, de fg")) {
 	test_fail
 }
 
 # Empty separator
-&request += {
-	&Tmp-String-3 = "%(concat:%{Tmp-String-0[*]})"
+&control += {
+	&Tmp-String-3 = "%(concat:%{control.Tmp-String-0[*]})"
 }
 
-if (!(&Tmp-String-3 == "ab cde fg")) {
+if (!(&control.Tmp-String-3 == "ab cde fg")) {
 	test_fail
 }
 
 # Single character separator
-&request += {
-	&Tmp-String-4 = "%(concat:%{Tmp-String-0[*]} ,)"
+&control += {
+	&Tmp-String-4 = "%(concat:%{control.Tmp-String-0[*]} ,)"
 }
 
-if (!(&Tmp-String-4 == "ab c,de fg")) {
+if (!(&control.Tmp-String-4 == "ab c,de fg")) {
 	test_fail
 }
 
 # Multi character separator not delimited
-&request += {
-	&Tmp-String-5 = "%(concat:%{Tmp-String-0[*]} |-)"
+&control += {
+	&Tmp-String-5 = "%(concat:%{control.Tmp-String-0[*]} |-)"
 }
 
-if !(&Tmp-String-5 == "ab c|-de fg") {
+if !(&control.Tmp-String-5 == "ab c|-de fg") {
 	test_fail
 }