Skip to content

TOOLS-4100 Always connect to the test cluster using the same shared code #1119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
autarch wants to merge 1 commit into
base: 08-14-fix_a_panic_that_can_happen_when_tools_testing_mongod_is_set
Choose a base branch
from
+31 −88
Open

TOOLS-4100 Always connect to the test cluster using the same shared code #1119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 5 additions & 19 deletions integration/exportimport/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ import (
"os"
"testing"

"github.com/mongodb/mongo-tools/common/db"
"github.com/mongodb/mongo-tools/common/log"
"github.com/mongodb/mongo-tools/common/options"
"github.com/mongodb/mongo-tools/common/testtype"
"github.com/mongodb/mongo-tools/common/testutil"
"github.com/mongodb/mongo-tools/common/wcwrapper"
"github.com/mongodb/mongo-tools/integration/sharedsuite"
"github.com/mongodb/mongo-tools/mongoexport"
"github.com/mongodb/mongo-tools/mongoimport"
Expand Down Expand Up @@ -48,25 +46,13 @@ func (s *ExportImportSuite) ExportOptions() mongoexport.Options {
}

func (s *ExportImportSuite) ImportOptions(dbName, collName string) mongoimport.Options {
ssl := testutil.GetSSLOptions()
auth := testutil.GetAuthOptions()
toolOptions, err := testutil.GetToolOptions()
s.Require().NoError(err)
toolOptions.Namespace.DB = dbName
toolOptions.Namespace.Collection = collName

return mongoimport.Options{
ToolOptions: &options.ToolOptions{
General: &options.General{},
SSL: &ssl,
Connection: &options.Connection{
Host: "localhost",
Port: db.DefaultTestPort,
},
Auth: &auth,
URI: &options.URI{},
Namespace: &options.Namespace{
DB: dbName,
Collection: collName,
},
WriteConcern: wcwrapper.Majority(),
},
ToolOptions: toolOptions,
InputOptions: &mongoimport.InputOptions{
ParseGrace: "stop",
},
Expand Down
18 changes: 3 additions & 15 deletions mongoexport/mongoexport_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"github.com/mongodb/mongo-tools/common/options"
"github.com/mongodb/mongo-tools/common/testtype"
"github.com/mongodb/mongo-tools/common/testutil"
"github.com/mongodb/mongo-tools/common/wcwrapper"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.mongodb.org/mongo-driver/v2/bson"
Expand Down Expand Up @@ -614,20 +613,9 @@ func TestExportNestedFieldsCSV(t *testing.T) {

func newExportTestClient(t *testing.T, dbName string) *mongo.Client {
t.Helper()
ssl := testutil.GetSSLOptions()
auth := testutil.GetAuthOptions()
sessionProvider, err := db.NewSessionProvider(options.ToolOptions{
General: &options.General{},
SSL: &ssl,
Connection: &options.Connection{
Host: "localhost",
Port: db.DefaultTestPort,
},
Auth: &auth,
URI: &options.URI{},
Namespace: &options.Namespace{},
WriteConcern: wcwrapper.Majority(),
})
toolOptions, err := testutil.GetToolOptions()
require.NoError(t, err, "should get tool options")
sessionProvider, err := db.NewSessionProvider(*toolOptions)
require.NoError(t, err, "should create session provider")
client, err := sessionProvider.GetSession()
require.NoError(t, err, "should get session")
Expand Down
34 changes: 14 additions & 20 deletions mongofiles/mongofiles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"github.com/mongodb/mongo-tools/common/options"
"github.com/mongodb/mongo-tools/common/testtype"
"github.com/mongodb/mongo-tools/common/testutil"
"github.com/mongodb/mongo-tools/common/wcwrapper"
. "github.com/smartystreets/goconvey/convey"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand All @@ -31,32 +30,27 @@ import (
)

var (
testDB = "mongofiles_test_db"
testServer = "localhost"
testPort = db.DefaultTestPort

ssl = testutil.GetSSLOptions()
auth = testutil.GetAuthOptions()
connection = &options.Connection{
Host: testServer,
Port: testPort,
}
toolOptions = &options.ToolOptions{
SSL: &ssl,
Connection: connection,
Auth: &auth,
Verbosity: &options.Verbosity{},
URI: &options.URI{},
WriteConcern: wcwrapper.Majority(),
}
testFiles = map[string]bson.ObjectID{
testDB = "mongofiles_test_db"

ssl = testutil.GetSSLOptions()
toolOptions = mustGetToolOptions()
testFiles = map[string]bson.ObjectID{
"testfile1": bson.NewObjectID(),
"testfile2": bson.NewObjectID(),
"testfile3": bson.NewObjectID(),
"testfile4": bson.NewObjectID(),
}
)

func mustGetToolOptions() *options.ToolOptions {
toolOptions, err := testutil.GetToolOptions()
if err != nil {
panic(fmt.Sprintf("could not get tool options: %v", err))
}

return toolOptions
}

// put in some test data into GridFS.
func setUpGridFSTestData() (map[string]int, error) {
sessionProvider, err := db.NewSessionProvider(*toolOptions)
Expand Down
43 changes: 9 additions & 34 deletions mongoimport/mongoimport_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
"github.com/mongodb/mongo-tools/common/options"
"github.com/mongodb/mongo-tools/common/testtype"
"github.com/mongodb/mongo-tools/common/testutil"
"github.com/mongodb/mongo-tools/common/wcwrapper"
. "github.com/smartystreets/goconvey/convey"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -106,27 +105,14 @@ func countDocuments(t *testing.T, sessionProvider *db.SessionProvider) (int, err
// getBasicToolOptions returns a test helper to instantiate the session provider
// for calls to StreamDocument.
func getBasicToolOptions() *options.ToolOptions {
general := &options.General{}
ssl := testutil.GetSSLOptions()
auth := testutil.GetAuthOptions()
namespace := &options.Namespace{
DB: testDb,
Collection: testCollection,
}
connection := &options.Connection{
Host: "localhost",
Port: db.DefaultTestPort,
toolOptions, err := testutil.GetToolOptions()
if err != nil {
panic(fmt.Sprintf("could not get tool options: %v", err))
}
toolOptions.Namespace.DB = testDb
toolOptions.Namespace.Collection = testCollection

return &options.ToolOptions{
General: general,
SSL: &ssl,
Namespace: namespace,
Connection: connection,
Auth: &auth,
URI: &options.URI{},
WriteConcern: wcwrapper.Majority(),
}
return toolOptions
}

func newOptions() Options {
Expand Down Expand Up @@ -1904,20 +1890,9 @@ func TestImportModeByID(t *testing.T) {

func newImportTestClient(t *testing.T, dbName string) *mongo.Client {
t.Helper()
ssl := testutil.GetSSLOptions()
auth := testutil.GetAuthOptions()
sessionProvider, err := db.NewSessionProvider(options.ToolOptions{
General: &options.General{},
SSL: &ssl,
Connection: &options.Connection{
Host: "localhost",
Port: db.DefaultTestPort,
},
Auth: &auth,
URI: &options.URI{},
Namespace: &options.Namespace{},
WriteConcern: wcwrapper.Majority(),
})
toolOptions, err := testutil.GetToolOptions()
require.NoError(t, err, "should get tool options")
sessionProvider, err := db.NewSessionProvider(*toolOptions)
require.NoError(t, err, "should create session provider")
client, err := sessionProvider.GetSession()
require.NoError(t, err, "should get session")
Expand Down