From 9479a50784331750b894ab41711d2c5502a47fd7 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 23 Nov 2015 21:37:22 +0100
Subject: [PATCH] bdd: Add a timeout to redirect-later with -1 delay.

---
 tests/integration/webserver_sub.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/integration/webserver_sub.py b/tests/integration/webserver_sub.py
index 21b6a9dca..44b784bc9 100644
--- a/tests/integration/webserver_sub.py
+++ b/tests/integration/webserver_sub.py
@@ -61,7 +61,8 @@ def redirect_later():
     delay = int(args.get('delay', '1'))
     if delay == -1:
         _redirect_later_event = threading.Event()
-        _redirect_later_event.wait()
+        ok = _redirect_later_event.wait(timeout=30 * 1000)
+        assert ok
         _redirect_later_event = None
     else:
         time.sleep(delay)