Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JENKINS-43746 Update step heading to include selected parallel and live duration #1211

Merged
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

fix ATH tests

  • Loading branch information
NicuPascu committed Oct 19, 2017
commit 1317f7334815931f332e3b2d30bea1834331905f
@@ -54,14 +54,12 @@ protected String getJenkinsUrl() {
jenkinsUrl = jenkinsUrl.replace("127.0.0.1", host);
jenkinsUrl = jenkinsUrl.replace("localhost", host);
} else {
try {
String ip = InetAddress.getLocalHost().getHostAddress();

String ip = "172.17.0.1";
jenkinsUrl = jenkinsUrl.replace("127.0.0.1", ip);
jenkinsUrl = jenkinsUrl.replace("localhost", ip);

} catch (UnknownHostException e) {

}

}

return jenkinsUrl;
@@ -57,11 +57,11 @@ public void parallelNavigationTest () throws IOException, GitAPIException, Inter
pipeline.getRunDetailsPipelinePage().open(1);

// at first we see branch one
wait.until(By.xpath("//*[text()=\"Steps firstBranch\"]"));
wait.until(By.xpath("//*[text()=\"firstBranch\"]"));

// and clicking on the unselected node will yield us the second branch
wait.until(By.xpath("//*[contains(@class, 'pipeline-node')][3]")).click();
wait.until(By.xpath("//*[text()=\"Steps secondBranch\"]"));
wait.until(By.xpath("//*[text()=\"secondBranch\"]"));

pipeline.stopAllRuns();
}
@@ -85,12 +85,12 @@ public void parallelNavigationTestInput () throws IOException, GitAPIException,
pipeline.getRunDetailsPipelinePage().open(1);

// at first we see branch one
wait.until(By.xpath("//*[text()=\"Steps firstBranch\"]"));
wait.until(By.xpath("//*[text()=\"firstBranch\"]"));
wait.until(By.cssSelector(".btn.inputStepSubmit")).click();

// and clicking on the unselected node will yield us the second branch
wait.until(By.xpath("//*[contains(@class, 'pipeline-node')][3]")).click();
wait.until(By.xpath("//*[text()=\"Steps secondBranch\"]"));
wait.until(By.xpath("//*[text()=\"secondBranch\"]"));
wait.until(By.cssSelector(".btn.inputStepSubmit")).click();
}

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.