From 23191905d5ee6079ea1a4c7f287414c46c9f7f73 Mon Sep 17 00:00:00 2001 From: Murph Murphy Date: Tue, 6 Aug 2024 17:58:20 -0600 Subject: [PATCH] Don't isolate, remove GC --- .github/workflows/rust-ci.yml | 2 +- .../scripts/TestFixtureCancelDelay/TestFixtureCancelDelay.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/rust-ci.yml b/.github/workflows/rust-ci.yml index 9a78d97..ac46812 100644 --- a/.github/workflows/rust-ci.yml +++ b/.github/workflows/rust-ci.yml @@ -16,5 +16,5 @@ jobs: minimum_coverage: "0" additional_system_deps: "libjna-java" cargo_command_env_vars: "PATH=$JAVA_HOME_21_X64/bin:$PATH CLASSPATH=/usr/share/java/jna.jar" - cargo_command_test_args: "test_cancel_delay_fixtures" + # cargo_command_test_args: "test_cancel_delay_fixtures" secrets: inherit diff --git a/tests/scripts/TestFixtureCancelDelay/TestFixtureCancelDelay.java b/tests/scripts/TestFixtureCancelDelay/TestFixtureCancelDelay.java index 306c16a..7a3ce39 100644 --- a/tests/scripts/TestFixtureCancelDelay/TestFixtureCancelDelay.java +++ b/tests/scripts/TestFixtureCancelDelay/TestFixtureCancelDelay.java @@ -122,7 +122,6 @@ public CompletableFuture tryDelay(String delayMs) { var completedDelaysBefore = traitObj.completedDelays; System.out.println("Calling for cancel_delay from Java: " + System.nanoTime()); Futures.cancelDelayUsingTrait(traitObj, 10).get(); - System.gc(); // sleep long enough so that the `delay()` call would finish if it wasn't cancelled. TestFixtureCancelDelay.delay(100).get(); // If the task was cancelled, then completedDelays won't have increased @@ -130,7 +129,6 @@ public CompletableFuture tryDelay(String delayMs) { // Test that all handles were cleaned up // TODO(murph): this is inconsistently failing in CI, touch - System.gc(); var endingHandleCount = UniffiAsyncHelpers.uniffiForeignFutureHandleCount(); assert endingHandleCount == 0 : MessageFormat.format("{0} current handle count != 0", endingHandleCount); }