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
commit 1156e040c5cf5e761025937914a32373c2a90a8f Author: Dan Smith <[email protected]> AuthorDate: Fri Oct 5 15:14:58 2018 -0700 GEODE-5424: Fixing a test that was using awaitility as a sleep PersistentColocatedPartitionedRegionDUnitTest and QueryDataDUnitTest previously were using Awaitility as an overcomplicated way to make a thread sleep. We should eliminate these sleeps, but to avoid changing behavior with this PR, switching the Awaitility calls into regular sleeps. --- .../PersistentColocatedPartitionedRegionDUnitTest.java | 8 +------- .../java/org/apache/geode/management/QueryDataDUnitTest.java | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java index 117b95b..897e421 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java @@ -350,13 +350,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest // The delay is so that both parent and child regions will be created on another member // and the PR root config // will have an entry for the parent region. - try { - await() - .until(() -> { - return false; - }); - } catch (Exception e) { - } + Thread.sleep(100); try { // Skip creation of first region - expect region2 creation to fail // createPR(PR_REGION_NAME, true); diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/QueryDataDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/QueryDataDUnitTest.java index dcc69d1..e878e6b 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/management/QueryDataDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/management/QueryDataDUnitTest.java @@ -17,7 +17,6 @@ package org.apache.geode.management; import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath; import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static java.util.concurrent.TimeUnit.MINUTES; import static org.apache.geode.cache.FixedPartitionAttributes.createFixedPartition; import static org.apache.geode.cache.query.Utils.createPortfoliosAndPositions; import static org.apache.geode.management.internal.ManagementConstants.DEFAULT_QUERY_LIMIT; @@ -38,7 +37,6 @@ import java.util.concurrent.TimeoutException; import javax.management.ObjectName; -import org.awaitility.core.ConditionFactory; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject;
