TOOLS-4148 Convert all tests in integration to use the testify suite package by autarch · Pull Request #973 · mongodb/mongo-tools

autarch · 2026-03-31T15:17:43Z

As part of this, I created a new integration/suite package which contains code that is shared between the export/import and dump/restore tests. The helper funcs for the export/import tests are now methods on the ImportExportSuite.

autarch · 2026-03-31T15:18:09Z

This stack of pull requests is managed by Graphite. Learn more about stacking.

mmcclimon

I didn't read everything closely here because I noticed enough on the skim that I think we should take another run at this one. Probably you could catch nearly everything by searching for s.T() and removing nearly all of them. (It's probably totally reasonable to make s.Context() which is just a wrapper for s.T().Context(), for example.)

autarch · 2026-04-03T22:19:01Z

I added an s.Contextmethod. At this point, there are only a few s.T()calls left in the integration tests, and they all seem reasonable.

mmcclimon

Ok. These tests are all still sort of weird, but I guess they're getting less weird over time, which is the goal.

mmcclimon · 2026-04-09T13:05:33Z

 	"github.com/mongodb/mongo-tools/common/testtype"
 	"github.com/mongodb/mongo-tools/common/testutil"
 	"github.com/mongodb/mongo-tools/common/wcwrapper"
+	integrationSuite "github.com/mongodb/mongo-tools/integration/suite"


Should we name this package something that's not suite so that we don't have to alias it like this?

Renamed to sharedsuite.

mmcclimon · 2026-04-09T13:06:19Z

+	sessionProvider, _, err := testutil.GetBareSessionProvider()
+	s.Require().NoError(err, "should create session provider")
+	client, err := sessionProvider.GetSession()
+	s.Require().NoError(err, "should get session")


This should just use s.Client().

mmcclimon · 2026-04-09T13:08:23Z

