summaryrefslogtreecommitdiffstats
path: root/vespa-http-client
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2019-09-02 14:13:23 +0200
committerJon Marius Venstad <venstad@gmail.com>2019-09-02 14:13:23 +0200
commiteef0d69c220a89f212ccda25048a76a72db24954 (patch)
treea2485238d461760487b65d60cc4be6ce5f52acfc /vespa-http-client
parentf9797f71b12545d8474863551899f8fdefb39cdc (diff)
Don't never run tests
Diffstat (limited to 'vespa-http-client')
-rw-r--r--vespa-http-client/src/test/java/com/yahoo/vespa/http/client/QueueBoundsTest.java2
-rw-r--r--vespa-http-client/src/test/java/com/yahoo/vespa/http/client/TestOnCiBuildingSystemOnly.java15
-rw-r--r--vespa-http-client/src/test/java/com/yahoo/vespa/http/client/V3HttpAPIMultiClusterTest.java2
-rw-r--r--vespa-http-client/src/test/java/com/yahoo/vespa/http/client/V3HttpAPITest.java2
4 files changed, 3 insertions, 18 deletions
diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/QueueBoundsTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/QueueBoundsTest.java
index 08c9299dcde..528d6a71c2d 100644
--- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/QueueBoundsTest.java
+++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/QueueBoundsTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.fail;
* @author Einar M R Rosenvinge
*/
@SuppressWarnings("deprecation")
-public class QueueBoundsTest extends TestOnCiBuildingSystemOnly {
+public class QueueBoundsTest {
public static final List<TestDocument> documents;
diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/TestOnCiBuildingSystemOnly.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/TestOnCiBuildingSystemOnly.java
deleted file mode 100644
index 44e0d723f7c..00000000000
--- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/TestOnCiBuildingSystemOnly.java
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.http.client;
-
-import org.junit.Before;
-
-
-public class TestOnCiBuildingSystemOnly {
- private static final String CI_BUILD_SYSTEN_ENV = "CI";
- private static final String CI_BUILD_SYSTEM_ENABLED_VALUE = "true";
-
- @Before
- public void beforeMethod() {
- org.junit.Assume.assumeTrue(CI_BUILD_SYSTEM_ENABLED_VALUE.equals(System.getenv(CI_BUILD_SYSTEN_ENV)));
- }
-}
diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/V3HttpAPIMultiClusterTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/V3HttpAPIMultiClusterTest.java
index 8c4b24f74c2..4edd731136b 100644
--- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/V3HttpAPIMultiClusterTest.java
+++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/V3HttpAPIMultiClusterTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.fail;
* @author Einar M R Rosenvinge
*/
@SuppressWarnings("deprecation")
-public class V3HttpAPIMultiClusterTest extends TestOnCiBuildingSystemOnly {
+public class V3HttpAPIMultiClusterTest {
private void writeDocuments(Session session) throws IOException {
TestUtils.writeDocuments(session, documents);
diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/V3HttpAPITest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/V3HttpAPITest.java
index ad54bbc6a90..cd8d9f26b07 100644
--- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/V3HttpAPITest.java
+++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/V3HttpAPITest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertThat;
* @author Einar M R Rosenvinge
*/
@SuppressWarnings("deprecation")
-public class V3HttpAPITest extends TestOnCiBuildingSystemOnly {
+public class V3HttpAPITest {
public static final List<TestDocument> documents;