From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 21 Nov 2017 19:18:48 +0000 (+0000)
Subject: Test the rlm_delay cancellation point works
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fa67d461ffb41f13346d67e27c205ffd5700be7;p=thirdparty%2Ffreeradius-server.git

Test the rlm_delay cancellation point works
---

diff --git a/src/tests/keywords/parallel-cancellation b/src/tests/keywords/parallel-cancellation
new file mode 100644
index 00000000000..a2218a850ac
--- /dev/null
+++ b/src/tests/keywords/parallel-cancellation
@@ -0,0 +1,20 @@
+#
+#  PRE: parallel
+#
+
+group {
+	parallel {
+		delay_10s	# If the test appears to hang for 10 seconds it's broken
+		fail		# Should cancel the timer
+	}
+
+	actions {
+		fail = 1
+	}
+}
+
+if (!fail) {
+	test_fail
+}
+
+success
diff --git a/src/tests/keywords/parallel-yield b/src/tests/keywords/parallel-yield
index 505ca82b1ca..bac74286f92 100644
--- a/src/tests/keywords/parallel-yield
+++ b/src/tests/keywords/parallel-yield
@@ -4,7 +4,7 @@
 
 # Ensure if one module yields, the rest execute
 parallel {
-	delay
+	reschedule
 	update request {
 		Tmp-String-0 := 'foo'
 	}
diff --git a/src/tests/keywords/unit_test_module.conf b/src/tests/keywords/unit_test_module.conf
index 0fc985bf2a4..33a420ff090 100644
--- a/src/tests/keywords/unit_test_module.conf
+++ b/src/tests/keywords/unit_test_module.conf
@@ -20,10 +20,14 @@ modules {
 
 	$INCLUDE ${raddb}/mods-enabled/expr
 
-	delay {
+	delay reschedule {
 		force_reschedule = yes
 	}
 
+	delay delay_10s {
+		delay = 10
+	}
+
 	test {
 
 	}