Skip to content

Fix more tests #117

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

Merged
merged 1 commit into from
Nov 5, 2018
Merged

Fix more tests #117

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
3 changes: 1 addition & 2 deletions internal/oplog/oplog_apply_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/globalsign/mgo/bson"
"github.com/percona/mongodb-backup/bsonfile"
"github.com/percona/mongodb-backup/internal/testutils"
"github.com/percona/mongodb-backup/internal/testutils/db"
)

func TestBasicApplyLog(t *testing.T) {
Expand All @@ -27,7 +26,7 @@ func TestBasicApplyLog(t *testing.T) {
fmt.Printf("Dumping the oplog into %q\n", tmpfile.Name())
}

session, err := mgo.DialWithInfo(db.PrimaryDialInfo(t, testutils.MongoDBShard1ReplsetName))
session, err := mgo.DialWithInfo(testutils.PrimaryDialInfo(t, testutils.MongoDBShard1ReplsetName))
ot, err := Open(session)
if err != nil {
t.Fatalf("Cannot instantiate the oplog tailer: %s", err)
Expand Down
11 changes: 5 additions & 6 deletions internal/oplog/oplog_tail_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"github.com/globalsign/mgo/bson"
"github.com/percona/mongodb-backup/bsonfile"
"github.com/percona/mongodb-backup/internal/testutils"
"github.com/percona/mongodb-backup/internal/testutils/db"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
Expand Down Expand Up @@ -71,7 +70,7 @@ func TestMain(m *testing.M) {
}

func TestDetermineOplogCollectionName(t *testing.T) {
session, err := mgo.DialWithInfo(db.PrimaryDialInfo(t, testutils.MongoDBShard1ReplsetName))
session, err := mgo.DialWithInfo(testutils.PrimaryDialInfo(t, testutils.MongoDBShard1ReplsetName))
if err != nil {
t.Fatalf("Cannot connect to MongoDB: %s", err)
}
Expand All @@ -88,7 +87,7 @@ func TestDetermineOplogCollectionName(t *testing.T) {
}

func TestBasicReader(t *testing.T) {
session, err := mgo.DialWithInfo(db.PrimaryDialInfo(t, testutils.MongoDBShard1ReplsetName))
session, err := mgo.DialWithInfo(testutils.PrimaryDialInfo(t, testutils.MongoDBShard1ReplsetName))
if err != nil {
t.Fatalf("Cannot connect to MongoDB: %s", err)
}
Expand Down Expand Up @@ -138,7 +137,7 @@ func TestTailerCopy(t *testing.T) {
defer os.Remove(tmpfile.Name()) // clean up
}

session, err := mgo.DialWithInfo(db.PrimaryDialInfo(t, testutils.MongoDBShard1ReplsetName))
session, err := mgo.DialWithInfo(testutils.PrimaryDialInfo(t, testutils.MongoDBShard1ReplsetName))
if err != nil {
t.Fatalf("Cannot connect to MongoDB: %s", err)
}
Expand Down Expand Up @@ -171,7 +170,7 @@ func TestTailerCopy(t *testing.T) {
}

func TestSeveralOplogDocTypes(t *testing.T) {
session, err := mgo.DialWithInfo(db.PrimaryDialInfo(t, testutils.MongoDBShard1ReplsetName))
session, err := mgo.DialWithInfo(testutils.PrimaryDialInfo(t, testutils.MongoDBShard1ReplsetName))
// Start tailing the oplog
defer session.Close()

Expand Down Expand Up @@ -257,7 +256,7 @@ func TestUploadOplogToS3(t *testing.T) {
bucket := fmt.Sprintf("percona-mongodb-backup-test-%05d", rand.Int63n(100000))
filename := "percona-mongodb-backup-oplog"

mdbSession, err := mgo.DialWithInfo(db.PrimaryDialInfo(t, testutils.MongoDBShard1ReplsetName))
mdbSession, err := mgo.DialWithInfo(testutils.PrimaryDialInfo(t, testutils.MongoDBShard1ReplsetName))
if err != nil {
t.Errorf("Cannot connect to MongoDB: %s", err)
t.Fail()
Expand Down
19 changes: 10 additions & 9 deletions internal/testutils/grpc/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/percona/mongodb-backup/grpc/api"
"github.com/percona/mongodb-backup/grpc/client"
"github.com/percona/mongodb-backup/grpc/server"
"github.com/percona/mongodb-backup/internal/testutils"
pbapi "github.com/percona/mongodb-backup/proto/api"
pb "github.com/percona/mongodb-backup/proto/messages"
"github.com/prometheus/common/log"
Expand Down Expand Up @@ -101,17 +102,17 @@ func NewGrpcDaemon(ctx context.Context, workDir string, t *testing.T, logger *lo
clientServerAddr := fmt.Sprintf("127.0.0.1:%s", TEST_GRPC_MESSAGES_PORT)
clientConn, err := grpc.Dial(clientServerAddr, clientOpts...)

ports := []string{MongoDBShard1PrimaryPort, MongoDBShard1Secondary1Port, MongoDBShard1Secondary2Port,
MongoDBShard2PrimaryPort, MongoDBShard2Secondary1Port, MongoDBShard2Secondary2Port,
MongoDBConfigsvr1Port, // MongoDBConfigsvr2Port, MongoDBConfigsvr3Port,
MongoDBMongosPort}
repls := []string{MongoDBShard1ReplsetName, MongoDBShard1ReplsetName, MongoDBShard1ReplsetName,
MongoDBShard2ReplsetName, MongoDBShard2ReplsetName, MongoDBShard2ReplsetName,
MongoDBConfigsvrReplsetName, // MongoDBConfigsvrReplsetName, MongoDBConfigsvrReplsetName,
ports := []string{testutils.MongoDBShard1PrimaryPort, testutils.MongoDBShard1Secondary1Port, testutils.MongoDBShard1Secondary2Port,
testutils.MongoDBShard2PrimaryPort, testutils.MongoDBShard2Secondary1Port, testutils.MongoDBShard2Secondary2Port,
testutils.MongoDBConfigsvr1Port, // testutils.MongoDBConfigsvr2Port, testutils.MongoDBConfigsvr3Port,
testutils.MongoDBMongosPort}
repls := []string{testutils.MongoDBShard1ReplsetName, testutils.MongoDBShard1ReplsetName, testutils.MongoDBShard1ReplsetName,
testutils.MongoDBShard2ReplsetName, testutils.MongoDBShard2ReplsetName, testutils.MongoDBShard2ReplsetName,
testutils.MongoDBConfigsvrReplsetName, // testutils.MongoDBConfigsvrReplsetName, testutils.MongoDBConfigsvrReplsetName,
""}

for i, port := range ports {
di := DialInfoForPort(t, repls[i], port)
di := testutils.DialInfoForPort(t, repls[i], port)
session, err := mgo.DialWithInfo(di)
logger.Infof("Connecting agent #%d to: %s\n", i, di.Addrs[0])
if err != nil {
Expand All @@ -122,7 +123,7 @@ func NewGrpcDaemon(ctx context.Context, workDir string, t *testing.T, logger *lo
agentID := fmt.Sprintf("PMB-%03d", i)

dbConnOpts := client.ConnectionOptions{
Host: MongoDBHost,
Host: testutils.MongoDBHost,
Port: port,
User: di.Username,
Password: di.Password,
Expand Down