Fix: skip if below test cases.

Signed-off-by: dblock <[email protected]>
dblock · Aug 20, 2024 · 3e3fefd · 3e3fefd
1 parent ea08582
commit 3e3fefd
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 23 deletions.
diff --git a/.github/workflows/test-compatibility.yml b/.github/workflows/test-compatibility.yml
@@ -32,7 +32,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-go@v5
-        with: { go-version-file: "go.mod" }
+        with: { go-version-file: 'go.mod' }
 
       - run: go version
 

diff --git a/.github/workflows/test-integration-unreleased.yml b/.github/workflows/test-integration-unreleased.yml
@@ -1,12 +1,6 @@
 name: Integration with Unreleased OpenSearch
 
-on:
-  push:
-    branches:
-      - "main"
-  pull_request:
-    branches:
-      - "main"
+on: [push, pull_request]
 
 jobs:
   test:
@@ -15,9 +9,9 @@ jobs:
       fail-fast: false
       matrix:
         entry:
-          - { branch: "1.x", java-version: "11" }
-          - { branch: "2.x", java-version: "17" }
-          - { branch: "main", java-version: "17" }
+          - { branch: '1.x', java-version: '11' }
+          - { branch: '2.x', java-version: '17' }
+          - { branch: 'main', java-version: '17' }
     steps:
       - name: Checkout OpenSearch
         uses: actions/checkout@v4
@@ -40,7 +34,7 @@ jobs:
 
       - uses: actions/setup-java@v4
         with:
-          distribution: "temurin"
+          distribution: 'temurin'
           java-version: ${{ matrix.entry.java-version }}
 
       - name: Assemble OpenSearch
@@ -69,7 +63,7 @@ jobs:
 
       - name: Setup Go
         uses: actions/setup-go@v5
-        with: { go-version-file: "go-client/go.mod" }
+        with: { go-version-file: 'go-client/go.mod' }
 
       - name: Integration test
         working-directory: go-client

