提交 b7d4c6a4 编写于 作者: J Jesse Glick

The jenkins_main_trunk job has been retired, so for now just skip these tests...

The jenkins_main_trunk job has been retired, so for now just skip these tests when running on any Jenkins server.
上级 bfaab511
......@@ -141,7 +141,7 @@ public class BuildCommandTest {
}
@Test void consoleOutput() {
Assume.assumeFalse("Started test0 #1", "https://jenkins.ci.cloudbees.com/job/core/job/jenkins_main_trunk/".equals(System.getenv("JOB_URL")))
Assume.assumeFalse("Started test0 #1", System.getenv("JOB_URL") != null);
def p = j.createFreeStyleProject()
def cli = new CLI(j.URL)
try {
......@@ -156,7 +156,7 @@ public class BuildCommandTest {
}
@Test void consoleOutputWhenBuildSchedulingRefused() {
Assume.assumeFalse("Started test0 #1", "https://jenkins.ci.cloudbees.com/job/core/job/jenkins_main_trunk/".equals(System.getenv("JOB_URL")))
Assume.assumeFalse("Started test0 #1", System.getenv("JOB_URL") != null);
def p = j.createFreeStyleProject()
def cli = new CLI(j.URL)
try {
......
......@@ -110,7 +110,7 @@ public class MatrixProjectTest {
*/
@Test
public void testBuildAxisInMaven() throws Exception {
Assume.assumeFalse("Not a v4.0.0 POM. for project org.jvnet.maven-antrun-extended-plugin:maven-antrun-extended-plugin at /home/jenkins/.m2/repository/org/jvnet/maven-antrun-extended-plugin/maven-antrun-extended-plugin/1.40/maven-antrun-extended-plugin-1.40.pom", "https://jenkins.ci.cloudbees.com/job/core/job/jenkins_main_trunk/".equals(System.getenv("JOB_URL")));
Assume.assumeFalse("Not a v4.0.0 POM. for project org.jvnet.maven-antrun-extended-plugin:maven-antrun-extended-plugin at /home/jenkins/.m2/repository/org/jvnet/maven-antrun-extended-plugin/maven-antrun-extended-plugin/1.40/maven-antrun-extended-plugin-1.40.pom", System.getenv("JOB_URL") != null);
MatrixProject p = createMatrixProject();
Maven.MavenInstallation maven = j.configureDefaultMaven();
p.getBuildersList().add(new Maven('-Dprop=${db} validate',maven.getName()));
......
......@@ -44,7 +44,7 @@ public class UpdateCenter2Test {
* Makes sure a plugin installs fine.
*/
@Test void install() {
Assume.assumeFalse("SocketTimeoutException from goTo due to GET http://localhost:…/update-center.json?…", "https://jenkins.ci.cloudbees.com/job/core/job/jenkins_main_trunk/".equals(System.getenv("JOB_URL")))
Assume.assumeFalse("SocketTimeoutException from goTo due to GET http://localhost:…/update-center.json?…", System.getenv("JOB_URL") != null);
UpdateSite.neverUpdate = false;
j.createWebClient().goTo("") // load the metadata
def job = j.jenkins.updateCenter.getPlugin("changelog-history").deploy().get(); // this seems like one of the smallest plugin
......
......@@ -297,7 +297,7 @@ public class FingerprinterTest {
@Bug(18417)
@Test
public void fingerprintCleanup() throws Exception {
Assume.assumeFalse("for p3.upstreamProjects expected:<[hudson.model.FreeStyleProject@590e5b8[test0]]> but was:<[]>", "https://jenkins.ci.cloudbees.com/job/core/job/jenkins_main_trunk/".equals(System.getenv("JOB_URL")));
Assume.assumeFalse("for p3.upstreamProjects expected:<[hudson.model.FreeStyleProject@590e5b8[test0]]> but was:<[]>", System.getenv("JOB_URL") != null);
// file names shouldn't matter
FreeStyleProject p1 = createFreeStyleProjectWithFingerprints(singleContents, singleFiles);
FreeStyleProject p2 = createFreeStyleProjectWithFingerprints(singleContents, singleFiles2);
......
......@@ -77,7 +77,7 @@ public class JUnitResultArchiverTest {
@LocalData
@Test public void slave() throws Exception {
Assume.assumeFalse("TimeoutException from basic", "https://jenkins.ci.cloudbees.com/job/core/job/jenkins_main_trunk/".equals(System.getenv("JOB_URL")));
Assume.assumeFalse("TimeoutException from basic", System.getenv("JOB_URL") != null);
DumbSlave s = j.createOnlineSlave();
project.setAssignedLabel(s.getSelfLabel());
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册