Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -379,23 +379,6 @@ functions:
binary: bash
args: [*task-runner, evg-test-load-balancers]

run-atlas-data-lake-test:
- command: subprocess.exec
params:
binary: "bash"
env:
AUTH: auth
SSL: nossl
TOPOLOGY: server
MONGODB_URI: "mongodb://mhuser:pencil@localhost"
args: [*task-runner, setup-test]
- command: subprocess.exec
type: test
retry_on_failure: true
params:
binary: "bash"
args: [*task-runner, evg-test-atlas-data-lake]

run-docker-test:
- command: subprocess.exec
type: test
Expand Down Expand Up @@ -1161,11 +1144,6 @@ tasks:
OCSP_ALGORITHM: "ecdsa"
OCSP_TLS_SHOULD_SUCCEED: "false"

- name: test-atlas-data-lake
commands:
- func: bootstrap-mongohoused
- func: run-atlas-data-lake-test

- name: test-docker-runner
commands:
- func: bootstrap-mongo-orchestration
Expand Down Expand Up @@ -2171,16 +2149,6 @@ buildvariants:
tasks:
- name: "atlas-test"

- name: atlas-data-lake-test
tags: ["pullrequest"]
display_name: "Atlas Data Lake Test"
run_on:
- ubuntu2004-large
expansions:
GO_DIST: "/opt/golang/go1.23"
tasks:
- name: "test-atlas-data-lake"

- name: docker-runner-test
tags: ["pullrequest"]
display_name: "Docker Runner Test"
Expand Down
4 changes: 0 additions & 4 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,6 @@ tasks:
evg-test:
- go test -exec "env PKG_CONFIG_PATH=${PKG_CONFIG_PATH} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} DYLD_LIBRARY_PATH=$MACOS_LIBRARY_PATH}" ${BUILD_TAGS} -v -timeout {{.TEST_TIMEOUT}}s -p 1 ./... >> test.suite

evg-test-atlas-data-lake:
- ATLAS_DATA_LAKE_INTEGRATION_TEST=true go test -v ./internal/integration/unified -run TestUnifiedSpec/atlas-data-lake-testing >> spec_test.suite
- ATLAS_DATA_LAKE_INTEGRATION_TEST=true go test -v ./internal/integration -run TestAtlasDataLake >> spec_test.suite

evg-test-enterprise-auth:
- go run -tags gssapi ./internal/cmd/testentauth/main.go

