Skip to content
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

Fix flaky tests in CopyProcessorTests #12885

Merged
merged 4 commits into from
Mar 26, 2024
Merged

Fix flaky tests in CopyProcessorTests #12885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e87efb
Fix flaky test CopyProcessorTests#testCopyWithRemoveSource
gaobinlong Mar 24, 2024
955a84a
Remove an existing field to get a non-existing field name
gaobinlong Mar 25, 2024
2c039d7
Merge remote-tracking branch 'upstream/main' into fix_flaky
gaobinlong Mar 25, 2024
0d79235
Add a new randomFieldName method
gaobinlong Mar 26, 2024
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
5 changes: 3 additions & 2 deletions modules/ingest-common/src/test/java/org/opensearch/ingest/common/CopyProcessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class CopyProcessorTests extends OpenSearchTestCase {
public void testCopyExistingField() throws Exception {
IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random());
String sourceFieldName = RandomDocumentPicks.randomExistingFieldName(random(), ingestDocument);
String targetFieldName = RandomDocumentPicks.randomFieldName(random());
String targetFieldName = RandomDocumentPicks.randomNonExistingFieldName(random(), ingestDocument);
Processor processor = createCopyProcessor(sourceFieldName, targetFieldName, false, false, false);
processor.execute(ingestDocument);
assertThat(ingestDocument.hasField(targetFieldName), equalTo(true));
Expand Down Expand Up @@ -71,7 +71,8 @@ public void testCopyWithIgnoreMissing() throws Exception {
public void testCopyWithRemoveSource() throws Exception {
IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random());
String sourceFieldName = RandomDocumentPicks.randomExistingFieldName(random(), ingestDocument);
String targetFieldName = RandomDocumentPicks.randomFieldName(random());
String targetFieldName = RandomDocumentPicks.randomNonExistingFieldName(random(), ingestDocument);

Object sourceValue = ingestDocument.getFieldValue(sourceFieldName, Object.class);

Processor processor = createCopyProcessor(sourceFieldName, targetFieldName, false, true, false);
Expand Down
11 changes: 11 additions & 0 deletions test/framework/src/main/java/org/opensearch/ingest/RandomDocumentPicks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,17 @@ public static String randomFieldName(Random random) {
return fieldName.toString();
}

/**
* Returns a random field name that doesn't exist in the document.
*/
public static String randomNonExistingFieldName(Random random, IngestDocument ingestDocument) {
String fieldName;
do {
fieldName = randomFieldName(random);
} while (canAddField(fieldName, ingestDocument) == false);
return fieldName;
}

/**
* Returns a random leaf field name.
*/
Expand Down
Loading