Merge pull request #2335 from jkeys089/fix-retry-with-setup

fix retry with setup

Author: ptrthomas

karate-core/src/main/java/com/intuit/karate/Suite.java

@@ -34,6 +34,7 @@
 import com.intuit.karate.core.ScenarioCall;
 import com.intuit.karate.core.ScenarioResult;
 import com.intuit.karate.core.ScenarioRuntime;
+import com.intuit.karate.core.Step;
 import com.intuit.karate.core.SyncExecutorService;
 import com.intuit.karate.core.Tags;
 import com.intuit.karate.http.HttpClientFactory;
@@ -55,9 +56,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.slf4j.LoggerFactory;
 
+import static java.util.function.Predicate.not;
+
 /**
  *
  * @author pthomas3
@@ -341,6 +345,8 @@ public Stream<ScenarioResult> getScenarioResults() {
     }
 
     public ScenarioResult retryScenario(Scenario scenario) {
+        // remove any "fake" steps that might have been added before retrying
+        scenario.setSteps(scenario.getSteps().stream().filter(not(Step::isFake)).collect(Collectors.toList()));
         FeatureRuntime fr = FeatureRuntime.of(this, new FeatureCall(scenario.getFeature()));
         ScenarioRuntime runtime = new ScenarioRuntime(fr, scenario);
         runtime.run();

karate-core/src/main/java/com/intuit/karate/core/Step.java

@@ -223,6 +223,10 @@ public void setComments(List<String> comments) {
         this.comments = comments;
     }
 
+    public boolean isFake() {
+        return getIndex() == -1;
+    }
+
     @Override
     public String toString() {
         String temp = prefix + " " + text;

karate-core/src/test/java/com/intuit/karate/core/retry/RetryTest.java

@@ -36,6 +36,22 @@ void testParallel() {
         assertFalse(sr.isFailed());
         results = results.getSuite().updateResults(sr);
         assertEquals(0, results.getFailCount());
-    }    
+    }
+
+    @Test
+    void testSetup() {
+        System.setProperty("CURRENT_VALUE", "a");
+        Results results = Runner.path("classpath:com/intuit/karate/core/retry/retry-with-setup.feature").parallel(1);
+
+        System.setProperty("CURRENT_VALUE", "b");
+        for (ScenarioResult scenarioResult : results.getScenarioResults().collect(Collectors.toList())) {
+            if (scenarioResult.isFailed()) {
+                ScenarioResult retryScenarioResult = results.getSuite().retryScenario(scenarioResult.getScenario());
+                results = results.getSuite().updateResults(retryScenarioResult);
+            }
+        }
+
+        assertEquals(0, results.getFailCount(), results.getErrorMessages());
+    }
 
 }

karate-core/src/test/java/com/intuit/karate/core/retry/retry-with-setup.feature

@@ -0,0 +1,12 @@
+Feature: Retry with setup
+
+  @setup
+  Scenario: Setup
+    * def data = [{ value: 'b' }, { value: 'a' }]
+
+  Scenario Outline: Scenario
+    * def currentValGetter = function () { return java.lang.System.getProperty('CURRENT_VALUE') }
+    * assert currentValGetter() == value
+
+    Examples:
+      | karate.setup().data |