Expand Down
2 changes: 1 addition & 1 deletion internal/integration/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ func TestClient(t *testing.T) {
func TestClient_BulkWrite(t *testing.T) {
mt := mtest.New(t, noClientOpts)

mtBulkWriteOpts := mtest.NewOptions().MinServerVersion("8.0").AtlasDataLake(false).ClientType(mtest.Pinned)
mtBulkWriteOpts := mtest.NewOptions().MinServerVersion("8.0").ClientType(mtest.Pinned)
mt.RunOpts("bulk write with nil filter", mtBulkWriteOpts, func(mt *mtest.T) {
mt.Parallel()

Expand Down
4 changes: 2 additions & 2 deletions internal/integration/crud_prose_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ func TestErrorsCodeNamePropagated(t *testing.T) {
}

func TestClientBulkWriteProse(t *testing.T) {
mtOpts := mtest.NewOptions().MinServerVersion("8.0").AtlasDataLake(false).ClientType(mtest.Pinned)
mtOpts := mtest.NewOptions().MinServerVersion("8.0").ClientType(mtest.Pinned)
mt := mtest.New(t, mtOpts)

mt.Run("3. MongoClient.bulkWrite batch splits a writeModels input with greater than maxWriteBatchSize operations", func(mt *mtest.T) {
Expand Down Expand Up @@ -660,7 +660,7 @@ func TestClientBulkWriteProse(t *testing.T) {
})

mt.RunOpts("8. MongoClient.bulkWrite handles a cursor requiring getMore within a transaction",
mtest.NewOptions().MinServerVersion("8.0").AtlasDataLake(false).ClientType(mtest.Pinned).
mtest.NewOptions().MinServerVersion("8.0").ClientType(mtest.Pinned).
Topologies(mtest.ReplicaSet, mtest.Sharded, mtest.LoadBalanced, mtest.ShardedReplicaSet),
func(mt *mtest.T) {
var getMoreCalled int
Expand Down
2 changes: 1 addition & 1 deletion internal/integration/csot_prose_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ func TestCSOTProse(t *testing.T) {
})

mt.RunOpts("11. multi-batch bulkWrites", mtest.NewOptions().MinServerVersion("8.0").
AtlasDataLake(false).Topologies(mtest.Single), func(mt *mtest.T) {
Topologies(mtest.Single), func(mt *mtest.T) {
coll := mt.CreateCollection(mtest.Collection{DB: "db", Name: "coll"}, false)
err := coll.Drop(context.Background())
require.NoError(mt, err, "Drop error: %v", err)
Expand Down
117 changes: 0 additions & 117 deletions internal/integration/data_lake_test.go

This file was deleted.

5 changes: 0 additions & 5 deletions internal/integration/mtest/mongotest.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ type T struct {
validTopologies []TopologyKind
auth *bool
enterprise *bool
dataLake *bool
ssl *bool
collCreateOpts *options.CreateCollectionOptionsBuilder
requireAPIVersion *bool
Expand Down Expand Up @@ -855,10 +854,6 @@ func (t *T) verifyConstraints() error {
return fmt.Errorf("test requires enterprise value: %v, cluster enterprise value: %v", *t.enterprise,
testContext.enterpriseServer)
}
if t.dataLake != nil && *t.dataLake != testContext.dataLake {
return fmt.Errorf("test requires cluster to be data lake: %v, cluster is data lake: %v", *t.dataLake,
testContext.dataLake)
}
if t.requireAPIVersion != nil && *t.requireAPIVersion != testContext.requireAPIVersion {
return fmt.Errorf("test requires RequireAPIVersion value: %v, local RequireAPIVersion value: %v", *t.requireAPIVersion,
testContext.requireAPIVersion)
Expand Down
8 changes: 0 additions & 8 deletions internal/integration/mtest/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -309,14 +309,6 @@ func (op *Options) Enterprise(ent bool) *Options {
return op
}

// AtlasDataLake specifies whether this test should only be run against Atlas Data Lake servers. Defaults to false.
func (op *Options) AtlasDataLake(adl bool) *Options {
op.optFuncs = append(op.optFuncs, func(t *T) {
t.dataLake = &adl
})
return op
}

// RequireAPIVersion specifies whether this test should only be run when REQUIRE_API_VERSION is true. Defaults to false.
func (op *Options) RequireAPIVersion(rav bool) *Options {
op.optFuncs = append(op.optFuncs, func(t *T) {
Expand Down
3 changes: 0 additions & 3 deletions internal/integration/unified/unified_spec_runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@ func runTestFile(t *testing.T, filepath string, expectValidFail bool, opts ...*O
mtOpts := mtest.NewOptions().
RunOn(fileReqs...).
CreateClient(false)
if strings.Contains(filepath, "atlas-data-lake-testing") {
mtOpts.AtlasDataLake(true)
}
mt := mtest.New(t, mtOpts)

for _, testCase := range testCases {
Expand Down
1 change: 0 additions & 1 deletion internal/integration/unified/unified_spec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ var (
"server-discovery-and-monitoring/tests/unified",
"run-command/tests/unified",
"index-management/tests",
"atlas-data-lake-testing/tests/unified",
}
failDirectories = []string{
"unified-test-format/tests/valid-fail",
Expand Down
5 changes: 0 additions & 5 deletions internal/spectest/skip.go
Original file line number Diff line number Diff line change
Expand Up @@ -768,11 +768,6 @@ var skipTests = map[string][]string{
"TestUnifiedSpec/change-streams/tests/unified/change-streams.json/Test_array_truncation",
},

// TODO(DRIVERS-3153): Re-enable once resolved.
"Re-enable test following DRIVERS-3153 resolution (DRIVERS-3153)": {
"TestUnifiedSpec/atlas-data-lake-testing/tests/unified/getMore.json/A_successful_find_event_with_getMore",
},

// TODO(GODRIVER-3137): Gossip cluster time from internal MongoClient to
// session entities.
"Must advance cluster times in unified spec runner (GODRIVER-3137)": {
Expand Down
2 changes: 1 addition & 1 deletion testdata/specifications
Submodule specifications updated 54 files
+0 −1 .gitattributes
+0 −70 source/atlas-data-lake-testing/tests/README.md
+0 −84 source/atlas-data-lake-testing/tests/unified/aggregate.json
+0 −38 source/atlas-data-lake-testing/tests/unified/aggregate.yml
+0 −56 source/atlas-data-lake-testing/tests/unified/estimatedDocumentCount.json
+0 −31 source/atlas-data-lake-testing/tests/unified/estimatedDocumentCount.yml
+0 −96 source/atlas-data-lake-testing/tests/unified/find.json
+0 −41 source/atlas-data-lake-testing/tests/unified/find.yml
+0 −95 source/atlas-data-lake-testing/tests/unified/getMore.json
+0 −48 source/atlas-data-lake-testing/tests/unified/getMore.yml
+0 −48 source/atlas-data-lake-testing/tests/unified/listCollections.json
+0 −26 source/atlas-data-lake-testing/tests/unified/listCollections.yml
+0 −41 source/atlas-data-lake-testing/tests/unified/listDatabases.json
+0 −22 source/atlas-data-lake-testing/tests/unified/listDatabases.yml
+0 −54 source/atlas-data-lake-testing/tests/unified/runCommand.json
+0 −29 source/atlas-data-lake-testing/tests/unified/runCommand.yml
+12 −2 source/auth/auth.md
+35 −9 source/auth/tests/mongodb-aws.md
+3 −3 source/auth/tests/mongodb-oidc.md
+13 −2 source/change-streams/change-streams.md
+51 −0 source/client-side-encryption/tests/README.md
+2 −2 source/client-side-encryption/tests/unified/timeoutMS.json
+2 −2 source/client-side-encryption/tests/unified/timeoutMS.yml
+12 −0 source/client-side-encryption/tests/unified/updateOne.json
+4 −0 source/client-side-encryption/tests/unified/updateOne.yml
+1 −1 source/client-side-encryption/tests/unified/validatorAndPartialFieldExpression.json
+1 −1 source/client-side-encryption/tests/unified/validatorAndPartialFieldExpression.yml
+3 −1 source/client-side-operations-timeout/etc/templates/global-timeoutMS.yml.template
+3 −1 source/client-side-operations-timeout/etc/templates/retryability-timeoutMS.yml.template
+10 −4 source/client-side-operations-timeout/tests/command-execution.json
+7 −1 source/client-side-operations-timeout/tests/command-execution.yml
+4 −2 source/client-side-operations-timeout/tests/convenient-transactions.json
+3 −1 source/client-side-operations-timeout/tests/convenient-transactions.yml
+4 −2 source/client-side-operations-timeout/tests/error-transformations.json
+3 −1 source/client-side-operations-timeout/tests/error-transformations.yml
+97 −33 source/client-side-operations-timeout/tests/global-timeoutMS.json
+65 −1 source/client-side-operations-timeout/tests/global-timeoutMS.yml
+4 −2 source/client-side-operations-timeout/tests/non-tailable-cursors.json
+3 −1 source/client-side-operations-timeout/tests/non-tailable-cursors.yml
+4 −2 source/client-side-operations-timeout/tests/retryability-timeoutMS.json
+3 −1 source/client-side-operations-timeout/tests/retryability-timeoutMS.yml
+5 −1 source/client-side-operations-timeout/tests/runCursorCommand.json
+4 −1 source/client-side-operations-timeout/tests/runCursorCommand.yml
+4 −2 source/client-side-operations-timeout/tests/sessions-inherit-timeoutMS.json
+3 −1 source/client-side-operations-timeout/tests/sessions-inherit-timeoutMS.yml
+9 −0 source/crud/bulk-write.md
+114 −15 source/crud/crud.md
+44 −21 source/index-management/index-management.md
+14 −3 source/mongodb-handshake/handshake.md
+285 −6 source/mongodb-handshake/tests/README.md
+1,180 −0 source/unified-test-format/schema-1.26.json
+3 −0 source/unified-test-format/schema-latest.json
+2 −7 source/unified-test-format/tests/Makefile
+15 −3 source/unified-test-format/unified-test-format.md
Loading