geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcmellaw...@apache.org
Subject [geode] branch develop updated: Revert "GEODE-6277: use await() instead of hard-coded sleep(3000) in the test (#3086)"
Date Tue, 12 Feb 2019 04:50:17 GMT
This is an automated email from the ASF dual-hosted git repository.

mcmellawatt 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 4017973  Revert "GEODE-6277: use await() instead of hard-coded sleep(3000) in the
test (#3086)"
4017973 is described below

commit 4017973423bf3f9cb966e3912b93448b62d6e8f2
Author: Ryan McMahon <rmcmahon@pivotal.io>
AuthorDate: Mon Feb 11 20:48:49 2019 -0800

    Revert "GEODE-6277: use await() instead of hard-coded sleep(3000) in the test (#3086)"
    
    This reverts commit bfc0449e81b7ac5429f7473b216762c22c10f95b.
    
    It was found that testNBRegionDestructionDuringGetInitialImage started
    failing frequently after replacing the sleep in this test with an await.
    Need to investigate root cause, but reverting for now.
---
 .../java/org/apache/geode/cache30/MultiVMRegionTestCase.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/geode-dunit/src/main/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
b/geode-dunit/src/main/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
index ff4747c..de400e0 100644
--- a/geode-dunit/src/main/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
+++ b/geode-dunit/src/main/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
@@ -4971,9 +4971,13 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase
{
               // reset slow
               org.apache.geode.internal.cache.InitialImageOperation.slowImageProcessing =
0;
               // if global scope, the region doesn't get destroyed until after region creation
-              await().until(
-                  () -> getRootRegion().getSubregion(name) == null || getRegionAttributes()
-                      .getScope().isGlobal());
+              try {
+                Thread.sleep(3000);
+              } catch (InterruptedException ie) {
+                fail("interrupted");
+              }
+              assertThat(getRootRegion().getSubregion(name) == null
+                  || getRegionAttributes().getScope().isGlobal()).isTrue();
             }
           });
       if (getRegionAttributes().getScope().isGlobal()) {


Mime
View raw message