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

Fix 'join' keyword test

now that unit_test_module creates Net.*. the test output has
changed.  So we update the test.
---

diff --git a/src/tests/keywords/join b/src/tests/keywords/join
index 8b37bfe2b1b..796549be398 100644
--- a/src/tests/keywords/join
+++ b/src/tests/keywords/join
@@ -1,15 +1,20 @@
 #
 # PRE: if concat
 #
-&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
 }
 
-&control.Tmp-IP-Address-0 := 192.168.1.254
+&request.Tmp-IP-Address-0 := 192.168.1.254
+
+debug_control
+debug_request
 
 #
 #  Don't insert this string into the request list, because we're getting its value
@@ -23,14 +28,14 @@
 #
 #  @todo - fix this...
 #
-&control.Tmp-String-1 := "%(concat:%(join:%{request.[*]} %{control.Tmp-IP-Address-0}) '. ')"
+&control.Tmp-String-1 := "%(concat:%(join:%{control.[*]} %{request.Tmp-IP-Address-0}) '. ')"
 
 if (!(&control.Tmp-String-1 == "bob. hello. ab c. de fg. 123. 192.168.1.254")) {
 	test_fail
 }
 
-&Tmp-String-2 := "%(concat:%(join:%{Tmp-String-0[*]} %{Tmp-Integer-0}) ,)"
-if (!(&Tmp-String-2 == "ab c,de fg,123")) {
+&control.Tmp-String-2 := "%(concat:%(join:%{control.Tmp-String-0[*]} %{control.Tmp-Integer-0}) ,)"
+if (!(&control.Tmp-String-2 == "ab c,de fg,123")) {
 	test_fail
 }