From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 5 Sep 2024 17:16:17 +0000 (+0100)
Subject: Add match_attr to rlm_files tests
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84e9cd0e318f2687f82bb70c9172cb660fedafeb;p=thirdparty%2Ffreeradius-server.git

Add match_attr to rlm_files tests
---

diff --git a/src/tests/modules/files/module.conf b/src/tests/modules/files/module.conf
index d8e6ea4eb43..c45a3a56a09 100644
--- a/src/tests/modules/files/module.conf
+++ b/src/tests/modules/files/module.conf
@@ -11,11 +11,13 @@ files {
 files subnet {
 	key = &FreeRADIUS-Client-IP-Prefix
 	filename = $ENV{MODULE_TEST_DIR}/prefix
+	match_attr = &control.FreeRADIUS-Client-IP-Prefix
 }
 
 files subnet2 {
 	key = &FreeRADIUS-Client-IP-Prefix
 	filename = $ENV{MODULE_TEST_DIR}/subnet2
+	match_attr = &control.FreeRADIUS-Client-IP-Prefix
 }
 
 files compound_key {
diff --git a/src/tests/modules/files/prefix.unlang b/src/tests/modules/files/prefix.unlang
index 4347806f8d3..7f0b6cf221e 100644
--- a/src/tests/modules/files/prefix.unlang
+++ b/src/tests/modules/files/prefix.unlang
@@ -4,16 +4,15 @@ subnet
 
 if (&reply.Reply-Message[0] != '10.1/16 subnet') {
 	test_fail
-} else {
-	test_pass
 }
 
 if (&reply.Reply-Message[1] != "2nd 10.1/16 subnet") {
 	test_fail
-} else {
-	test_pass
 }
 
+if (&control.FreeRADIUS-Client-IP-Prefix != 10.1.0.0/16) {
+	test_fail
+}
 
 &FreeRADIUS-Client-IP-Prefix := 10.2.3.4/32
 
@@ -23,8 +22,10 @@ subnet
 
 if (&reply.Reply-Message != "10/8 subnet") {
 	test_fail
-} else {
-	test_pass
+}
+
+if (&control.FreeRADIUS-Client-IP-Prefix != 10.0.0.0/8) {
+	test_fail
 }
 
 &FreeRADIUS-Client-IP-Prefix := 10.1.2.3/32
@@ -39,3 +40,5 @@ subnet
 &reply -= &Reply-Message[*]
 
 subnet
+
+test_pass
diff --git a/src/tests/modules/files/subnet2.unlang b/src/tests/modules/files/subnet2.unlang
index 68366542b96..c4b4774cde0 100644
--- a/src/tests/modules/files/subnet2.unlang
+++ b/src/tests/modules/files/subnet2.unlang
@@ -14,6 +14,10 @@ if (&reply.Reply-Message[2] != "10/8 subnet") {
 	test_fail
 }
 
+if !(&control.FreeRADIUS-Client-IP-Prefix == 10.0.0.0/8) {
+	test_fail
+}
+
 #  Delete previous reply messages
 &reply -= &Reply-Message[*]