add RPEDEBUG wehn failing assigment and update tests

diff --git a/src/lib/unlang/edit.c b/src/lib/unlang/edit.c
index b56f0303228a32ad98c7c0979daf4b9eddb302c0..7094a5129e17d129f88a8440b455c59b6d7ff54b 100644 (file)
--- a/src/lib/unlang/edit.c
+++ b/src/lib/unlang/edit.c
@@ -651,6 +651,7 @@ static int apply_edits_to_leaf(request_t *request, unlang_frame_state_edit_t *st
                                                       map->op,
                                                       box) < 0) {
                fail:
+                       RPEDEBUG("Assigning value to %s failed", map->lhs->name);
                        if (pair) tmpl_dcursor_clear(&cc);
                        return -1;
                }

diff --git a/src/tests/keywords/cast-ipaddr b/src/tests/keywords/cast-ipaddr
index 250fac36e6173aeae30a854e64e4af844f0629e8..3c6d1a315500165911376a967c4b2dc65d358609 100644 (file)
--- a/src/tests/keywords/cast-ipaddr
+++ b/src/tests/keywords/cast-ipaddr
@@ -135,7 +135,7 @@ redundant {
                fail
        }
        group {
-               if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipv6addr" failed: Invalid cast from ipv6prefix to ipv6addr.  Only /128 (not /32) prefixes may be cast to IP address types') {
+               if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-IPv6Addr failed: Invalid cast from ipv6prefix to ipv6addr.  Only /128 (not /32) prefixes may be cast to IP address types') {
                        test_fail
                }
                &request -= &Module-Failure-Message[*]
@@ -152,7 +152,7 @@ redundant {
                fail
        }
        group {
-               if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipaddr" failed: Invalid cast from ipv6prefix to ipaddr.  Only /128 (not /64) prefixes may be cast to IP address types') {
+               if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-Ipaddr failed: Invalid cast from ipv6prefix to ipaddr.  Only /128 (not /64) prefixes may be cast to IP address types') {
                        test_fail
                }
                &request -= &Module-Failure-Message[*]
@@ -165,11 +165,11 @@ redundant {
 #
 redundant {
        group {
-               &control.Tmp-Cast-Ipv4Prefix := &Tmp-Cast-IPv6Prefix[2]
+               &control.Tmp-Cast-Ipv4prefix := &Tmp-Cast-IPv6Prefix[2]
                fail
        }
        group {
-               if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipv4prefix" failed: Invalid cast from ipv6prefix to ipv4prefix.  No IPv4-IPv6 mapping prefix') {
+               if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-Ipv4prefix failed: Invalid cast from ipv6prefix to ipv4prefix.  No IPv4-IPv6 mapping prefix') {
                        test_fail
                }
                &request -= &Module-Failure-Message[*]
@@ -186,7 +186,7 @@ redundant {
                fail
        }
        group {
-               if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipv6addr" failed: Invalid cast from ipv4prefix to ipv6addr.  Only /32 (not /24) prefixes may be cast to IP address types') {
+               if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-IPv6Addr failed: Invalid cast from ipv4prefix to ipv6addr.  Only /32 (not /24) prefixes may be cast to IP address types') {
                        test_fail
                }
                &request -= &Module-Failure-Message[*]
@@ -203,7 +203,7 @@ redundant {
                fail
        }
        group {
-               if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipaddr" failed: Invalid cast from ipv4prefix to ipaddr.  Only /32 (not 24/) prefixes may be cast to IP address types') {
+               if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-Ipaddr failed: Invalid cast from ipv4prefix to ipaddr.  Only /32 (not 24/) prefixes may be cast to IP address types') {
                        test_fail
                }
                &request -= &Module-Failure-Message[*]
@@ -220,7 +220,7 @@ redundant {
                fail
        }
        group {
-               if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipaddr" failed: Invalid cast from ipv6prefix to ipaddr.  Only /128 (not /32) prefixes may be cast to IP address types') {
+               if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-Ipaddr failed: Invalid cast from ipv6prefix to ipaddr.  Only /128 (not /32) prefixes may be cast to IP address types') {
                        test_fail
                }
                &request -= &Module-Failure-Message[*]
@@ -233,11 +233,11 @@ redundant {
 #
 redundant {
        group {
-               &control.Tmp-Cast-IPv4Prefix := &Tmp-Cast-IPv6Prefix[0]
+               &control.Tmp-Cast-IPv4prefix := &Tmp-Cast-IPv6Prefix[0]
                fail
        }
        group {
-               if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipv4prefix" failed: Invalid cast from ipv6prefix to ipv4prefix.  No IPv4-IPv6 mapping prefix') {
+               if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-IPv4prefix failed: Invalid cast from ipv6prefix to ipv4prefix.  No IPv4-IPv6 mapping prefix') {
                        test_fail
                }
                &request -= &Module-Failure-Message[*]
@@ -254,7 +254,7 @@ redundant {
                fail
        }
        group {
-               if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipaddr" failed: Invalid cast from ipv6addr to ipaddr.  No IPv4-IPv6 mapping prefix') {
+               if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-Ipaddr failed: Invalid cast from ipv6addr to ipaddr.  No IPv4-IPv6 mapping prefix') {
                        test_fail
                }
                &request -= &Module-Failure-Message[*]
@@ -267,11 +267,11 @@ redundant {
 #
 redundant {
        group {
-               &control.Tmp-Cast-IPv4Prefix := &Tmp-Cast-IPv6Addr[0]
+               &control.Tmp-Cast-IPv4prefix := &Tmp-Cast-IPv6Addr[0]
                fail
        }
        group {
-               if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipv4prefix" failed: Invalid cast from ipv6addr to ipv4prefix.  No IPv4-IPv6 mapping prefix') {
+               if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-IPv4prefix failed: Invalid cast from ipv6addr to ipv4prefix.  No IPv4-IPv6 mapping prefix') {
                        test_fail
                }
                &request -= &Module-Failure-Message[*]