Commit 9b72209f authored by Greg Messner's avatar Greg Messner
Browse files

Added skip of trigger test if no .gitlab-ci.yml file in test project (#341).

parent 10fd8a5f
...@@ -12,6 +12,7 @@ import java.util.stream.Stream; ...@@ -12,6 +12,7 @@ import java.util.stream.Stream;
import org.gitlab4j.api.models.Pipeline; import org.gitlab4j.api.models.Pipeline;
import org.gitlab4j.api.models.PipelineSchedule; import org.gitlab4j.api.models.PipelineSchedule;
import org.gitlab4j.api.models.Project; import org.gitlab4j.api.models.Project;
import org.gitlab4j.api.models.RepositoryFile;
import org.gitlab4j.api.models.Trigger; import org.gitlab4j.api.models.Trigger;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
...@@ -182,6 +183,13 @@ public class TestPipelineApi extends AbstractIntegrationTest { ...@@ -182,6 +183,13 @@ public class TestPipelineApi extends AbstractIntegrationTest {
assertNotNull(testProject); assertNotNull(testProject);
// Skip this test if no .gitlab-ci.yml file is found in the test project
RepositoryFile fileInfo = null;
try {
fileInfo = gitLabApi.getRepositoryFileApi().getFileInfo(testProject, ".gitlab-ci.yml", "master");
} catch (GitLabApiException ignore) {}
assumeNotNull(fileInfo);
String triggerDescription = TRIGGER_DESCRIPTION + " - test triggerPipeline() - " + HelperUtils.getRandomInt(1000); String triggerDescription = TRIGGER_DESCRIPTION + " - test triggerPipeline() - " + HelperUtils.getRandomInt(1000);
Trigger createdTrigger = gitLabApi.getPipelineApi().createPipelineTrigger(testProject, triggerDescription); Trigger createdTrigger = gitLabApi.getPipelineApi().createPipelineTrigger(testProject, triggerDescription);
assertNotNull(createdTrigger); assertNotNull(createdTrigger);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment