Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Avoid JENKINS-49026.
  • Loading branch information
Lucie Votypkova committed Feb 13, 2018
1 parent f7bd422 commit 29b5426
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/test/java/plugins/AbstractAnalysisTest.java
Expand Up @@ -148,6 +148,9 @@ protected DumbSlave createDockerAgent() {
// TODO: we should have two builds so that the numbers are different
@Test @Issue("JENKINS-25501") @WithPlugins("email-ext")
public void should_send_mail_with_expanded_tokens() {
//avoid JENKINS-49026
jenkins.restart();

setUpMailer();

FreeStyleJob job = createFreeStyleJob();
Expand Down Expand Up @@ -197,6 +200,9 @@ private Class<? extends AnalysisSettings> getFreeStyleSettingsFor(final FreeStyl
*/
@Test @Issue("JENKINS-39947") @WithPlugins({"dashboard-view", "nested-view", "cloudbees-folder", "analysis-core@1.87"})
public void should_show_warnings_in_folder() {
//avoid JENKINS-49026
jenkins.restart();

NestedView nested = jenkins.getViews().create(NestedView.class);

DashboardView dashboard = nested.getViews().create(DashboardView.class);
Expand Down Expand Up @@ -230,6 +236,9 @@ public void should_show_warnings_in_folder() {
*/
@Test @WithPlugins("dashboard-view")
public void should_show_warning_totals_in_dashboard_portlet_with_link_to_results() {
//avoid JENKINS-49026
jenkins.restart();

FreeStyleJob job = createFreeStyleJob();

buildJobAndWait(job).shouldSucceed();
Expand Down
4 changes: 4 additions & 0 deletions src/test/java/plugins/AnalysisCollectorPluginTest.java
Expand Up @@ -322,6 +322,8 @@ public void should_set_warnings_count_in_list_view_column() {
@Test @Issue({"JENKINS-39950"}) @WithPlugins({"dashboard-view", "nested-view", "git", "workflow-job", "workflow-cps", "workflow-basic-steps", "workflow-durable-task-step", "workflow-multibranch"})
@WithDocker @WithCredentials(credentialType = WithCredentials.SSH_USERNAME_PRIVATE_KEY, values = {"warnings", "/org/jenkinsci/test/acceptance/docker/fixtures/GitContainer/unsafe"})
public void should_open_links_in_folder_dashboard_and_nested_views() {
//avoid JENKINS-49026
jenkins.restart();
// Given
NestedView nested = jenkins.getViews().create(NestedView.class);

Expand Down Expand Up @@ -402,6 +404,8 @@ private WarningsPerProjectPortlet addWarningsPortlet(DashboardView dashboard) {
*/
@Test @WithPlugins("dashboard-view")
public void should_aggregate_warnings_in_dashboard_portlet() {
//avoid JENKINS-49026
jenkins.restart();
FreeStyleJob job = createFreeStyleJob();
buildSuccessfulJob(job);

Expand Down
3 changes: 3 additions & 0 deletions src/test/java/plugins/CheckStylePluginTest.java
Expand Up @@ -67,6 +67,9 @@ public class CheckStylePluginTest extends AbstractAnalysisTest<CheckStyleAction>
@Test @WithPlugins({"git", "dashboard-view", "analysis-core@1.88-SNAPSHOT"}) @WithDocker @Issue("JENKINS-6748")
@WithCredentials(credentialType = WithCredentials.SSH_USERNAME_PRIVATE_KEY, values = {CREDENTIALS_ID, CREDENTIALS_KEY})
public void should_show_warnings_per_user() {
//avoid JENKINS-49026
jenkins.restart();

DumbSlave agent = createDockerAgent();

String gitRepositoryUrl = createGitRepositoryInDockerContainer();
Expand Down
3 changes: 3 additions & 0 deletions src/test/java/plugins/WarningsPluginTest.java
Expand Up @@ -704,6 +704,9 @@ private void assertThatFilesTabIsCorrectlyFilled(final MatrixProject job) {
// TODO: check if we can remove this test since a similar one in parent
@Test @Issue("25501") @WithPlugins("email-ext")
public void should_send_mail_with_expanded_tokens() {
//avoid JENKINS-49026
jenkins.restart();;

setUpMailer();

FreeStyleJob job = createFreeStyleJob(settings -> {
Expand Down

0 comments on commit 29b5426

Please sign in to comment.