Skip to content

Commit a74108f

Browse files
dlvenablesan81
andauthored
Testing stability changes. This is a partial commit from #6348. (#6493)
Taken from 442cd70 Signed-off-by: David Venable <dlv@amazon.com> Co-authored-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com>
1 parent c4fea7d commit a74108f

4 files changed

Lines changed: 18 additions & 7 deletions

File tree

data-prepper-plugins/dynamodb-source-coordination-store/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ dependencies {
1717
implementation 'software.amazon.awssdk:sts'
1818
implementation 'javax.inject:javax.inject:1'
1919
testImplementation 'com.amazonaws:DynamoDBLocal:2.2.1'
20+
testImplementation 'org.awaitility:awaitility:4.2.0'
2021
}
2122

2223
configurations {

data-prepper-plugins/dynamodb-source-coordination-store/src/test/java/org/opensearch/dataprepper/plugins/sourcecoordinator/dynamodb/DynamoDbSourceCoordinationStoreIT.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
import java.util.Optional;
3737
import java.util.Random;
3838
import java.util.UUID;
39+
import java.util.concurrent.TimeUnit;
3940

41+
import static org.awaitility.Awaitility.await;
4042
import static org.hamcrest.MatcherAssert.assertThat;
4143
import static org.hamcrest.Matchers.equalTo;
4244
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
@@ -265,8 +267,16 @@ void tryAcquireAvailablePartition_gets_first_unassigned_partition() {
265267
objectUnderTest.tryCreatePartitionItem(sourceIdentifier,
266268
unassignedPartitionKey3, SourcePartitionStatus.UNASSIGNED, 1L, partitionProgressState, false);
267269

268-
final Optional<SourcePartitionStoreItem> maybeAcquired =
269-
objectUnderTest.tryAcquireAvailablePartition(sourceIdentifier, ownerId, Duration.ofSeconds(20));
270+
// Wait for partition to be available in DynamoDB Local before attempting to acquire
271+
final Optional<SourcePartitionStoreItem>[] maybeAcquiredHolder = new Optional[]{Optional.empty()};
272+
await().atMost(5, TimeUnit.SECONDS)
273+
.pollInterval(100, TimeUnit.MILLISECONDS)
274+
.untilAsserted(() -> {
275+
maybeAcquiredHolder[0] = objectUnderTest.tryAcquireAvailablePartition(sourceIdentifier, ownerId, Duration.ofSeconds(20));
276+
assertThat(maybeAcquiredHolder[0].isPresent(), equalTo(true));
277+
});
278+
279+
final Optional<SourcePartitionStoreItem> maybeAcquired = maybeAcquiredHolder[0];
270280

271281
assertThat(maybeAcquired, notNullValue());
272282
assertThat(maybeAcquired.isPresent(), equalTo(true));

data-prepper-plugins/saas-source-plugins/confluence-source/src/test/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceConfigHelperTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void testValidateConfig() {
118118

119119
@Test
120120
void testValidateConfigBasic() {
121-
when(confluenceSourceConfig.getAccountUrl()).thenReturn("https://test.com");
121+
when(confluenceSourceConfig.getAccountUrl()).thenReturn("https://somedomain.atlassian.net");
122122
when(confluenceSourceConfig.getAuthType()).thenReturn(BASIC);
123123
when(confluenceSourceConfig.getAuthenticationConfig()).thenReturn(authenticationConfig);
124124
when(authenticationConfig.getBasicConfig()).thenReturn(basicConfig);
@@ -137,7 +137,7 @@ void testValidateConfigBasic() {
137137

138138
@Test
139139
void testValidateConfigOauth2() {
140-
when(confluenceSourceConfig.getAccountUrl()).thenReturn("https://test.com");
140+
when(confluenceSourceConfig.getAccountUrl()).thenReturn("https://somedomain.atlassian.net");
141141
when(confluenceSourceConfig.getAuthType()).thenReturn(OAUTH2);
142142
when(confluenceSourceConfig.getAuthenticationConfig()).thenReturn(authenticationConfig);
143143
when(authenticationConfig.getOauth2Config()).thenReturn(oauth2Config);

data-prepper-plugins/saas-source-plugins/jira-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/JiraConfigHelperTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ void testGetProjectNameFilter() {
126126
void testValidateConfig() {
127127
assertThrows(RuntimeException.class, () -> JiraConfigHelper.validateConfig(jiraSourceConfig));
128128

129-
when(jiraSourceConfig.getAccountUrl()).thenReturn("https://test.com");
129+
when(jiraSourceConfig.getAccountUrl()).thenReturn("https://somedomain.atlassian.net");
130130
assertThrows(RuntimeException.class, () -> JiraConfigHelper.validateConfig(jiraSourceConfig));
131131

132132
when(jiraSourceConfig.getAuthType()).thenReturn("fakeType");
@@ -135,7 +135,7 @@ void testValidateConfig() {
135135

136136
@Test
137137
void testValidateConfigBasic() {
138-
when(jiraSourceConfig.getAccountUrl()).thenReturn("https://test.com");
138+
when(jiraSourceConfig.getAccountUrl()).thenReturn("https://somedomain.atlassian.net");
139139
when(jiraSourceConfig.getAuthType()).thenReturn(BASIC);
140140
when(jiraSourceConfig.getAuthenticationConfig()).thenReturn(authenticationConfig);
141141
when(authenticationConfig.getBasicConfig()).thenReturn(basicConfig);
@@ -154,7 +154,7 @@ void testValidateConfigBasic() {
154154

155155
@Test
156156
void testValidateConfigOauth2() {
157-
when(jiraSourceConfig.getAccountUrl()).thenReturn("https://test.com");
157+
when(jiraSourceConfig.getAccountUrl()).thenReturn("https://somedomain.atlassian.net");
158158
when(jiraSourceConfig.getAuthType()).thenReturn(OAUTH2);
159159
when(jiraSourceConfig.getAuthenticationConfig()).thenReturn(authenticationConfig);
160160
when(authenticationConfig.getOauth2Config()).thenReturn(oauth2Config);

0 commit comments

Comments
 (0)