add more tests to check triggers

diff --git a/src/lib/unlang/interpret.c b/src/lib/unlang/interpret.c
index 582c49d008043e76f2702b0fdd19196a05b1e375..31176546b8798b97cfbadd34fc3dd9b8fc7bce43 100644 (file)
--- a/src/lib/unlang/interpret.c
+++ b/src/lib/unlang/interpret.c
@@ -1004,7 +1004,6 @@ CC_HINT(hot) rlm_rcode_t unlang_interpret(request_t *request, bool running)
                         *      Triggers can run modules which pop, and then the stack is empty.
                         */
                        if (unlikely(stack->depth == 0)) {
-                               fr_assert(top_frame);
                                break;
                        }
 

diff --git a/src/tests/modules/test/module.conf b/src/tests/modules/test/module.conf
index 071e8c6b8ded25a19e2dc50558966c9648d002e3..7a04c76793c25346198e1f5bf383aec99d6c580d 100644 (file)
--- a/src/tests/modules/test/module.conf
+++ b/src/tests/modules/test/module.conf
@@ -1,2 +1,6 @@
 test {
 }
+
+linelog log_stdout {
+       destination = stdout
+}

diff --git a/src/tests/modules/test/trigger.unlang b/src/tests/modules/test/trigger.unlang
index 7187b0b6c564731ec18b99520dade6abf07447ee..8d347de6b938b80783007c0eadb6e26ba842998b 100644 (file)
--- a/src/tests/modules/test/trigger.unlang
+++ b/src/tests/modules/test/trigger.unlang
@@ -2,4 +2,12 @@ if !%test_trigger('test') {
        test_fail
 }
 
+if !%test_trigger('test_log') {
+    test_fail
+}
+
+if !%test_trigger('server.start') {
+    test_fail
+}
+
 test_pass

diff --git a/src/tests/modules/test/triggers.conf b/src/tests/modules/test/triggers.conf
index 580474259f094907f4bb30fac67331f74ecdb412..f358efd10a9347349940d0a7cf0e68e073211683 100644 (file)
--- a/src/tests/modules/test/triggers.conf
+++ b/src/tests/modules/test/triggers.conf
@@ -1,3 +1,10 @@
 trigger {
        test = `/bin/echo hello`
+
+
+       test_log = %log_stdout('hello')
+
+       server {
+               start = %log_stdout('server start')
+       }
 }