[geode] branch develop updated: Removing the Flaky category from tests marked Flaky for a closed bug

[up...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

upthewaterspout 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 4f4b68e  Removing the Flaky category from tests marked Flaky for a closed bug
4f4b68e is described below

commit 4f4b68e7ff802d1c9ff34225b67ebbc19e012c16
Author: Dan Smith <up...@apache.org>
AuthorDate: Mon Sep 25 17:10:45 2017 -0700

    Removing the Flaky category from tests marked Flaky for a closed bug
---
 .../cache/execute/FunctionServiceBase.java         | 23 ++++++++++------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java
index 55d9a8d..a25a790 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java
@@ -15,15 +15,22 @@
 package org.apache.geode.internal.cache.execute;
 
 import static org.apache.geode.test.dunit.Wait.pause;
-import static org.hamcrest.Matchers.isA;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CacheClosedException;
 import org.apache.geode.cache.execute.Execution;
@@ -34,15 +41,7 @@ import org.apache.geode.cache.execute.ResultCollector;
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.test.dunit.Host;
 import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.junit.categories.FlakyTest;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.ExpectedException;
 
 /*
  * Base class for tests of FunctionService that are agnostic to the type of Execution that they are
@@ -264,7 +263,6 @@ public abstract class FunctionServiceBase extends JUnit4CacheTestCase {
     Assert.assertEquals(0, customCollector.getResult().size());
   }
 
-  @Category(FlakyTest.class) // GEODE-1981
   @Test
   public void customCollectorReturnsResultOfSendException() {
     ResultCollector rc = getExecution().withCollector(customCollector).execute((context) -> {
@@ -277,7 +275,6 @@ public abstract class FunctionServiceBase extends JUnit4CacheTestCase {
     assertEquals(result, customCollector.getResult());
   }
 
-  @Category(FlakyTest.class) // GEODE-1827
   @Test
   public void customCollectorReturnsResultOfSendFunctionException() {
     ResultCollector rc = getExecution().withCollector(customCollector).execute((context) -> {

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].