This is an automated email from the ASF dual-hosted git repository. edcoleman pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit ffe0018b513d582840e0cde04a0772f59deaea72 Author: Ed Coleman <[email protected]> AuthorDate: Thu Jul 6 17:57:22 2023 +0000 fix Wait.waitFor usage errors after merge update --- .../apache/accumulo/test/functional/MemoryStarvedMajCIT.java | 2 +- .../apache/accumulo/test/functional/MemoryStarvedScanIT.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedMajCIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedMajCIT.java index 8c9d0f7db3..366b62f935 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedMajCIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedMajCIT.java @@ -149,7 +149,7 @@ public class MemoryStarvedMajCIT extends SharedMiniClusterBase { ReadWriteIT.ingest(client, 100, 100, 100, 0, table); compactionThread.start(); - assertTrue(waitFor(() -> MAJC_PAUSED.intValue() > 0)); + waitFor(() -> MAJC_PAUSED.intValue() > 0); MemoryStarvedScanIT.freeServerMemory(client); compactionThread.interrupt(); diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedScanIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedScanIT.java index 607a59ece1..70d80f746f 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedScanIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedScanIT.java @@ -277,7 +277,7 @@ public class MemoryStarvedScanIT extends SharedMiniClusterBase { currentCount = fetched.get(); // Perform the check again - assertTrue(waitFor(() -> 1 == LOW_MEM_DETECTED.get())); + waitFor(() -> 1 == LOW_MEM_DETECTED.get()); assertEquals(currentCount, fetched.get()); // Free the memory which will allow the pausing scanner to continue @@ -316,9 +316,9 @@ public class MemoryStarvedScanIT extends SharedMiniClusterBase { consumeServerMemory(scanner); // Wait for metric that indicates a scan was returned early due to low memory - assertTrue(waitFor(() -> SCAN_RETURNED_EARLY.doubleValue() > returned - && SCAN_START_DELAYED.doubleValue() >= paused)); - assertTrue(waitFor(() -> 1 == LOW_MEM_DETECTED.get())); + waitFor(() -> SCAN_RETURNED_EARLY.doubleValue() > returned + && SCAN_START_DELAYED.doubleValue() >= paused); + waitFor(() -> 1 == LOW_MEM_DETECTED.get()); freeServerMemory(client); } finally { @@ -479,7 +479,7 @@ public class MemoryStarvedScanIT extends SharedMiniClusterBase { assertEquals(currentCount, fetched.get()); assertTrue(SCAN_START_DELAYED.doubleValue() >= paused); assertTrue(SCAN_RETURNED_EARLY.doubleValue() >= returned); - assertTrue(waitFor(() -> LOW_MEM_DETECTED.get() == 1)); + waitFor(() -> LOW_MEM_DETECTED.get() == 1); // Perform the check again paused = SCAN_START_DELAYED.doubleValue(); @@ -504,7 +504,7 @@ public class MemoryStarvedScanIT extends SharedMiniClusterBase { t.join(); assertEquals(30, fetched.get()); // allow metric collection to cycle. - assertTrue(waitFor(() -> LOW_MEM_DETECTED.get() == 0)); + waitFor(() -> LOW_MEM_DETECTED.get() == 0); } finally { to.delete(table);