+}
+
+func (s *ImportExportSuite) recreateWithValidator(coll *mongo.Collection, validator any) {
+	s.Require().NoError(coll.Database().Drop(context.Background()))


Suggested change

s.Require().NoError(coll.Database().Drop(context.Background()))

s.Require().NoError(coll.Database().Drop(s.Context()))

mmcclimon · 2026-04-09T13:08:42Z

+	s.Require().NoError(coll.Database().Drop(context.Background()))
+	s.Require().NoError(
+		coll.Database().CreateCollection(
+			context.Background(), coll.Name(), mopt.CreateCollection().SetValidator(validator),


Suggested change

context.Background(), coll.Name(), mopt.CreateCollection().SetValidator(validator),

s.Context(), coll.Name(), mopt.CreateCollection().SetValidator(validator),

mmcclimon · 2026-04-09T13:14:28Z


-func runBSONMongodumpForCollection(
-	t *testing.T,
+func (s *DumpRestoreSuite) runBSONMongodumpForCollection(


It's a little weird that this package defines all these helpers in this main test file, while the exportimport package defines them in the suite helpers file.

I moved the helpers.

mmcclimon · 2026-04-09T13:18:34Z

+	s.Run("If --dumpUsersAndRoles was not used with the target", func() {
+		s.Run("Restoring from db directory should not be allowed", func() {


(These subtest names are still extremely convey-coded.)

I modified several other subtest names.

mmcclimon · 2026-04-09T13:36:39Z

+	s.T().Cleanup(func() {
+		_ = client.Database(dbName).Drop(context.Background())
+	})


This is super weird, but probably (I hope) this goes away in the next PR to run a BeforeTest cleanup thing.

Yes, it goes away.

autarch · 2026-04-09T21:08:04Z

Merge activity

Apr 9, 9:08 PM UTC: A user started a stack merge that includes this pull request via Graphite.
Apr 9, 9:08 PM UTC: @autarch merged this pull request with Graphite.

autarch mentioned this pull request Mar 31, 2026

Move all existing round trip Go tests to the integration dir #972

Merged

autarch changed the base branch from 03-30-move_all_existing_round_trip_go_tests_to_integration_ to graphite-base/973 March 31, 2026 16:37

autarch force-pushed the graphite-base/973 branch from 6c44f53 to efb6f41 Compare April 1, 2026 16:32

autarch force-pushed the 03-31-convert_all_tests_in_integration_to_use_the_testify_suite_package branch from 86aad88 to 721a4f6 Compare April 1, 2026 16:32

autarch changed the base branch from graphite-base/973 to 03-30-move_all_existing_round_trip_go_tests_to_integration_ April 1, 2026 16:32

autarch force-pushed the 03-31-convert_all_tests_in_integration_to_use_the_testify_suite_package branch from 721a4f6 to 5f9bf57 Compare April 1, 2026 18:33

autarch changed the base branch from 03-30-move_all_existing_round_trip_go_tests_to_integration_ to graphite-base/973 April 1, 2026 19:30

autarch force-pushed the 03-31-convert_all_tests_in_integration_to_use_the_testify_suite_package branch from 5f9bf57 to 13ba381 Compare April 1, 2026 19:31

autarch force-pushed the graphite-base/973 branch from efb6f41 to 53ae805 Compare April 1, 2026 19:31

graphite-app bot changed the base branch from graphite-base/973 to master April 1, 2026 19:32

autarch force-pushed the 03-31-convert_all_tests_in_integration_to_use_the_testify_suite_package branch 5 times, most recently from cc948a7 to 323143c Compare April 1, 2026 20:34

autarch mentioned this pull request Apr 1, 2026

TOOLS-4148 Add a BeforeTest hook for integration suites that drops all existing DBs #980

Merged

autarch requested a review from mmcclimon April 1, 2026 21:08

autarch marked this pull request as ready for review April 1, 2026 21:09

autarch requested a review from a team as a code owner April 1, 2026 21:09

mmcclimon requested changes Apr 2, 2026

View reviewed changes

Comment thread integration/dumprestore/roundtrip_test.go Outdated

Comment thread integration/dumprestore/roundtrip_test.go Outdated

Comment thread integration/dumprestore/roundtrip_test.go Outdated

Comment thread integration/importexport/csv_test.go Outdated

autarch force-pushed the 03-31-convert_all_tests_in_integration_to_use_the_testify_suite_package branch from 323143c to e8844d7 Compare April 3, 2026 22:18

autarch changed the base branch from master to graphite-base/973 April 8, 2026 16:03

autarch force-pushed the 03-31-convert_all_tests_in_integration_to_use_the_testify_suite_package branch from e8844d7 to 9842ff5 Compare April 8, 2026 16:03

autarch changed the base branch from graphite-base/973 to 04-03-tools-4148_pass_the_errgroup_created_in_streamdocuments_to_dosequentialstreaming_ April 8, 2026 16:03

autarch force-pushed the 03-31-convert_all_tests_in_integration_to_use_the_testify_suite_package branch from 9842ff5 to 4af151d Compare April 8, 2026 16:05

autarch closed this Apr 8, 2026

autarch reopened this Apr 8, 2026

autarch marked this pull request as draft April 8, 2026 17:27

autarch marked this pull request as ready for review April 8, 2026 17:27

autarch requested a review from mmcclimon April 8, 2026 17:27

autarch changed the base branch from 04-03-tools-4148_pass_the_errgroup_created_in_streamdocuments_to_dosequentialstreaming_ to graphite-base/973 April 8, 2026 19:53

autarch force-pushed the graphite-base/973 branch from 4f5e086 to 4c3fdbb Compare April 8, 2026 20:39

autarch force-pushed the 03-31-convert_all_tests_in_integration_to_use_the_testify_suite_package branch from 4af151d to b907c8a Compare April 8, 2026 20:40

autarch changed the base branch from graphite-base/973 to 04-03-tools-4148_pass_the_errgroup_created_in_streamdocuments_to_dosequentialstreaming_ April 8, 2026 20:40

autarch changed the base branch from 04-03-tools-4148_pass_the_errgroup_created_in_streamdocuments_to_dosequentialstreaming_ to graphite-base/973 April 8, 2026 21:08

autarch force-pushed the 03-31-convert_all_tests_in_integration_to_use_the_testify_suite_package branch from b907c8a to fb5a1b5 Compare April 8, 2026 21:11

autarch force-pushed the graphite-base/973 branch from 4c3fdbb to 5d5ee94 Compare April 8, 2026 21:11

graphite-app bot changed the base branch from graphite-base/973 to master April 8, 2026 21:12

autarch force-pushed the 03-31-convert_all_tests_in_integration_to_use_the_testify_suite_package branch from fb5a1b5 to 098c623 Compare April 8, 2026 21:12

autarch changed the title ~~Convert all tests in integration to use the testify suite package~~ TOOLS-4148 Convert all tests in integration to use the testify suite package Apr 8, 2026

mmcclimon approved these changes Apr 9, 2026

View reviewed changes

autarch force-pushed the 03-31-convert_all_tests_in_integration_to_use_the_testify_suite_package branch from 098c623 to 2331e2c Compare April 9, 2026 17:08

Convert all tests in integration to use the testify suite package

30988fd

autarch force-pushed the 03-31-convert_all_tests_in_integration_to_use_the_testify_suite_package branch from 2331e2c to 30988fd Compare April 9, 2026 20:21

autarch merged commit b2c8c06 into master Apr 9, 2026
40 checks passed

	s.Require().NoError(coll.Database().Drop(context.Background()))
	s.Require().NoError(coll.Database().Drop(s.Context()))

	context.Background(), coll.Name(), mopt.CreateCollection().SetValidator(validator),
	s.Context(), coll.Name(), mopt.CreateCollection().SetValidator(validator),

		s.Run("If --dumpUsersAndRoles was not used with the target", func() {
		s.Run("Restoring from db directory should not be allowed", func() {

Conversation

autarch commented Mar 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

autarch commented Mar 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mmcclimon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

autarch commented Apr 3, 2026

Uh oh!

mmcclimon left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

autarch commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge activity

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

autarch commented Mar 31, 2026 •

edited

Loading

autarch commented Mar 31, 2026 •

edited

Loading

autarch commented Apr 9, 2026 •

edited

Loading