[geode] branch develop updated: [GEODE-5292] Actually destroy the region instead of pretending to.

[upthewaterspout]

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 9037d42  [GEODE-5292] Actually destroy the region instead of 
pretending to.
9037d42 is described below

commit 9037d42bf291b504fea98bff4c851aac15e0625c
Author: Dan Smith <dsm...@pivotal.io>
AuthorDate: Fri Jun 8 11:17:34 2018 -0700

    [GEODE-5292] Actually destroy the region instead of pretending to.
    
    Signed-off-by: Dan Smith <dsm...@pivotal.io>
---
 .../geode/cache/ConcurrentRegionOperationIntegrationTest.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git 
a/geode-core/src/test/java/org/apache/geode/cache/ConcurrentRegionOperationIntegrationTest.java
 
b/geode-core/src/test/java/org/apache/geode/cache/ConcurrentRegionOperationIntegrationTest.java
index a62d33a..634c6bb 100644
--- 
a/geode-core/src/test/java/org/apache/geode/cache/ConcurrentRegionOperationIntegrationTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/cache/ConcurrentRegionOperationIntegrationTest.java
@@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit;
 import org.awaitility.Awaitility;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -59,7 +58,6 @@ public class ConcurrentRegionOperationIntegrationTest {
   }
 
   @Test
-  @Ignore("GEODE-5292: Test is failing in CI")
   public void replaceWithClearAndDestroy() throws RegionClearedException {
     Region<Integer, String> region = createRegion();
 
@@ -79,12 +77,12 @@ public class ConcurrentRegionOperationIntegrationTest {
       // If we invoke clear in the replace thread, it can get locks which it 
will not
       // be able to get in a separate thread.
       CompletableFuture.runAsync(region::clear).get();
-      throw new RegionDestroyedException("Fake Exception", "/region");
+      CompletableFuture.runAsync(region::destroyRegion).get();
+      return invocation.callRealMethod();
     }).when(spyEntry).setValueWithTombstoneCheck(any(), any());
 
     assertThatExceptionOfType(RegionDestroyedException.class)
-        .isThrownBy(() -> region.replace(1, "value", "newvalue"))
-        .withMessageContaining("Fake Exception");
+        .isThrownBy(() -> region.replace(1, "value", "newvalue"));
 
     Awaitility.await().pollDelay(0, TimeUnit.MICROSECONDS)
         .pollInterval(1, TimeUnit.MILLISECONDS)