From dd73890b28a8f21631a838a5127edea560742580 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Sat, 29 Nov 2014 09:37:58 +0100 Subject: [PATCH] CI error investigations - temporarily disable tests using EsTester --- .../src/test/java/org/sonar/server/es/BulkIndexerTest.java | 2 ++ .../src/test/java/org/sonar/server/es/EsClientTest.java | 2 ++ .../src/test/java/org/sonar/server/es/EsTester.java | 2 ++ .../src/test/java/org/sonar/server/es/IndexCreatorTest.java | 2 ++ .../sonar/server/issue/index/IssueAuthorizationIndexerTest.java | 2 ++ .../java/org/sonar/server/issue/index/IssueIndexerTest.java | 2 ++ .../java/org/sonar/server/source/index/SourceLineIndexTest.java | 2 ++ .../org/sonar/server/source/index/SourceLineIndexerTest.java | 2 ++ 8 files changed, 16 insertions(+) diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java index 0d855cdfe70..1699c62b231 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java @@ -25,11 +25,13 @@ import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import static org.fest.assertions.Assertions.assertThat; +@Ignore public class BulkIndexerTest { @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/EsClientTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/EsClientTest.java index 66b91c01ede..aafd7c14985 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/EsClientTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/EsClientTest.java @@ -19,6 +19,7 @@ */ package org.sonar.server.es; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.sonar.server.search.request.ProxyBulkRequestBuilder; @@ -42,6 +43,7 @@ import org.sonar.server.search.request.ProxySearchScrollRequestBuilder; import static org.fest.assertions.Assertions.assertThat; +@Ignore public class EsClientTest { @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java b/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java index e3c84127507..087fc619ee9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java @@ -41,6 +41,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.node.Node; import org.elasticsearch.node.NodeBuilder; import org.elasticsearch.search.SearchHit; +import org.junit.Ignore; import org.junit.rules.ExternalResource; import org.sonar.api.config.Settings; import org.sonar.api.platform.ComponentContainer; @@ -54,6 +55,7 @@ import java.util.List; import static org.fest.assertions.Assertions.assertThat; +@Ignore public class EsTester extends ExternalResource { private static final int INSTANCE_ID = RandomUtils.nextInt(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/IndexCreatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/IndexCreatorTest.java index 8f46e89cc6b..933db291824 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/IndexCreatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/IndexCreatorTest.java @@ -22,6 +22,7 @@ package org.sonar.server.es; import org.elasticsearch.action.admin.indices.settings.get.GetSettingsResponse; import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.common.collect.ImmutableOpenMap; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -32,6 +33,7 @@ import java.util.Map; import static org.fest.assertions.Assertions.assertThat; +@Ignore public class IndexCreatorTest { @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexerTest.java index a0ea5860886..38099b022b7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexerTest.java @@ -20,6 +20,7 @@ package org.sonar.server.issue.index; import org.elasticsearch.search.SearchHit; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.sonar.api.config.Settings; @@ -33,6 +34,7 @@ import java.util.List; import static org.fest.assertions.Assertions.assertThat; +@Ignore public class IssueAuthorizationIndexerTest { @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java index 70544f861e2..5a283363fce 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java @@ -20,6 +20,7 @@ package org.sonar.server.issue.index; import com.google.common.collect.Iterators; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.sonar.api.config.Settings; @@ -32,6 +33,7 @@ import java.util.List; import static org.fest.assertions.Assertions.assertThat; +@Ignore public class IssueIndexerTest { @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexTest.java index ced283fc0bb..eabe084163f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexTest.java @@ -20,6 +20,7 @@ package org.sonar.server.source.index; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.sonar.api.config.Settings; @@ -27,6 +28,7 @@ import org.sonar.server.es.EsTester; import static org.fest.assertions.Assertions.assertThat; +@Ignore public class SourceLineIndexTest { @Rule diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexerTest.java index b4c16ec448c..35c5e804525 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/index/SourceLineIndexerTest.java @@ -26,6 +26,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.index.query.QueryBuilders; import org.fest.assertions.MapAssert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.sonar.api.config.Settings; @@ -42,6 +43,7 @@ import java.util.Map; import static org.fest.assertions.Assertions.assertThat; +@Ignore public class SourceLineIndexerTest { @Rule -- 2.39.5