diff --git a/internal/test/helper.go b/internal/test/helper.go
@@ -105,7 +105,7 @@ func SkipIfBelowVersion(t *testing.T, client *opensearchapi.Client, majorVersion
 	t.Helper()
 	major, patch, _, err := GetVersion(client)
 	assert.Nil(t, err)
-	if major <= majorVersion && patch <= patchVersion {
+	if major < majorVersion || (major == majorVersion && patch < patchVersion) {
 		t.Skipf("Skiping %s as version %d.%d.x does not support this endpoint", testName, major, patch)
 	}
 }

diff --git a/opensearchapi/api_cat_test.go b/opensearchapi/api_cat_test.go
@@ -366,7 +366,7 @@ func TestCatClient(t *testing.T) {
 	for catType, value := range testCases {
 		t.Run(catType, func(t *testing.T) {
 			if catType == "ClusterManager" {
-				ostest.SkipIfBelowVersion(t, client, 1, 3, catType)
+				ostest.SkipIfBelowVersion(t, client, 2, 0, catType)
 			}
 			for _, testCase := range value {
 				t.Run(testCase.Name, func(t *testing.T) {
@@ -399,7 +399,7 @@ func TestCatClient(t *testing.T) {
 			ostest.CompareRawJSONwithParsedJSON(t, resp.Allocations, resp.Inspect().Response)
 		})
 		t.Run("ClusterManager", func(t *testing.T) {
-			ostest.SkipIfBelowVersion(t, client, 1, 3, "ClusterManager")
+			ostest.SkipIfBelowVersion(t, client, 2, 0, "ClusterManager")
 			resp, err := client.Cat.ClusterManager(nil, nil)
 			assert.Nil(t, err)
 			assert.NotNil(t, resp)

diff --git a/opensearchapi/api_cluster_test.go b/opensearchapi/api_cluster_test.go
@@ -230,7 +230,7 @@ func TestClusterClient(t *testing.T) {
 	for catType, value := range testCases {
 		t.Run(catType, func(t *testing.T) {
 			if strings.Contains(catType, "Decommission") {
-				ostest.SkipIfBelowVersion(t, client, 2, 3, catType)
+				ostest.SkipIfBelowVersion(t, client, 2, 4, catType)
 			}
 			for _, testCase := range value {
 				t.Run(testCase.Name, func(t *testing.T) {

diff --git a/opensearchapi/api_script_test.go b/opensearchapi/api_script_test.go
@@ -155,7 +155,7 @@ func TestScriptClient(t *testing.T) {
 	for _, value := range testCases {
 		t.Run(value.Name, func(t *testing.T) {
 			if strings.Contains(value.Name, "Language") {
-				ostest.SkipIfBelowVersion(t, client, 2, 3, value.Name)
+				ostest.SkipIfBelowVersion(t, client, 2, 4, value.Name)
 			}
 			for _, testCase := range value.Tests {
 				t.Run(testCase.Name, func(t *testing.T) {
@@ -206,7 +206,7 @@ func TestScriptClient(t *testing.T) {
 			ostest.CompareRawJSONwithParsedJSON(t, resp, resp.Inspect().Response)
 		})
 		t.Run("Language", func(t *testing.T) {
-			ostest.SkipIfBelowVersion(t, client, 2, 3, "Language")
+			ostest.SkipIfBelowVersion(t, client, 2, 4, "Language")
 			resp, err := client.Script.Language(nil, nil)
 			require.Nil(t, err)
 			assert.NotNil(t, resp)

diff --git a/plugins/ism/api_test.go b/plugins/ism/api_test.go
@@ -243,14 +243,14 @@ func TestClient(t *testing.T) {
 			ostest.CompareRawJSONwithParsedJSON(t, &resp, resp.Inspect().Response)
 		})
 		t.Run("Explain with validate_action", func(t *testing.T) {
-			ostest.SkipIfBelowVersion(t, osClient, 2, 3, "Explain with validate_action")
+			ostest.SkipIfBelowVersion(t, osClient, 2, 4, "Explain with validate_action")
 			resp, err := client.Explain(nil, &ism.ExplainReq{Indices: testIndex, Params: ism.ExplainParams{ShowPolicy: true, ValidateAction: true}})
 			assert.Nil(t, err)
 			assert.NotNil(t, resp)
 			ostest.CompareRawJSONwithParsedJSON(t, &resp, resp.Inspect().Response)
 		})
 		t.Run("Explain with show_policy", func(t *testing.T) {
-			ostest.SkipIfBelowVersion(t, osClient, 1, 2, "Explain with validate_action")
+			ostest.SkipIfBelowVersion(t, osClient, 1, 3, "Explain with show_policy")
 			resp, err := client.Explain(nil, &ism.ExplainReq{Indices: testIndex, Params: ism.ExplainParams{ShowPolicy: true}})
 			assert.Nil(t, err)
 			assert.NotNil(t, resp)

diff --git a/plugins/security/api_ssl_test.go b/plugins/security/api_ssl_test.go
@@ -30,7 +30,7 @@ func TestSSLClient(t *testing.T) {
 	osAPIclient, err := ostest.NewClient()
 	require.Nil(t, err)
 
-	ostest.SkipIfBelowVersion(t, osAPIclient, 1, 3, "SSLClient")
+	ostest.SkipIfBelowVersion(t, osAPIclient, 2, 0, "SSLClient")
 
 	clientTLSCert, err := tls.LoadX509KeyPair("../../admin.pem", "../../admin.key")
 	require.Nil(t, err)
@@ -114,7 +114,7 @@ func TestSSLClient(t *testing.T) {
 			for _, testCase := range value.Tests {
 				t.Run(testCase.Name, func(t *testing.T) {
 					if strings.HasSuffix(value.Name, "Reload") && strings.Contains(testCase.Name, "request") {
-						ostest.SkipIfBelowVersion(t, osAPIclient, 2, 7, value.Name)
+						ostest.SkipIfBelowVersion(t, osAPIclient, 2, 8, value.Name)
 					}
 					res, err := testCase.Results()
 					if testCase.Name == "inspect" {