Minor changes in test output with list_as_attr = true

diff --git a/src/tests/unit/condition/base.txt b/src/tests/unit/condition/base.txt
index da3fb2eb6011319288e7b86d9e4a720cc3eaf517..ac43d6c80aadf5caa81d7e9e7e6b3394a63d7518 100644 (file)
--- a/src/tests/unit/condition/base.txt
+++ b/src/tests/unit/condition/base.txt
@@ -600,7 +600,7 @@ match <ipv4prefix>&NAS-IP-Address < 192.168.0.0/24
 #  This is allowed and means "the list is not empty"
 #
 condition (&reply.)
-match &reply
+match &reply.
 
 #
 #  Expansions of environment variables

diff --git a/src/tests/unit/xlat/cond_base.txt b/src/tests/unit/xlat/cond_base.txt
index 258e4c7685876427a3ff55e322913cab83d536e6..041fb6a3cf6666acdae0b8c4dcd9417c7419f731 100644 (file)
--- a/src/tests/unit/xlat/cond_base.txt
+++ b/src/tests/unit/xlat/cond_base.txt
@@ -236,10 +236,8 @@ match (&Session-Timeout == '10')
 # Except for dates, which can be humanly readable!
 # This one is be an expansion, so it's left as-is.
 #
-#  @todo - yuck.  Suppress full path?
-#
 xlat_purify &Event-Timestamp == "January 1, 2012 %{User-Name}"
-match (&Event-Timestamp == %(cast:string "January 1, 2012 %{request[0].User-Name}"))
+match (&Event-Timestamp == %(cast:string "January 1, 2012 %{User-Name}"))
 
 # This one is NOT an expansion, so it's parsed into normal form
 xlat_purify &Event-Timestamp == 'January 1 2012'
@@ -276,9 +274,8 @@ match false
 xlat_purify <ipaddr>127.0.0.1 == %{md4:127.0.0.1}
 match NULL
 
-# @todo - yuck, don't print full path?
 xlat_purify <ipaddr>127.0.0.1 == %{md4: SELECT user FROM table WHERE user='%{User-Name}'}
-match (127.0.0.1 == %{md4: SELECT user FROM table WHERE user='%{request[0].User-Name}'})
+match (127.0.0.1 == %{md4: SELECT user FROM table WHERE user='%{User-Name}'})
 
 xlat_purify <ether> 00:11:22:33:44:55 == "00:11:22:33:44:55"
 match true
@@ -522,7 +519,7 @@ match (&User-Name[n] == "bob")
 #match &Foo-Bar
 
 xlat_purify &Acct-Input-Octets > "%{Session-Timeout}"
-match (&Acct-Input-Octets > %(cast:string "%{request[0].Session-Timeout}"))
+match (&Acct-Input-Octets > %(cast:string "%{Session-Timeout}"))
 
 xlat_purify &Acct-Input-Octets > &Session-Timeout
 match (&Acct-Input-Octets > &Session-Timeout)