GODRIVER-3445 Add testdata back

Author: prestonvasquez

internal/integration/unified/unified_spec_runner.go

@@ -90,7 +90,7 @@ func runTestDirectory(t *testing.T, directoryPath string, expectValidFail bool)
 
 // runTestFile runs the tests in the given file, with expectValidFail determining whether the tests should expect to pass or fail
 func runTestFile(t *testing.T, filepath string, expectValidFail bool, opts ...*Options) {
-	spectest.CheckSkip(t)
+	//spectest.CheckSkip(t)
 	content, err := ioutil.ReadFile(filepath)
 	assert.Nil(t, err, "ReadFile error for file %q: %v", filepath, err)
 

internal/integration/unified/unified_spec_test.go

@@ -8,14 +8,17 @@ package unified
 
 import (
 	"context"
+	"path"
 	"testing"
 
 	"go.mongodb.org/mongo-driver/v2/internal/spectest"
 )
 
 var (
+	nonGitSubmodulePassDirectories = []string{
+		"unified-test-format/valid-pass",
+	}
 	passDirectories = []string{
-		"unified-test-format/tests/valid-pass",
 		"versioned-api/tests",
 		"crud/tests/unified",
 		"change-streams/tests/unified",
@@ -29,20 +32,21 @@ var (
 		"retryable-reads/tests/unified",
 		"retryable-writes/tests/unified",
 		"client-side-encryption/tests/unified",
-		"client-side-operations-timeout/tests",
+		//"client-side-operations-timeout/tests",
 		"gridfs/tests",
 		"server-selection/tests/logging",
 		"server-discovery-and-monitoring/tests/unified",
 		"run-command/tests/unified",
 		"index-management/tests",
-		"transactions-convenient-api/tests/unified",
 		"atlas-data-lake-testing/tests/unified",
 	}
 	failDirectories = []string{
 		"unified-test-format/tests/valid-fail",
 	}
 )
 
+const dataDirectory = "../../../testdata"
+
 func TestUnifiedSpec(t *testing.T) {
 	// Ensure the cluster is in a clean state before test execution begins.
 	if err := terminateOpenSessions(context.Background()); err != nil {
@@ -55,6 +59,12 @@ func TestUnifiedSpec(t *testing.T) {
 		})
 	}
 
+	for _, testDir := range nonGitSubmodulePassDirectories {
+		t.Run(testDir, func(t *testing.T) {
+			runTestDirectory(t, path.Join(dataDirectory, testDir), false)
+		})
+	}
+
 	for _, testDir := range failDirectories {
 		t.Run(testDir, func(t *testing.T) {
 			runTestDirectory(t, spectest.Path(testDir), true)

internal/integration/unified_spec_test.go

@@ -13,6 +13,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path"
 	"path/filepath"
 	"reflect"
 	"sync"
@@ -161,6 +162,12 @@ var directories = []string{
 	"read-write-concern/tests/operation",
 }
 
+var nonGitSubmodulePassDirectories = []string{
+	"convenient-transactions",
+}
+
+const dataPath string = "../../testdata/"
+
 var checkOutcomeOpts = options.Collection().SetReadPreference(readpref.Primary()).SetReadConcern(readconcern.Local())
 var specTestRegistry = func() *bson.Registry {
 	reg := bson.NewRegistry()
@@ -179,6 +186,17 @@ func TestUnifiedSpecs(t *testing.T) {
 			}
 		})
 	}
+
+	for _, specDir := range nonGitSubmodulePassDirectories {
+		t.Run(specDir, func(t *testing.T) {
+			for _, fileName := range jsonFilesInDir(t, path.Join(dataPath, specDir)) {
+				fmt.Println(fileName)
+				t.Run(fileName, func(t *testing.T) {
+					runSpecTestFile(t, filepath.Join(dataPath, specDir, fileName))
+				})
+			}
+		})
+	}
 }
 
 // specDir: name of directory for a spec in the data/ folder

internal/spectest/skip.go

@@ -124,15 +124,15 @@ var skipTests = map[string][]string{
 
 	// TODO: GODRIVER-3167 - Support assertions on topologyDescriptionChangedEvent in expectEvents.
 	"Implement GODRIVER-3161": {
-		"TestUnifiedSpec/unified-test-format/tests/valid-pass/expectedEventsForClient-topologyDescriptionChangedEvent.json/can_assert_on_values_of_newDescription_and_previousDescription_fields",
+		"TestUnifiedSpec/unified-test-format/valid-pass/expectedEventsForClient-topologyDescriptionChangedEvent.json/can_assert_on_values_of_newDescription_and_previousDescription_fields",
 	},
 
 	// TODO: GODRIVER-3409 - Regression test for "number" alias in $$type operator.
 	"Implement GODRIVER-3409": {
-		"TestUnifiedSpec/unified-test-format/tests/valid-pass/operator-type-number_alias.json/type_number_alias_matches_int32",
-		"TestUnifiedSpec/unified-test-format/tests/valid-pass/operator-type-number_alias.json/type_number_alias_matches_int64",
-		"TestUnifiedSpec/unified-test-format/tests/valid-pass/operator-type-number_alias.json/type_number_alias_matches_double",
-		"TestUnifiedSpec/unified-test-format/tests/valid-pass/operator-type-number_alias.json/type_number_alias_matches_decimal128",
+		"TestUnifiedSpec/unified-test-format/valid-pass/operator-type-number_alias.json/type_number_alias_matches_int32",
+		"TestUnifiedSpec/unified-test-format/valid-pass/operator-type-number_alias.json/type_number_alias_matches_int64",
+		"TestUnifiedSpec/unified-test-format/valid-pass/operator-type-number_alias.json/type_number_alias_matches_double",
+		"TestUnifiedSpec/unified-test-format/valid-pass/operator-type-number_alias.json/type_number_alias_matches_decimal128",
 	},
 
 	// TODO: GODRIVER-3143 - Convert CRUD v1 spec tests to unified test format.
@@ -213,21 +213,13 @@ var skipTests = map[string][]string{
 		"TestUnifiedSpec/transactions/tests/unified/transaction-options.json/readPreference_inherited_from_client",
 		"TestUnifiedSpec/transactions/tests/unified/transaction-options.json/readPreference_inherited_from_defaultTransactionOptions",
 		"TestUnifiedSpec/transactions/tests/unified/transaction-options.json/startTransaction_overrides_readPreference",
-		"TestUnifiedSpec/transactions-convenient-api/tests/unified/callback-retry.json/callback_succeeds_after_multiple_connection_errors",
-		"TestUnifiedSpec/transactions-convenient-api/tests/unified/callback-retry.json/callback_is_not_retried_after_non-transient_error_(DuplicateKeyError)",
-		"TestUnifiedSpec/transactions-convenient-api/tests/unified/commit-retry.json/commit_is_not_retried_after_MaxTimeMSExpired_error",
-		"TestUnifiedSpec/transactions-convenient-api/tests/unified/commit-writeconcernerror.json/commitTransaction_is_not_retried_after_UnknownReplWriteConcern_error",
-		"TestUnifiedSpec/transactions-convenient-api/tests/unified/commit-writeconcernerror.json/commitTransaction_is_not_retried_after_UnsatisfiableWriteConcern_error",
-		"TestUnifiedSpec/transactions-convenient-api/tests/unified/commit-writeconcernerror.json/commitTransaction_is_not_retried_after_MaxTimeMSExpired_error",
-		"TestUnifiedSpec/transactions-convenient-api/tests/unified/commit-retry.json/commitTransaction_retry_only_overwrites_write_concern_w_option",
 		"TestUnifiedSpec/transactions/tests/unified/retryable-commit.json/commitTransaction_fails_after_Interrupted",
 	},
 
 	// GODRIVER-1773: Tests related to batch size expectation in "find" and "getMore" events.
 	"Implement GODRIVER-1773": {
-
 		"TestUnifiedSpec/command-logging-and-monitoring/tests/monitoring/find.json/A_successful_find_event_with_a_getmore_and_the_server_kills_the_cursor_(<=_4.4)",
-		"TestUnifiedSpec/unified-test-format/tests/valid-pass/poc-command-monitoring.json/A_successful_find_event_with_a_getmore_and_the_server_kills_the_cursor_(<=_4.4)",
+		"TestUnifiedSpec/unified-test-format/valid-pass/poc-command-monitoring.json/A_successful_find_event_with_a_getmore_and_the_server_kills_the_cursor_(<=_4.4)",
 	},
 
 	// GODRIVER-2577: Tests require immediate operation canceling, incompatible with current pool clearing logic.
@@ -389,7 +381,7 @@ var skipTests = map[string][]string{
 
 	// TODO: GODRIVER-3486 - Support auto encryption in unified tests.
 	"Implement GODRIVER-3486": {
-		"TestUnifiedSpec/unified-test-format/tests/valid-pass/poc-queryable-encryption.json/insert,_replace,_and_find_with_queryable_encryption",
+		"TestUnifiedSpec/unified-test-format/valid-pass/poc-queryable-encryption.json/insert,_replace,_and_find_with_queryable_encryption",
 	},
 
 	// TODO: DRIVERS-3106 - Support auto encryption in unified tests.
@@ -704,8 +696,57 @@ var skipTests = map[string][]string{
 	// TODO(GODRIVER-2191): Drivers should retry operations if connection
 	// handshake fails.
 	"Implement GODRIVER-2191": {
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/client.listDatabases_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/client.listDatabases_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/client.listDatabaseNames_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/client.listDatabaseNames_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/client.createChangeStream_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/client.createChangeStream_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/database.aggregate_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/database.aggregate_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/database.listCollections_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/database.listCollections_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/database.listCollectionNames_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/database.listCollectionNames_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/database.createChangeStream_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/database.createChangeStream_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/collection.aggregate_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/collection.aggregate_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/collection.countDocuments_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/collection.countDocuments_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/collection.estimatedDocumentCount_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/collection.estimatedDocumentCount_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/collection.distinct_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/collection.distinct_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/collection.find_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/collection.find_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/collection.findOne_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/collection.findOne_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/collection.listIndexes_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/collection.listIndexes_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/collection.createChangeStream_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json/collection.createChangeStream_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
 		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json",
-		"TestUnifiedSpec/retryable-reads/tests/unified/handshakeError.json",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/client.clientBulkWrite_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/client.clientBulkWrite_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.insertOne_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.insertOne_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.insertMany_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.insertMany_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.deleteOne_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.deleteOne_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.replaceOne_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.replaceOne_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.updateOne_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.updateOne_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.findOneAndDelete_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.findOneAndDelete_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.findOneAndReplace_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.findOneAndReplace_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.findOneAndUpdate_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.findOneAndUpdate_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.bulkWrite_succeeds_after_retryable_handshake_network_error",
+		"TestUnifiedSpec/retryable-writes/tests/unified/handshakeError.json/collection.bulkWrite_succeeds_after_retryable_handshake_server_error_(ShutdownInProgress)",
 	},
 
 	// TODO(GODRIVER-3524): Change streams expanded events present by default in
@@ -714,6 +755,11 @@ var skipTests = map[string][]string{
 		"TestUnifiedSpec/change-streams/change-streams-disambiguatedPaths.json/disambiguatedPaths_is_not_present_when_showExpandedEvents_is_false/unset",
 		"TestUnifiedSpec/change-streams/change-streams.json/Test_insert,_update,_replace,_and_delete_event_types",
 	},
+
+	// TODO(DRIVERS-3153): Re-enable once DRIVERS-3153 is fixed.
+	"Re-enable once DRIVERS-3153 is fixed": {
+		"TestUnifiedSpec/atlas-data-lake-testing/tests/unified/getMore.json/A_successful_find_event_with_getMore",
+	},
 }
 
 // CheckSkip checks if the fully-qualified test name matches a list of skipped test names for a given reason.

internal/spectest/spectest.go

@@ -10,7 +10,6 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"runtime"
 	"testing"
 
 	"go.mongodb.org/mongo-driver/v2/internal/require"
@@ -43,13 +42,16 @@ func FindJSONFilesInDir(t *testing.T, dir string) []string {
 // Path returns the absolute path to the given specifications repo file or
 // subdirectory.
 func Path(subdir string) string {
-	_, file, _, ok := runtime.Caller(0)
-	if !ok {
-		panic("unable to get current file path from call stack")
-	}
-
-	// Get the repository root path from the current Go file path.
-	root := filepath.Dir(filepath.Dir(filepath.Dir(file)))
+	root := os.Getenv("PROJECT_DIRECTORY")
+	//if root == "" {
+	//	_, file, _, ok := runtime.Caller(0)
+	//	if !ok {
+	//		panic("unable to get current file path from call stack")
+	//	}
+
+	//	// Get the repository root path from the current Go file path.
+	//	root = filepath.Dir(filepath.Dir(filepath.Dir(file)))
+	//}
 
 	return filepath.Join(root, "testdata", "specifications", "source", subdir)
 }

testdata/atlas-data-lake-testing/aggregate.json

@@ -0,0 +1,53 @@
+{
+  "collection_name": "driverdata",
+  "database_name": "test",
+  "tests": [
+    {
+      "description": "Aggregate with pipeline (project, sort, limit)",
+      "operations": [
+        {
+          "object": "collection",
+          "name": "aggregate",
+          "arguments": {
+            "pipeline": [
+              {
+                "$project": {
+                  "_id": 0
+                }
+              },
+              {
+                "$sort": {
+                  "a": 1
+                }
+              },
+              {
+                "$limit": 2
+              }
+            ]
+          },
+          "result": [
+            {
+              "a": 1,
+              "b": 2,
+              "c": 3
+            },
+            {
+              "a": 2,
+              "b": 3,
+              "c": 4
+            }
+          ]
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "aggregate": "driverdata"
+            }
+          }
+        }
+      ]
+    }
+  ]
+}

testdata/atlas-data-lake-testing/aggregate.yml

@@ -0,0 +1,23 @@
+collection_name: &collection_name "driverdata"
+database_name: &database_name "test"
+
+tests:
+  -
+    description: "Aggregate with pipeline (project, sort, limit)"
+    operations:
+      -
+        object: collection
+        name: aggregate
+        arguments:
+          pipeline:
+            - $project: { _id: 0 }
+            - $sort: { a: 1 }
+            - $limit: 2
+        result:
+          - { a: 1, b: 2, c: 3 }
+          - { a: 2, b: 3, c: 4 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            aggregate: *collection_name

testdata/atlas-data-lake-testing/estimatedDocumentCount.json

@@ -0,0 +1,27 @@
+{
+  "collection_name": "driverdata",
+  "database_name": "test",
+  "tests": [
+    {
+      "description": "estimatedDocumentCount succeeds",
+      "operations": [
+        {
+          "object": "collection",
+          "name": "estimatedDocumentCount",
+          "result": 15
+        }
+      ],
+      "expectations": [
+        {
+          "command_started_event": {
+            "command": {
+              "count": "driverdata"
+            },
+            "command_name": "count",
+            "database_name": "test"
+          }
+        }
+      ]
+    }
+  ]
+}

testdata/atlas-data-lake-testing/estimatedDocumentCount.yml

@@ -0,0 +1,18 @@
+collection_name: &collection_name "driverdata"
+database_name: &database_name "test"
+
+tests:
+  -
+    description: "estimatedDocumentCount succeeds"
+    operations:
+      -
+        object: collection
+        name: estimatedDocumentCount
+        result: 15
+    expectations:
+      -
+        command_started_event:
+          command:
+            count: *collection_name
+          command_name: count
+          database_name: *database_name