these tests don't have to be Packet-Src-*

diff --git a/src/tests/unit/condition/ip.txt b/src/tests/unit/condition/ip.txt
index e4ef0bb714dd1054cc040d576c23c33468c43132..7c82417e5b60c0bd9f05598ace128b8c99b9b8da 100644 (file)
--- a/src/tests/unit/condition/ip.txt
+++ b/src/tests/unit/condition/ip.txt
@@ -7,11 +7,11 @@
 proto-dictionary radius
 
 # Check wildcards are OK
-condition &Packet-Src-IPv6-Address == ::
-match (&Packet-Src-IPv6-Address == ::)
+condition &NAS-IPv6-Address == ::
+match (&NAS-IPv6-Address == ::)
 
-condition &Packet-Src-IP-Address == <ipaddr>*
-match (&Packet-Src-IP-Address == 0.0.0.0)
+condition &NAS-IP-Address == <ipaddr>*
+match (&NAS-IP-Address == 0.0.0.0)
 
-condition &Packet-Src-IP-Address == 0.0.0.0
-match (&Packet-Src-IP-Address == 0.0.0.0)
+condition &NAS-IP-Address == 0.0.0.0
+match (&NAS-IP-Address == 0.0.0.0)

diff --git a/src/tests/unit/xlat/base.txt b/src/tests/unit/xlat/base.txt
index 7dabd4d7cac27bde4ee8b3bd646bcd9794dbdec9..571f9a2826b2543b71ae11a59d373b6d7244e390 100644 (file)
--- a/src/tests/unit/xlat/base.txt
+++ b/src/tests/unit/xlat/base.txt
@@ -144,10 +144,8 @@ match ERROR offset 15: Missing closing brace
 xlat \"%t\tfoo\"
 match \"%t\tfoo\"
 
-allow-unresolved yes
-xlat \"%t\t%{Packet-Src-IP-Address}\"
-match \"%t\t%{Packet-Src-IP-Address}\"
-allow-unresolved no
+xlat \"%t\t%{NAS-IP-Address}\"
+match \"%t\t%{NAS-IP-Address}\"
 
 xlat \"foo %{test:foo}\"
 match \"foo %{test:foo}\"
@@ -349,4 +347,4 @@ xlat %{md5:'arg"'}
 match %{md5:'arg"'}
 
 count
-match 201
+match 199