Ensures test timeouts don't kill the debugger (#1081)

openzipkin · Feb 13, 2020 · 89c11d7 · 89c11d7
1 parent d19b014
commit 89c11d7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/ITTracingFilter.java b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/ITTracingFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 The OpenZipkin Authors
+ * Copyright 2013-2020 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -26,6 +26,7 @@
 import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Rule;
+import org.junit.rules.DisableOnDebug;
 import org.junit.rules.TestRule;
 import org.junit.rules.TestWatcher;
 import org.junit.rules.Timeout;
@@ -35,7 +36,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class ITTracingFilter {
-  @Rule public Timeout globalTimeout = Timeout.seconds(5); // 5 seconds max per method
+  @Rule public TestRule globalTimeout = new DisableOnDebug(Timeout.seconds(5)); // max per method
 
   /** See brave.http.ITHttp for rationale on using a concurrent blocking queue */
   BlockingQueue<Span> spans = new LinkedBlockingQueue<>();

diff --git a/instrumentation/dubbo/src/test/java/brave/dubbo/ITTracingFilter.java b/instrumentation/dubbo/src/test/java/brave/dubbo/ITTracingFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 The OpenZipkin Authors
+ * Copyright 2013-2020 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -27,6 +27,7 @@
 import org.apache.dubbo.rpc.Filter;
 import org.junit.After;
 import org.junit.Rule;
+import org.junit.rules.DisableOnDebug;
 import org.junit.rules.TestRule;
 import org.junit.rules.TestWatcher;
 import org.junit.rules.Timeout;
@@ -36,7 +37,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class ITTracingFilter {
-  @Rule public Timeout globalTimeout = Timeout.seconds(5); // 5 seconds max per method
+  @Rule public TestRule globalTimeout = new DisableOnDebug(Timeout.seconds(5)); // max per method
 
   /** See brave.http.ITHttp for rationale on using a concurrent blocking queue */
   BlockingQueue<Span> spans = new LinkedBlockingQueue<>();

diff --git a/instrumentation/http-tests/src/main/java/brave/test/http/ITHttp.java b/instrumentation/http-tests/src/main/java/brave/test/http/ITHttp.java
@@ -27,6 +27,7 @@
 import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Rule;
+import org.junit.rules.DisableOnDebug;
 import org.junit.rules.TestRule;
 import org.junit.rules.TestWatcher;
 import org.junit.rules.Timeout;
@@ -97,7 +98,7 @@ public abstract class ITHttp {
    * This way, there's visibility on which method hung without asking the end users to edit build
    * config.
    */
-  @Rule public Timeout globalTimeout = Timeout.seconds(5); // 5 seconds max per method
+  @Rule public TestRule globalTimeout = new DisableOnDebug(Timeout.seconds(5)); // max per method
 
   public static final String EXTRA_KEY = "user-id";