Attribute not found errors are consistent regardsless of having list specifier

now that the tokenizing parent is consistent in the two cases.

diff --git a/src/tests/unit/condition/base.txt b/src/tests/unit/condition/base.txt
index a6b6e96382b5379eb5bb8e63430c03ff9e5553b1..97e6773b0807f4fe083a5c1c724e4f80fd9787ca 100644 (file)
--- a/src/tests/unit/condition/base.txt
+++ b/src/tests/unit/condition/base.txt
@@ -543,14 +543,14 @@ match ERROR offset 10: Invalid array index '-1'
 #  @todo - bare word - this is likely treating the LHS as an enum which is impossible here
 #
 condition request.Foo == 'request.Foo'
-match ERROR offset 8: Attribute 'Foo' not found in namespace 'internal': Unresolved attributes are not allowed here
+match ERROR offset 8: Attribute 'Foo' not found.  Searched in: RADIUS, internal: Unresolved attributes are not allowed here
 
 # Bareword compared with bareword is true
 condition request.Foo+Bar == request.Foo+Bar
-match ERROR offset 8: Attribute 'Foo' not found in namespace 'internal': Unresolved attributes are not allowed here
+match ERROR offset 8: Attribute 'Foo' not found.  Searched in: RADIUS, internal: Unresolved attributes are not allowed here
 
 condition request.Foo+Bar == 'request.Foo+Bar'
-match ERROR offset 8: Attribute 'Foo' not found in namespace 'internal': Unresolved attributes are not allowed here
+match ERROR offset 8: Attribute 'Foo' not found.  Searched in: RADIUS, internal: Unresolved attributes are not allowed here
 
 condition request.User-Name+User-Password == 'request.Foo+Bar'
 match ((request.User-Name + User-Password) == 'request.Foo+Bar')
@@ -559,7 +559,7 @@ match ((request.User-Name + User-Password) == 'request.Foo+Bar')
 #  @todo - bare word - this is wrong
 #
 condition 'request.Foo+d' == request.Foo+Bar
-match ERROR offset 27: Attribute 'Foo' not found in namespace 'internal': Unresolved attributes are not allowed here
+match ERROR offset 27: Attribute 'Foo' not found.  Searched in: RADIUS, internal: Unresolved attributes are not allowed here
 
 #  Attribute tags are not allowed for unknown attributes
 condition request.Tunnel-Password:0 == 0

diff --git a/src/tests/unit/purify/cond_base.txt b/src/tests/unit/purify/cond_base.txt
index 1770e4d8f999568c417ece0f4d642233a01dc373..7a44fb894293988d247a7054fe9b86015fd26b1c 100644 (file)
--- a/src/tests/unit/purify/cond_base.txt
+++ b/src/tests/unit/purify/cond_base.txt
@@ -552,10 +552,10 @@ match ERROR offset 10: Invalid array index '-1'
 #  attributes MUST be prefixed with '&'.
 #
 xlat_purify_cond request.Foo == 'request.Foo'
-match ERROR offset 8: Attribute 'Foo' not found in namespace 'internal': Unresolved attributes are not allowed here
+match ERROR offset 8: Attribute 'Foo' not found.  Searched in: RADIUS, internal: Unresolved attributes are not allowed here
 
 xlat_purify_cond request.Foo == 'request.Foo'
-match ERROR offset 8: Attribute 'Foo' not found in namespace 'internal': Unresolved attributes are not allowed here
+match ERROR offset 8: Attribute 'Foo' not found.  Searched in: RADIUS, internal: Unresolved attributes are not allowed here
 #match ERROR offset 10: Attribute 'Foo' not found.  Searched in: RADIUS, internal: Unresolved attributes are not allowed here
 
 xlat_purify_cond not-a-list.User-Name == not-a-list.User-Name