From bd1dfbf993ee702f94bc9583b9c4785382b934c8 Mon Sep 17 00:00:00 2001 From: Varun Jain Date: Sat, 13 Jan 2024 02:56:35 +0530 Subject: [PATCH] Fix for Flaky test for issue 433 (#537) Signed-off-by: Varun Jain --- CHANGELOG.md | 1 + .../neuralsearch/processor/NormalizationProcessorIT.java | 2 +- .../opensearch/neuralsearch/processor/ScoreCombinationIT.java | 2 +- .../opensearch/neuralsearch/processor/ScoreNormalizationIT.java | 2 +- .../java/org/opensearch/neuralsearch/query/HybridQueryIT.java | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ae6baab7..efb8e5bc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Enhancements ### Bug Fixes - Fixing multiple issues reported in #497 ([#524](https://github.com/opensearch-project/neural-search/pull/524)) +- Fix Flaky test reported in #433 ([#533](https://github.com/opensearch-project/neural-search/pull/533)) ### Infrastructure - BWC tests for Neural Search ([#515](https://github.com/opensearch-project/neural-search/pull/515)) ### Documentation diff --git a/src/test/java/org/opensearch/neuralsearch/processor/NormalizationProcessorIT.java b/src/test/java/org/opensearch/neuralsearch/processor/NormalizationProcessorIT.java index 5a48b9938..ad5da2d1b 100644 --- a/src/test/java/org/opensearch/neuralsearch/processor/NormalizationProcessorIT.java +++ b/src/test/java/org/opensearch/neuralsearch/processor/NormalizationProcessorIT.java @@ -48,7 +48,7 @@ public class NormalizationProcessorIT extends BaseNeuralSearchIT { private static final String TEST_KNN_VECTOR_FIELD_NAME_1 = "test-knn-vector-1"; private static final String TEST_TEXT_FIELD_NAME_1 = "test-text-field-1"; private static final String TEST_TEXT_FIELD_NAME_2 = "test-text-field-2"; - private static final String SEARCH_PIPELINE = "phase-results-pipeline"; + private static final String SEARCH_PIPELINE = "phase-results-normalization-processor-pipeline"; private final float[] testVector1 = createRandomVector(TEST_DIMENSION); private final float[] testVector2 = createRandomVector(TEST_DIMENSION); private final float[] testVector3 = createRandomVector(TEST_DIMENSION); diff --git a/src/test/java/org/opensearch/neuralsearch/processor/ScoreCombinationIT.java b/src/test/java/org/opensearch/neuralsearch/processor/ScoreCombinationIT.java index d6467b065..832f008b8 100644 --- a/src/test/java/org/opensearch/neuralsearch/processor/ScoreCombinationIT.java +++ b/src/test/java/org/opensearch/neuralsearch/processor/ScoreCombinationIT.java @@ -42,7 +42,7 @@ public class ScoreCombinationIT extends BaseNeuralSearchIT { private static final String TEST_DOC_TEXT5 = "Say hello and enter my friend"; private static final String TEST_KNN_VECTOR_FIELD_NAME_1 = "test-knn-vector-1"; private static final String TEST_TEXT_FIELD_NAME_1 = "test-text-field-1"; - private static final String SEARCH_PIPELINE = "phase-results-pipeline"; + private static final String SEARCH_PIPELINE = "phase-results-score-combination-pipeline"; private final float[] testVector1 = createRandomVector(TEST_DIMENSION); private final float[] testVector2 = createRandomVector(TEST_DIMENSION); private final float[] testVector3 = createRandomVector(TEST_DIMENSION); diff --git a/src/test/java/org/opensearch/neuralsearch/processor/ScoreNormalizationIT.java b/src/test/java/org/opensearch/neuralsearch/processor/ScoreNormalizationIT.java index 9f83a3608..9910435b8 100644 --- a/src/test/java/org/opensearch/neuralsearch/processor/ScoreNormalizationIT.java +++ b/src/test/java/org/opensearch/neuralsearch/processor/ScoreNormalizationIT.java @@ -34,7 +34,7 @@ public class ScoreNormalizationIT extends BaseNeuralSearchIT { private static final String TEST_DOC_TEXT4 = "Hello, I'm glad to you see you pal"; private static final String TEST_KNN_VECTOR_FIELD_NAME_1 = "test-knn-vector-1"; private static final String TEST_TEXT_FIELD_NAME_1 = "test-text-field-1"; - private static final String SEARCH_PIPELINE = "phase-results-pipeline"; + private static final String SEARCH_PIPELINE = "phase-results-normalization-pipeline"; private final float[] testVector1 = createRandomVector(TEST_DIMENSION); private final float[] testVector2 = createRandomVector(TEST_DIMENSION); private final float[] testVector3 = createRandomVector(TEST_DIMENSION); diff --git a/src/test/java/org/opensearch/neuralsearch/query/HybridQueryIT.java b/src/test/java/org/opensearch/neuralsearch/query/HybridQueryIT.java index 7e80d7fda..07247d2a5 100644 --- a/src/test/java/org/opensearch/neuralsearch/query/HybridQueryIT.java +++ b/src/test/java/org/opensearch/neuralsearch/query/HybridQueryIT.java @@ -63,7 +63,7 @@ public class HybridQueryIT extends BaseNeuralSearchIT { private final float[] testVector1 = createRandomVector(TEST_DIMENSION); private final float[] testVector2 = createRandomVector(TEST_DIMENSION); private final float[] testVector3 = createRandomVector(TEST_DIMENSION); - private static final String SEARCH_PIPELINE = "phase-results-pipeline"; + private static final String SEARCH_PIPELINE = "phase-results-hybrid-pipeline"; @Before public void setUp() throws Exception {