fix yaml test issue (opensearch-project#2700) (opensearch-project#2704)

Signed-off-by: Mingshi Liu <[email protected]> (cherry picked from commit 066652b) Co-authored-by: Mingshi Liu <[email protected]>
rbhavna · Jul 23, 2024 · a0e9116 · a0e9116
1 parent 7afaf2a
commit a0e9116
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -24,6 +24,7 @@ ext {
 apply plugin: 'opensearch.opensearchplugin'
 apply plugin: 'opensearch.testclusters'
 apply plugin: 'opensearch.pluginzip'
+apply plugin: 'opensearch.yaml-rest-test'
 ext {
     projectSubstitutions = [:]
     licenseFile = rootProject.file('LICENSE.txt')

diff --git a/plugin/src/yamlRestTest/java/org/opensearch/ml/plugin/PluginClientYamlTestSuiteIT.java b/plugin/src/yamlRestTest/java/org/opensearch/ml/plugin/PluginClientYamlTestSuiteIT.java
@@ -6,15 +6,15 @@
  */
 package org.opensearch.ml.plugin;
 
-import com.carrotsearch.randomizedtesting.annotations.Name;
-import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 import org.opensearch.test.rest.yaml.ClientYamlTestCandidate;
 import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase;
 
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 
 public class PluginClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase {
 
-    public ConversationalClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {
+    public PluginClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {
         super(testCandidate);
     }
 

diff --git a/plugin/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml b/plugin/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml
@@ -5,4 +5,4 @@
         h: component
 
   - match:
-      $body: /^plugin\n$/
+      $body: /opensearch-ml\n$/
diff --git a/plugin/src/yamlRestTest/resources/rest-api-spec/test/20_inference_ingest_processor.yml b/plugin/src/yamlRestTest/resources/rest-api-spec/test/20_inference_ingest_processor.yml
@@ -6,7 +6,10 @@ teardown:
         ignore: 404
 
 ---
-"Test ML Inference Processor":
+"Test ML Inference Ingest Processor":
+  - skip:
+      version: " - 2.13.99"
+      reason: "Added in 2.14.0"
   - do:
       ingest.put_pipeline:
         id: "my_pipeline"
@@ -21,4 +24,4 @@ teardown:
               }
             ]
           }
-  - match: { acknowledged: true }
+  - match: { acknowledged: true }