[geode] branch develop updated: Revert "[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 e4bd46d  Revert "[GEODE-5292] Actually destroy the region instead of 
pretending to."
e4bd46d is described below

commit e4bd46d71d0a8166868fc1505284e31972e1e842
Author: Dan Smith <upthewatersp...@apache.org>
AuthorDate: Tue Jul 10 12:44:39 2018 -0700

    Revert "[GEODE-5292] Actually destroy the region instead of pretending to."
    
    This reverts commit 9037d42bf291b504fea98bff4c851aac15e0625c.
    
    This commit is causing IntegrationTest to fail in the CI pipeline.
---
 .../geode/cache/ConcurrentRegionOperationIntegrationTest.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 634c6bb..a62d33a 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,6 +26,7 @@ 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;
 
@@ -58,6 +59,7 @@ public class ConcurrentRegionOperationIntegrationTest {
   }
 
   @Test
+  @Ignore("GEODE-5292: Test is failing in CI")
   public void replaceWithClearAndDestroy() throws RegionClearedException {
     Region<Integer, String> region = createRegion();
 
@@ -77,12 +79,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();
-      CompletableFuture.runAsync(region::destroyRegion).get();
-      return invocation.callRealMethod();
+      throw new RegionDestroyedException("Fake Exception", "/region");
     }).when(spyEntry).setValueWithTombstoneCheck(any(), any());
 
     assertThatExceptionOfType(RegionDestroyedException.class)
-        .isThrownBy(() -> region.replace(1, "value", "newvalue"));
+        .isThrownBy(() -> region.replace(1, "value", "newvalue"))
+        .withMessageContaining("Fake Exception");
 
     Awaitility.await().pollDelay(0, TimeUnit.MICROSECONDS)
         .pollInterval(1, TimeUnit.MILLISECONDS)