This is an automated email from the ASF dual-hosted git repository.
khowe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 565da00 GEODE-5399: Removed FlakyTest test category (#2432)
565da00 is described below
commit 565da00e63b2d137c91c2262d8fff98a6ecd9724
Author: Kenneth Howe <kh...@pivotal.io>
AuthorDate: Fri Sep 7 09:46:24 2018 -0700
GEODE-5399: Removed FlakyTest test category (#2432)
* GEODE-5399: Removed FlakyTest test category
* removed the flakyTest target from gradle
---
geode-assembly/build.gradle | 1 -
.../AsyncEventListenerDistributedTest.java | 4 ++--
.../ParallelAsyncEventListenerDistributedTest.java | 6 +++---
.../geode/test/junit/categories/FlakyTest.java | 21 --------------------
gradle/test-by-category.gradle | 15 --------------
gradle/test.gradle | 23 ++--------------------
6 files changed, 7 insertions(+), 63 deletions(-)
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index a20dee7..4a20924 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -467,7 +467,6 @@ distributedTest dependOnInstalledProduct
upgradeTest dependOnInstalledProduct
integrationTest dependOnInstalledProduct
uiTest dependOnInstalledProduct
-flakyTest dependOnInstalledProduct
repeatTest dependOnInstalledProduct
// Make build final task to generate all test and product resources
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDistributedTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDistributedTest.java
index b2a50cd..0a7e017 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDistributedTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDistributedTest.java
@@ -278,7 +278,7 @@ public class AsyncEventListenerDistributedTest implements
Serializable {
vm2.invoke(() -> waitForAsyncEventListenerWithEventsMapSize(0));
}
- @Test // serial, persistent, ReplicateRegion, FlakyTest, IntegrationTest
+ @Test // serial, persistent, ReplicateRegion, IntegrationTest
public void
testReplicatedSerialAsyncEventQueueWithPersistenceEnabled_Restart() {
vm0.invoke(() -> {
createCache();
@@ -312,7 +312,7 @@ public class AsyncEventListenerDistributedTest implements
Serializable {
* TODO: fix this test
*/
@Ignore("TODO: Disabled for 52351")
- @Test // serial, persistent, ReplicateRegion, FlakyTest
+ @Test // serial, persistent, ReplicateRegion
public void
testReplicatedSerialAsyncEventQueueWithPersistenceEnabled_Restart2() {
vm0.invoke(() -> createCache());
vm1.invoke(() -> createCache());
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/ParallelAsyncEventListenerDistributedTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/ParallelAsyncEventListenerDistributedTest.java
index eae6d00..4d36b91 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/ParallelAsyncEventListenerDistributedTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/ParallelAsyncEventListenerDistributedTest.java
@@ -546,7 +546,7 @@ public class ParallelAsyncEventListenerDistributedTest
implements Serializable {
* Test case to test possibleDuplicates. vm0 & vm1 are hosting the PR. vm1
is killed so the
* buckets hosted by it are shifted to vm0.
*/
- @Test // parallel, PartitionedRegion, FlakyTest, possibleDuplicates
+ @Test // parallel, PartitionedRegion, possibleDuplicates
public void testParallelAsyncEventQueueHA_Scenario1() throws
InterruptedException {
vm0.invoke(() -> createCache());
vm1.invoke(() -> createCache());
@@ -658,7 +658,7 @@ public class ParallelAsyncEventListenerDistributedTest
implements Serializable {
* Test case to test possibleDuplicates. vm0 & vm1 are hosting the PR. vm2
is brought up and
* rebalancing is triggered so the buckets get balanced among vm0, vm1 & vm2.
*/
- @Test // FlakyTest, parallel, PartitionedRegion, possibleDuplicates
+ @Test // parallel, PartitionedRegion, possibleDuplicates
public void testParallelAsyncEventQueueHA_Scenario3() {
vm0.invoke(() -> createCache());
vm1.invoke(() -> createCache());
@@ -830,7 +830,7 @@ public class ParallelAsyncEventListenerDistributedTest
implements Serializable {
});
}
- @Test // parallel, FlakyTest, PartitionedRegion, Rebalancing
+ @Test // parallel, PartitionedRegion, Rebalancing
public void
testParallelAsyncEventQueueMovePrimaryAndMoveItBackDuringDispatching() {
vm0.invoke(() -> createCache());
vm1.invoke(() -> createCache());
diff --git
a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/FlakyTest.java
b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/FlakyTest.java
deleted file mode 100644
index 5a10aec..0000000
---
a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/FlakyTest.java
+++ /dev/null
@@ -1,21 +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 flickering test that fails
intermittently.
- */
-public interface FlakyTest {
-}
diff --git a/gradle/test-by-category.gradle b/gradle/test-by-category.gradle
index 911d73b..ea88c75 100644
--- a/gradle/test-by-category.gradle
+++ b/gradle/test-by-category.gradle
@@ -35,7 +35,6 @@ subprojects {
task clientServerTest(type: Test) {
useJUnit {
includeCategories
'org.apache.geode.test.junit.categories.ClientServerTest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -46,7 +45,6 @@ subprojects {
task dlockTest(type: Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.DLockTest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -57,7 +55,6 @@ subprojects {
task backwardCompatibilityTest(type: Test) {
useJUnit {
includeCategories
'org.apache.geode.test.junit.categories.BackwardCompatibilityTest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -68,7 +65,6 @@ subprojects {
task clientSubscriptionTest(type: Test) {
useJUnit {
includeCategories
'org.apache.geode.test.junit.categories.ClientSubscriptionTest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -78,7 +74,6 @@ subprojects {
task queryTest(type: Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.OQLQueryTest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -89,7 +84,6 @@ subprojects {
task indexTest(type: Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.OQLIndexTest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -100,7 +94,6 @@ subprojects {
task functionServiceTest(type: Test) {
useJUnit {
includeCategories
'org.apache.geode.test.junit.categories.FunctionServiceTest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -111,7 +104,6 @@ subprojects {
task membershipTest(type: Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.MembershipTest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -121,7 +113,6 @@ subprojects {
task luceneTest(type: Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.LuceneTest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -132,7 +123,6 @@ subprojects {
task aeqTest(type: Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.AEQTest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -144,7 +134,6 @@ subprojects {
task sessionTest(type: Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.SessionTest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -155,7 +144,6 @@ subprojects {
task wanTest(type: Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.WanTest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -167,7 +155,6 @@ subprojects {
task redisTest(type: Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.RedisTest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -179,7 +166,6 @@ subprojects {
task restAPITest(type: Test) {
useJUnit {
includeCategories 'org.apache.geode.test.junit.categories.RestAPITest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
@@ -191,7 +177,6 @@ subprojects {
task serializationTest(type: Test) {
useJUnit {
includeCategories
'org.apache.geode.test.junit.categories.SerializationTest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
doFirst {
TestPropertiesWriter.writeTestProperties(buildDir, name)
diff --git a/gradle/test.gradle b/gradle/test.gradle
index a146ba4..2ee33ca 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -157,13 +157,11 @@ subprojects {
outputs.upToDateWhen { false }
}
- // Until the category can be removed, we exclude FlakyTest from some targets.
configure([integrationTest, distributedTest, performanceTest]) {
useJUnit {
if (project.hasProperty("testCategory")) {
includeCategories += project.testCategory
}
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
}
}
@@ -197,23 +195,6 @@ subprojects {
}
}
- task flakyTest(type: Test) {
- useJUnit {
- if (project.hasProperty("testCategory")) {
- includeCategories += project.testCategory
- }
- includeCategories += 'org.apache.geode.test.junit.categories.FlakyTest'
- }
-
- forkEvery 1
- doFirst {
- TestPropertiesWriter.writeTestProperties(buildDir, name)
- }
-
- reports.junitXml.destination = file "$buildDir/test-reports-flaky"
- outputs.upToDateWhen { false }
- }
-
/*
* Don't add tasks for running specific category tests, instead use this
* property `testCategory` and set a FQCN of the required category.
@@ -303,8 +284,8 @@ subprojects {
description 'Run this task before checking in code to validate changes. It
runs tests beyond unitTest'
}
- combineReports.mustRunAfter check, test, integrationTest, distributedTest,
flakyTest, acceptanceTest, repeatTest, upgradeTest
- [build, check, test, integrationTest, distributedTest, flakyTest,
acceptanceTest, repeatTest, upgradeTest].each {
+ combineReports.mustRunAfter check, test, integrationTest, distributedTest,
acceptanceTest, repeatTest, upgradeTest
+ [build, check, test, integrationTest, distributedTest, acceptanceTest,
repeatTest, upgradeTest].each {
it.finalizedBy combineReports
}
}
