Skip to content

Commit ce74924

Browse files
committed
GODRIVER-3625 Remove driver tests for Atlas Data Lake
1 parent 79dbe82 commit ce74924

File tree

10 files changed

+4
-147
lines changed

10 files changed

+4
-147
lines changed

Taskfile.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,6 @@ tasks:
130130
evg-test:
131131
- 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
132132

133-
evg-test-atlas-data-lake:
134-
- ATLAS_DATA_LAKE_INTEGRATION_TEST=true go test -v ./internal/integration/unified -run TestUnifiedSpec/atlas-data-lake-testing >> spec_test.suite
135-
- ATLAS_DATA_LAKE_INTEGRATION_TEST=true go test -v ./internal/integration -run TestAtlasDataLake >> spec_test.suite
136-
137133
evg-test-enterprise-auth:
138134
- go run -tags gssapi ./internal/cmd/testentauth/main.go
139135

internal/integration/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ func TestClient(t *testing.T) {
724724
func TestClient_BulkWrite(t *testing.T) {
725725
mt := mtest.New(t, noClientOpts)
726726

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

internal/integration/crud_prose_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ func TestErrorsCodeNamePropagated(t *testing.T) {
417417
}
418418

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

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

662662
mt.RunOpts("8. MongoClient.bulkWrite handles a cursor requiring getMore within a transaction",
663-
mtest.NewOptions().MinServerVersion("8.0").AtlasDataLake(false).ClientType(mtest.Pinned).
663+
mtest.NewOptions().MinServerVersion("8.0").ClientType(mtest.Pinned).
664664
Topologies(mtest.ReplicaSet, mtest.Sharded, mtest.LoadBalanced, mtest.ShardedReplicaSet),
665665
func(mt *mtest.T) {
666666
var getMoreCalled int

internal/integration/csot_prose_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func TestCSOTProse(t *testing.T) {
179179
})
180180

181181
mt.RunOpts("11. multi-batch bulkWrites", mtest.NewOptions().MinServerVersion("8.0").
182-
AtlasDataLake(false).Topologies(mtest.Single), func(mt *mtest.T) {
182+
Topologies(mtest.Single), func(mt *mtest.T) {
183183
coll := mt.CreateCollection(mtest.Collection{DB: "db", Name: "coll"}, false)
184184
err := coll.Drop(context.Background())
185185
require.NoError(mt, err, "Drop error: %v", err)

internal/integration/data_lake_test.go

Lines changed: 0 additions & 117 deletions
This file was deleted.

internal/integration/mtest/mongotest.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ type T struct {
7474
validTopologies []TopologyKind
7575
auth *bool
7676
enterprise *bool
77-
dataLake *bool
7877
ssl *bool
7978
collCreateOpts *options.CreateCollectionOptionsBuilder
8079
requireAPIVersion *bool
@@ -855,10 +854,6 @@ func (t *T) verifyConstraints() error {
855854
return fmt.Errorf("test requires enterprise value: %v, cluster enterprise value: %v", *t.enterprise,
856855
testContext.enterpriseServer)
857856
}
858-
if t.dataLake != nil && *t.dataLake != testContext.dataLake {
859-
return fmt.Errorf("test requires cluster to be data lake: %v, cluster is data lake: %v", *t.dataLake,
860-
testContext.dataLake)
861-
}
862857
if t.requireAPIVersion != nil && *t.requireAPIVersion != testContext.requireAPIVersion {
863858
return fmt.Errorf("test requires RequireAPIVersion value: %v, local RequireAPIVersion value: %v", *t.requireAPIVersion,
864859
testContext.requireAPIVersion)

internal/integration/mtest/options.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -309,14 +309,6 @@ func (op *Options) Enterprise(ent bool) *Options {
309309
return op
310310
}
311311

312-
// AtlasDataLake specifies whether this test should only be run against Atlas Data Lake servers. Defaults to false.
313-
func (op *Options) AtlasDataLake(adl bool) *Options {
314-
op.optFuncs = append(op.optFuncs, func(t *T) {
315-
t.dataLake = &adl
316-
})
317-
return op
318-
}
319-
320312
// RequireAPIVersion specifies whether this test should only be run when REQUIRE_API_VERSION is true. Defaults to false.
321313
func (op *Options) RequireAPIVersion(rav bool) *Options {
322314
op.optFuncs = append(op.optFuncs, func(t *T) {

internal/integration/unified/unified_spec_runner.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,6 @@ func runTestFile(t *testing.T, filepath string, expectValidFail bool, opts ...*O
9999
mtOpts := mtest.NewOptions().
100100
RunOn(fileReqs...).
101101
CreateClient(false)
102-
if strings.Contains(filepath, "atlas-data-lake-testing") {
103-
mtOpts.AtlasDataLake(true)
104-
}
105102
mt := mtest.New(t, mtOpts)
106103

107104
for _, testCase := range testCases {

internal/integration/unified/unified_spec_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ var (
3636
"server-discovery-and-monitoring/tests/unified",
3737
"run-command/tests/unified",
3838
"index-management/tests",
39-
"atlas-data-lake-testing/tests/unified",
4039
}
4140
failDirectories = []string{
4241
"unified-test-format/tests/valid-fail",

internal/spectest/skip.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -768,11 +768,6 @@ var skipTests = map[string][]string{
768768
"TestUnifiedSpec/change-streams/tests/unified/change-streams.json/Test_array_truncation",
769769
},
770770

771-
// TODO(DRIVERS-3153): Re-enable once resolved.
772-
"Re-enable test following DRIVERS-3153 resolution (DRIVERS-3153)": {
773-
"TestUnifiedSpec/atlas-data-lake-testing/tests/unified/getMore.json/A_successful_find_event_with_getMore",
774-
},
775-
776771
// TODO(GODRIVER-3137): Gossip cluster time from internal MongoClient to
777772
// session entities.
778773
"Must advance cluster times in unified spec runner (GODRIVER-3137)": {

0 commit comments

Comments
 (0)