diff --git a/mongodump/mongodump_test.go b/mongodump/mongodump_test.go index fbc0f3e6d..bdcb5d1ff 100644 --- a/mongodump/mongodump_test.go +++ b/mongodump/mongodump_test.go @@ -378,27 +378,11 @@ func setupTimeseriesWithMixedSchema(dbName string, collName string) error { return createRes.Err() } - // SERVER-84531 was only backported to 7.3. - // TODO: Run collMod command on 6.0 and 7.0 (TOOLS-3597). - clientFCV := testutil.GetFCV(client) - - shouldAccommodateMixedSchema := clientFCV == "6.0" || clientFCV == "7.0" - if !shouldAccommodateMixedSchema { - cmp, err := testutil.CompareFCV(clientFCV, "7.3") - if err != nil { - return errors.Wrapf(err, "failed to compare client FCV (%s)", clientFCV) - } - - shouldAccommodateMixedSchema = cmp >= 0 - } - - if shouldAccommodateMixedSchema { - if res := sessionProvider.DB(dbName).RunCommand(context.Background(), bson.D{ - {"collMod", collName}, - {"timeseriesBucketsMayHaveMixedSchemaData", true}, - }); res.Err() != nil { - return res.Err() - } + if res := sessionProvider.DB(dbName).RunCommand(context.Background(), bson.D{ + {"collMod", collName}, + {"timeseriesBucketsMayHaveMixedSchemaData", true}, + }); res.Err() != nil { + return res.Err() } bucketColl := sessionProvider.DB(dbName).Collection("system.buckets." + collName) diff --git a/mongorestore/mongorestore_test.go b/mongorestore/mongorestore_test.go index 362f69433..ccba145e9 100644 --- a/mongorestore/mongorestore_test.go +++ b/mongorestore/mongorestore_test.go @@ -2055,18 +2055,11 @@ func TestRestoreTimeseriesCollectionsWithMixedSchema(t *testing.T) { fcv := testutil.GetFCV(session) // TODO: Enable tests for 6.0, 7.0 and 8.0 (TOOLS-3597). // The server fix for SERVER-84531 was only backported to 7.3. - if cmp, err := testutil.CompareFCV(fcv, "7.3"); cmp < 0 { + if cmp, err := testutil.CompareFCV(fcv, "6.0"); cmp < 0 { if err != nil { t.Fatalf("Failed to get FCV: %v", err) } - t.Skip("Requires server with FCV 7.3 or later") - } - - if cmp, err := testutil.CompareFCV(fcv, "8.0"); cmp >= 0 { - if err != nil { - t.Fatalf("Failed to get FCV: %v", err) - } - t.Skip("The test currently fails on v8.0 because of SERVER-92222") + t.Skip("Requires server with FCV 6.0 or later") } dbName := "timeseries_test_DB"