Skip to content

Fixing race conditions in transferProgressListenerTest #5985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 27, 2025
Merged

Fixing race conditions in transferProgressListenerTest #5985

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbe7b62
Fixing race conditions in transferProgressListenerTest
RanVaknin Mar 24, 2025
1339675
Readding comment
RanVaknin Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ...tware/amazon/awssdk/transfer/s3/internal/S3JavaMultipartTransferProgressListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.times;

import com.github.tomakehurst.wiremock.client.WireMock;
import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
import com.github.tomakehurst.wiremock.junit5.WireMockTest;
import java.io.IOException;
Expand All @@ -37,6 +39,7 @@
import java.util.concurrent.CancellationException;
import java.util.concurrent.CompletionException;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
Expand Down Expand Up @@ -79,6 +82,11 @@ public static void init(WireMockRuntimeInfo wm) throws IOException {
testFile = new RandomTempFile(TEST_KEY, OBJ_SIZE);
}

@BeforeEach
void resetWireMock() {
WireMock.reset();
}

private static S3AsyncClient s3AsyncClient(boolean multipartEnabled) {
return S3AsyncClient.builder()
.multipartEnabled(multipartEnabled)
Expand All @@ -90,7 +98,7 @@ private static S3AsyncClient s3AsyncClient(boolean multipartEnabled) {
}

private static void assertMockOnFailure(TransferListener transferListenerMock) {
Mockito.verify(transferListenerMock, times(1)).transferFailed(ArgumentMatchers.any());
Mockito.verify(transferListenerMock, timeout(1000).times(1)).transferFailed(ArgumentMatchers.any());
Mockito.verify(transferListenerMock, times(1)).transferInitiated(ArgumentMatchers.any());
Mockito.verify(transferListenerMock, times(0)).transferComplete(ArgumentMatchers.any());
}
Expand Down Expand Up @@ -207,7 +215,7 @@ void listeners_reports_ProgressWhenSuccess(boolean multipartEnabled) {
assertThat(transferListener.isTransferInitiated()).isTrue();
Mockito.verify(transferListenerMock, times(0)).transferFailed(ArgumentMatchers.any());
Mockito.verify(transferListenerMock, times(1)).transferInitiated(ArgumentMatchers.any());
Mockito.verify(transferListenerMock, times(1)).transferComplete(ArgumentMatchers.any());
Mockito.verify(transferListenerMock, timeout(1000).times(1)).transferComplete(ArgumentMatchers.any());

// when false, the generic S3 TM will read 16KiB chunks, so OBJ_SIZE / 16KiB = 16MiB / 16KiB = 1024
int numTimesBytesTransferred = multipartEnabled ? 2 : 1024;
Expand Down
Loading