GODRIVER-3157 [master] Skip Serverless Proxy test that requires failp…

…oint on hello. (#1641) Co-authored-by: Matt Dale <[email protected]>
mongodb · May 14, 2024 · c0cec75 · c0cec75
1 parent 0c2ae5d
commit c0cec75
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -559,6 +559,8 @@ functions:
         working_dir: src/go.mongodb.org/mongo-driver
         script: |
           ${PREPARE_SHELL}
+
+          IS_SERVERLESS_PROXY="${IS_SERVERLESS_PROXY}" \
           bash etc/run-serverless-test.sh
 
   run-atlas-data-lake-test:
@@ -2109,6 +2111,7 @@ axes:
         display_name: "Serverless Proxy"
         variables:
           VAULT_NAME: "serverless_next"
+          IS_SERVERLESS_PROXY: "true"
 
 task_groups:
   - name: serverless_task_group

diff --git a/etc/run-serverless-test.sh b/etc/run-serverless-test.sh
@@ -5,6 +5,7 @@ source ${DRIVERS_TOOLS}/.evergreen/serverless/secrets-export.sh
 AUTH="auth" \
     SSL="ssl" \
     MONGODB_URI="${SERVERLESS_URI}" \
+    IS_SERVERLESS_PROXY="${IS_SERVERLESS_PROXY}" \
     SERVERLESS="serverless" \
     MAKEFILE_TARGET=evg-test-serverless \
     sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
diff --git a/internal/integration/unified/unified_spec_runner.go b/internal/integration/unified/unified_spec_runner.go
@@ -10,6 +10,7 @@ import (
 	"context"
 	"fmt"
 	"io/ioutil"
+	"os"
 	"path"
 	"strings"
 	"testing"
@@ -23,7 +24,7 @@ import (
 )
 
 var (
-	skippedTestDescriptions = map[string]string{
+	skippedTests = map[string]string{
 		// GODRIVER-1773: This test runs a "find" with limit=4 and batchSize=3. It expects batchSize values of three for
 		// the "find" and one for the "getMore", but we send three for both.
 		"A successful find event with a getmore and the server kills the cursor (<= 4.4)": "See GODRIVER-1773",
@@ -56,6 +57,10 @@ var (
 		"unpin when a non-transaction read operation uses a session":  "Implement GODRIVER-3034",
 	}
 
+	skippedServerlessProxyTests = map[string]string{
+		"errors during the initial connection hello are ignored": "Serverless Proxy does not support failpoints on hello (see GODRIVER-3157)",
+	}
+
 	logMessageValidatorTimeout = 10 * time.Millisecond
 	lowHeartbeatFrequency      = 50 * time.Millisecond
 )
@@ -245,8 +250,13 @@ func (tc *TestCase) Run(ls LoggerSkipper) error {
 	if tc.SkipReason != nil {
 		ls.Skipf("skipping for reason: %q", *tc.SkipReason)
 	}
-	if skipReason, ok := skippedTestDescriptions[tc.Description]; ok {
-		ls.Skipf("skipping due to known failure: %v", skipReason)
+	if skipReason, ok := skippedTests[tc.Description]; ok {
+		ls.Skipf("skipping due to known failure: %q", skipReason)
+	}
+	// If we're running against a Serverless Proxy instance, also check the
+	// tests that should be skipped only for Serverless Proxy.
+	if skipReason, ok := skippedServerlessProxyTests[tc.Description]; ok && os.Getenv("IS_SERVERLESS_PROXY") == "true" {
+		ls.Skipf("skipping due to known failure with Serverless Proxy: %q", skipReason)
 	}
 
 	// Validate that we support the schema declared by the test file before attempting to use its contents.

diff --git a/testdata/load-balancers/sdam-error-handling.json b/testdata/load-balancers/sdam-error-handling.json
@@ -1,6 +1,6 @@
 {
   "description": "state change errors are correctly handled",
-  "schemaVersion": "1.3",
+  "schemaVersion": "1.4",
   "runOnRequirements": [
     {
       "topologies": [
@@ -260,7 +260,7 @@
       ]
     },
     {
-      "description": "errors during the initial connection hello are ignore",
+      "description": "errors during the initial connection hello are ignored",
       "runOnRequirements": [
         {
           "minServerVersion": "4.9"

diff --git a/testdata/load-balancers/sdam-error-handling.yml b/testdata/load-balancers/sdam-error-handling.yml
@@ -1,6 +1,6 @@
 description: state change errors are correctly handled
 
-schemaVersion: '1.3'
+schemaVersion: '1.4'
 
 runOnRequirements:
   - topologies: [ load-balanced ]
@@ -139,7 +139,7 @@ tests:
 
   # This test uses singleClient to ensure that connection attempts are routed
   # to the same mongos on which the failpoint is set.
-  - description: errors during the initial connection hello are ignore 
+  - description: errors during the initial connection hello are ignored
     runOnRequirements:
       # Server version 4.9+ is needed to set a fail point on the initial
       # connection handshake with the appName filter due to SERVER-49336.