Merge pull request #22995 from vespa-engine/bjorncs/stabilize-json-test

Add timeout to JsonRenderer test MERGEOK

1 files changed, 5 insertions, 0 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
index 4a1ab693151..118dcee9598 100644
--- a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
@@ -56,7 +56,9 @@ import com.yahoo.text.Utf8;
 import com.yahoo.yolean.Exceptions;
 import com.yahoo.yolean.trace.TraceNode;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.Timeout;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -82,6 +84,9 @@ public class JsonRendererTestCase {
 
     private static final ObjectMapper jsonMapper = new ObjectMapper();
 
+    @Rule
+    public Timeout globalTimeout = Timeout.seconds(300);
+
     private final JsonRenderer originalRenderer;
     private JsonRenderer renderer;