Merge pull request #656 from azinneera/scenario-names

Fix duplicated test scenarios
wso2 · Apr 6, 2018 · 43597bb · 43597bb
2 parents c20c171 + 137fde3
commit 43597bb
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/core/src/main/java/org/wso2/testgrid/core/TestPlanExecutor.java b/core/src/main/java/org/wso2/testgrid/core/TestPlanExecutor.java
@@ -115,7 +115,16 @@ public void execute(TestPlan testPlan, InfrastructureConfig infrastructureConfig
  * @param deploymentCreationResult the result of the previous build step
  */
  private void runScenarioTests(TestPlan testPlan, DeploymentCreationResult deploymentCreationResult) {
+
+ /* Set dir for scenarios from values matched from test-plan yaml file */
  for (TestScenario testScenario : testPlan.getScenarioConfig().getScenarios()) {
+ for (TestScenario testScenario1 : testPlan.getTestScenarios()) {
+ if (testScenario.getName().equals(testScenario1.getName())) {
+ testScenario1.setDir(testScenario.getDir());
+ }
+ }
+ }
+ for (TestScenario testScenario : testPlan.getTestScenarios()) {
  try {
  scenarioExecutor.execute(testScenario, deploymentCreationResult, testPlan);
  } catch (Exception e) {