Add match_attr to rlm_files tests

diff --git a/src/tests/modules/files/module.conf b/src/tests/modules/files/module.conf
index d8e6ea4eb436cdd637fb2ed9ec1301e8331c5c34..c45a3a56a091525b3b27fbc8b74acff80eeef261 100644 (file)
--- 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 4347806f8d34b5a2a669ce815634a9ae19effe1b..7f0b6cf221e727a0c5690ed8f1aabc688c57ada1 100644 (file)
--- 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 68366542b96f16059b97de479d271046b531e391..c4b4774cde08c39a9554e0d94b8587bd0b18112d 100644 (file)
--- 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[*]