diff --git a/testing/src/main/java/io/grpc/testing/GrpcCleanupRule.java b/testing/src/main/java/io/grpc/testing/GrpcCleanupRule.java index 329d051ceb3..47a3416d4d3 100644 --- a/testing/src/main/java/io/grpc/testing/GrpcCleanupRule.java +++ b/testing/src/main/java/io/grpc/testing/GrpcCleanupRule.java @@ -149,6 +149,7 @@ public Statement apply(final Statement base, Description description) { return new Statement() { @Override public void evaluate() throws Throwable { + firstException = null; try { base.evaluate(); } catch (Throwable t) { @@ -175,6 +176,7 @@ public void evaluate() throws Throwable { * Releases all the registered resources. */ private void teardown() { + stopwatch.reset(); stopwatch.start(); if (firstException == null) {