This is an automated email from the ASF dual-hosted git repository.
agingade pushed a commit to branch feature/GEODE-4947
in repository https://gitbox.apache.org/repos/asf/geode.git
commit e9859d6600eb3e5c30ab80a23de7358611055727
Author: Nick Reich <nre...@pivotal.io>
AuthorDate: Wed Apr 4 08:41:54 2018 -0700
Revert "GEODE-4947: Make new category for tests that require external
services"
This reverts commit 5413739ea8f44e4a2415326dbba2a67fdcbafda2.
---
ci/pipelines/develop.yml | 63 ----------------------
.../jdbc/JdbcAsyncWriterIntegrationTest.java | 4 +-
.../geode/connectors/jdbc/JdbcDistributedTest.java | 4 +-
.../connectors/jdbc/JdbcLoaderIntegrationTest.java | 4 +-
.../connectors/jdbc/JdbcWriterIntegrationTest.java | 4 +-
.../jdbc/MySqlJdbcAsyncWriterIntegrationTest.java | 4 +-
.../connectors/jdbc/MySqlJdbcDistributedTest.java | 4 +-
.../jdbc/MySqlJdbcLoaderIntegrationTest.java | 4 +-
.../jdbc/MySqlJdbcWriterIntegrationTest.java | 4 +-
.../PostgresJdbcAsyncWriterIntegrationTest.java | 4 +-
.../jdbc/PostgresJdbcDistributedTest.java | 4 +-
.../jdbc/PostgresJdbcLoaderIntegrationTest.java | 4 +-
.../jdbc/PostgresJdbcWriterIntegrationTest.java | 4 +-
.../MySqlTableMetaDataManagerIntegrationTest.java | 4 +-
...ostgresTableMetaDataManagerIntegrationTest.java | 4 +-
.../TableMetaDataManagerIntegrationTest.java | 4 +-
.../test/junit/categories/ExternalServiceTest.java | 22 --------
gradle/test.gradle | 11 ----
18 files changed, 30 insertions(+), 126 deletions(-)
diff --git a/ci/pipelines/develop.yml b/ci/pipelines/develop.yml
index 7738f34..a969f1e 100644
--- a/ci/pipelines/develop.yml
+++ b/ci/pipelines/develop.yml
@@ -341,69 +341,6 @@ jobs:
- integrationTest
- integrationtestfiles
path: geode-ci/ci/scripts/test-archive.sh
-- name: ExternalServiceTest
- serial: true
- public: true
- plan:
- - aggregate:
- - get: geode
- passed: [Build]
- trigger: true
- - get: geode-ci
- - get: geode-build-version
- passed: [Build]
- - get: docker-test-image
- params:
- rootfs: true
- - task: runtests
- privileged: true
- timeout: 8h
- config:
- inputs:
- - name: geode
- - name: geode-ci
- - name: docker-test-image
- - name: geode-build-version
- platform: linux
- outputs:
- - name: built-geode
- image_resource: *docker-geode-build-image
- params:
- MAINTENANCE_VERSION: ((!maintenance-version))
- SERVICE_ACCOUNT: ((!concourse-gcp-account))
- PUBLIC_BUCKET: ((!public-bucket))
- CALL_STACK_TIMEOUT: 25200
- run:
- args:
- - externalServiceTest
- - externalservicetestfiles
- path: geode-ci/ci/scripts/test-run.sh
- on_failure:
- aggregate:
- - put: send-notification-email
- params:
- subject: built-geode/subject
- body: built-geode/body
- ensure:
- aggregate:
- - task: archive-results
- config:
- inputs:
- - name: geode
- - name: geode-ci
- - name: geode-build-version
- - name: built-geode
- platform: linux
- image_resource: *docker-geode-build-image
- params:
- MAINTENANCE_VERSION: ((!maintenance-version))
- SERVICE_ACCOUNT: ((!concourse-gcp-account))
- PUBLIC_BUCKET: ((!public-bucket))
- run:
- args:
- - externalServiceTest
- - externalservicetestfiles
- path: geode-ci/ci/scripts/test-archive.sh
- name: FlakyTest
serial: true
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
index 44ed5d3..0430f71 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
@@ -40,9 +40,9 @@ import
org.apache.geode.connectors.jdbc.internal.TestConfigService;
import org.apache.geode.connectors.jdbc.internal.TestableConnectionManager;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.PdxInstance;
-import org.apache.geode.test.junit.categories.ExternalServiceTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(ExternalServiceTest.class)
+@Category(IntegrationTest.class)
public abstract class JdbcAsyncWriterIntegrationTest {
static final String DB_NAME = "test";
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
index 4d4ef65..bafe015 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
@@ -49,14 +49,14 @@ import org.apache.geode.test.dunit.rules.ClientVM;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.categories.ExternalServiceTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
* End-to-end dunits for jdbc connector
*/
-@Category(ExternalServiceTest.class)
+@Category(DistributedTest.class)
public abstract class JdbcDistributedTest implements Serializable {
static final String DB_NAME = "test";
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
index 07cba2e..6707fdc 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
@@ -45,9 +45,9 @@ import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
import org.apache.geode.pdx.internal.AutoSerializableManager;
-import org.apache.geode.test.junit.categories.ExternalServiceTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(ExternalServiceTest.class)
+@Category(IntegrationTest.class)
public abstract class JdbcLoaderIntegrationTest {
static final String DB_NAME = "test";
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
index d4cdf63..d30b93b 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
@@ -42,9 +42,9 @@ import
org.apache.geode.connectors.jdbc.internal.TestConfigService;
import org.apache.geode.connectors.jdbc.internal.TestableConnectionManager;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.PdxInstance;
-import org.apache.geode.test.junit.categories.ExternalServiceTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(ExternalServiceTest.class)
+@Category(IntegrationTest.class)
public abstract class JdbcWriterIntegrationTest {
static final String DB_NAME = "test";
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
index 14a9a74..37a057d 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
@@ -21,11 +21,11 @@ import java.sql.SQLException;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.ExternalServiceTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.MySqlConnectionRule;
-@Category(ExternalServiceTest.class)
+@Category(IntegrationTest.class)
public class MySqlJdbcAsyncWriterIntegrationTest extends
JdbcAsyncWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
index 607ab6e..56b32fb 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
@@ -26,14 +26,14 @@ import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.categories.ExternalServiceTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.MySqlConnectionRule;
import org.apache.geode.test.junit.rules.SqlDatabaseConnectionRule;
/**
* End-to-end dunits for jdbc connector
*/
-@Category(ExternalServiceTest.class)
+@Category(DistributedTest.class)
public class MySqlJdbcDistributedTest extends JdbcDistributedTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
index 7c9aa92..0d75045 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
@@ -22,11 +22,11 @@ import java.sql.Statement;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.ExternalServiceTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.MySqlConnectionRule;
-@Category(ExternalServiceTest.class)
+@Category(IntegrationTest.class)
public class MySqlJdbcLoaderIntegrationTest extends JdbcLoaderIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
index 90011d5..7d64ad0 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
@@ -21,11 +21,11 @@ import java.sql.SQLException;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.ExternalServiceTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.MySqlConnectionRule;
-@Category(ExternalServiceTest.class)
+@Category(IntegrationTest.class)
public class MySqlJdbcWriterIntegrationTest extends JdbcWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
index ab39878..4dbacea 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
@@ -21,11 +21,11 @@ import java.sql.SQLException;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.ExternalServiceTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.PostgresConnectionRule;
-@Category(ExternalServiceTest.class)
+@Category(IntegrationTest.class)
public class PostgresJdbcAsyncWriterIntegrationTest extends
JdbcAsyncWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
index a129fad..6643cbe 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
@@ -24,14 +24,14 @@ import java.sql.Types;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.ExternalServiceTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.PostgresConnectionRule;
import org.apache.geode.test.junit.rules.SqlDatabaseConnectionRule;
/**
* End-to-end dunits for jdbc connector
*/
-@Category(ExternalServiceTest.class)
+@Category(DistributedTest.class)
public class PostgresJdbcDistributedTest extends JdbcDistributedTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
index 80882a4..3b9755f 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
@@ -22,11 +22,11 @@ import java.sql.Statement;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.ExternalServiceTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.PostgresConnectionRule;
-@Category(ExternalServiceTest.class)
+@Category(IntegrationTest.class)
public class PostgresJdbcLoaderIntegrationTest extends
JdbcLoaderIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
index 18a8ed7..98d45c0 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
@@ -21,11 +21,11 @@ import java.sql.SQLException;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.ExternalServiceTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.PostgresConnectionRule;
-@Category(ExternalServiceTest.class)
+@Category(IntegrationTest.class)
public class PostgresJdbcWriterIntegrationTest extends
JdbcWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
index b32a382..44d3365 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
@@ -21,11 +21,11 @@ import java.sql.SQLException;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.ExternalServiceTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.MySqlConnectionRule;
-@Category(ExternalServiceTest.class)
+@Category(IntegrationTest.class)
public class MySqlTableMetaDataManagerIntegrationTest extends
TableMetaDataManagerIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
index 6e846e7..c5304ae 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
@@ -21,11 +21,11 @@ import java.sql.SQLException;
import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.ExternalServiceTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.PostgresConnectionRule;
-@Category(ExternalServiceTest.class)
+@Category(IntegrationTest.class)
public class PostgresTableMetaDataManagerIntegrationTest
extends TableMetaDataManagerIntegrationTest {
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
index ca34a02..6ec61f4 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
@@ -28,9 +28,9 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.ExternalServiceTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
-@Category(ExternalServiceTest.class)
+@Category(IntegrationTest.class)
public abstract class TableMetaDataManagerIntegrationTest {
private static final String REGION_TABLE_NAME = "employees";
diff --git
a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/ExternalServiceTest.java
b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/ExternalServiceTest.java
deleted file mode 100644
index 88eacf0..0000000
---
a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/ExternalServiceTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
- * agreements. See the NOTICE file distributed with this work for additional
information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
- * or implied. See the License for the specific language governing permissions
and limitations under
- * the License.
- */
-package org.apache.geode.test.junit.categories;
-
-/**
- * JUnit Test Category that specifies a test involving external services that
must be initialized
- * and configured for connection to by Geode
- */
-public interface ExternalServiceTest {
-}
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 21b3068..4c78af1 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -123,17 +123,6 @@ subprojects {
}
}
- task externalServiceTest(type:Test) {
- useJUnit {
- includeCategories
'org.apache.geode.test.junit.categories.ExternalServiceTest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
- }
-
- forkEvery 1
- doFirst {
- TestPropertiesWriter.writeTestProperties(buildDir, name)
- }
- }
task distributedTest(type:Test) {
useJUnit {
includeCategories
'org.apache.geode.test.junit.categories.DistributedTest'
--
To stop receiving notification emails like this one, please contact
aging...@apache.org.
