Spring/spring-integration-aws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix race condition for multi-stream test

Browse Source 
* Fix GE `user.name`
* Attempt to fix the path to test results from GH action
This commit is contained in:
Artem Bilan
2023-10-19 16:12:57 -04:00
parent 848d56ad6d
commit 2705936fa8
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/CI.yml vendored
View File

@@ -10,7 +10,6 @@ env:
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
GRADLE_ENTERPRISE_CACHE_URL: 'https://ge-cache.spring.vmware.com/cache'
jobs:
build_snapshot:
@@ -48,7 +47,7 @@ jobs:
- name: Build and Publish
run: |
jf gradle build dist artifactoryPublish -Duser.name=spring-builds+github@vmware.com
jf gradle build dist artifactoryPublish -Duser.name=spring-builds+github
jf build-publish
- name: Capture Test Results
@@ -56,5 +55,5 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: test-results
path: '*/build/reports/tests/**/*.*'
path: '**/build/reports/tests/**/*.*'
retention-days: 3

4
src/test/java/org/springframework/integration/aws/kinesis/KclMessageDrivenChannelAdapterMultiStreamTests.java
View File

@@ -120,12 +120,12 @@ public class KclMessageDrivenChannelAdapterMultiStreamTests implements Localstac
// The below statement works but with a higher timeout. For 2 streams, this takes too long.
Message<?> receive = this.kinesisReceiveChannel.receive(300_000);
assertThat(receive).isNotNull();
assertThat(receive.getPayload()).isEqualTo(testData);
assertThat(receive.getPayload()).isIn(testData, testData2);
assertThat(receive.getHeaders().get(AwsHeaders.RECEIVED_SEQUENCE_NUMBER, String.class)).isNotEmpty();
receive = this.kinesisReceiveChannel.receive(10_000);
assertThat(receive).isNotNull();
assertThat(receive.getPayload()).isEqualTo(testData2);
assertThat(receive.getPayload()).isIn(testData, testData2);
List<Consumer> stream1Consumers =
AMAZON_KINESIS.describeStream(request -> request.streamName(TEST_STREAM1))