testing: fix GrpcCleanupRule issue when retrying tests (grpc#8918)

laurentgo · web-flow · commit bfb970ce031e · 2022-02-15T12:52:24.000-08:00
Fix an issue in GrpcCleanupRule when tests are retried and the teardown() method is invoked multiple times, causing Stopwatch instance to throw an IllegalStateException. fixes grpc#8917.
diff --git 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) {
