Fix make errors for go version 1.11

Change-Id: I79592813884263721ee8c569a32207bbce6992c0

Author: mattChiaravalloti

core/session/session_pool_test.go

@@ -20,20 +20,20 @@ func TestSessionPool(t *testing.T) {
 		p.timeout = 30 // Set to some arbitrarily high number greater than 1 minute.
 
 		first, err := p.GetSession()
-		testhelpers.RequireNil(t, err, "error getting session", err)
+		testhelpers.RequireNil(t, err, "error getting session %s", err)
 		firstID := first.SessionID
 
 		second, err := p.GetSession()
-		testhelpers.RequireNil(t, err, "error getting session", err)
+		testhelpers.RequireNil(t, err, "error getting session %s", err)
 		secondID := second.SessionID
 
 		p.ReturnSession(first)
 		p.ReturnSession(second)
 
 		sess, err := p.GetSession()
-		testhelpers.RequireNil(t, err, "error getting session", err)
+		testhelpers.RequireNil(t, err, "error getting session %s", err)
 		nextSess, err := p.GetSession()
-		testhelpers.RequireNil(t, err, "error getting session", err)
+		testhelpers.RequireNil(t, err, "error getting session %s", err)
 
 		if sess.SessionID != secondID {
 			t.Errorf("first sesssion ID mismatch. got %s expected %s", sess.SessionID, secondID)
@@ -51,18 +51,18 @@ func TestSessionPool(t *testing.T) {
 		p.timeout = 0
 
 		first, err := p.GetSession()
-		testhelpers.RequireNil(t, err, "error getting session", err)
+		testhelpers.RequireNil(t, err, "error getting session %s", err)
 		firstID := first.SessionID
 
 		second, err := p.GetSession()
-		testhelpers.RequireNil(t, err, "error getting session", err)
+		testhelpers.RequireNil(t, err, "error getting session %s", err)
 		secondID := second.SessionID
 
 		p.ReturnSession(first)
 		p.ReturnSession(second)
 
 		sess, err := p.GetSession()
-		testhelpers.RequireNil(t, err, "error getting session", err)
+		testhelpers.RequireNil(t, err, "error getting session %s", err)
 
 		if sess.SessionID == firstID || sess.SessionID == secondID {
 			t.Errorf("Expired sessions not removed!")

core/topology/topology_test.go

@@ -309,7 +309,7 @@ func TestSessionTimeout(t *testing.T) {
 
 		timeoutChan := time.After(testTimeout)
 		topo.changes <- description.Server{
-			Kind: description.RSPrimary,
+			Kind:                  description.RSPrimary,
 			SessionTimeoutMinutes: 30,
 		}
 		topo.done <- struct{}{}
@@ -338,12 +338,12 @@ func TestSessionTimeout(t *testing.T) {
 
 		timeoutChan := time.After(testTimeout)
 		topo.changes <- description.Server{
-			Kind: description.RSPrimary,
+			Kind:                  description.RSPrimary,
 			SessionTimeoutMinutes: 30,
 		}
 		// should update because new timeout is lower
 		topo.changes <- description.Server{
-			Kind: description.RSPrimary,
+			Kind:                  description.RSPrimary,
 			SessionTimeoutMinutes: 20,
 		}
 		topo.done <- struct{}{}
@@ -372,12 +372,12 @@ func TestSessionTimeout(t *testing.T) {
 
 		timeoutChan := time.After(testTimeout)
 		topo.changes <- description.Server{
-			Kind: description.RSPrimary,
+			Kind:                  description.RSPrimary,
 			SessionTimeoutMinutes: 20,
 		}
 		// should not update because new timeout is higher
 		topo.changes <- description.Server{
-			Kind: description.RSPrimary,
+			Kind:                  description.RSPrimary,
 			SessionTimeoutMinutes: 30,
 		}
 		topo.done <- struct{}{}
@@ -406,12 +406,12 @@ func TestSessionTimeout(t *testing.T) {
 
 		timeoutChan := time.After(testTimeout)
 		topo.changes <- description.Server{
-			Kind: description.RSPrimary,
+			Kind:                  description.RSPrimary,
 			SessionTimeoutMinutes: 20,
 		}
 		// should not update because not a data bearing server
 		topo.changes <- description.Server{
-			Kind: description.Unknown,
+			Kind:                  description.Unknown,
 			SessionTimeoutMinutes: 10,
 		}
 		topo.done <- struct{}{}

mongo/client_options_test.go

@@ -136,23 +136,23 @@ func TestClientOptions_chainAll(t *testing.T) {
 				"mongodb://localhost:27018",
 				"mongodb://localhost:27019",
 			},
-			LocalThresholdSet:         true,
-			LocalThreshold:            time.Second,
-			MaxConnIdleTime:           30 * time.Second,
-			MaxConnIdleTimeSet:        true,
-			MaxConnsPerHost:           150,
-			MaxConnsPerHostSet:        true,
-			MaxIdleConnsPerHost:       20,
-			MaxIdleConnsPerHostSet:    true,
-			ReplicaSet:                "foo",
-			ServerSelectionTimeoutSet: true,
-			ServerSelectionTimeout:    time.Second,
-			Connect:                   connstring.AutoConnect,
-			ConnectSet:                true,
-			SocketTimeout:             2 * time.Second,
-			SocketTimeoutSet:          true,
-			SSL:                       true,
-			SSLSet:                    true,
+			LocalThresholdSet:                  true,
+			LocalThreshold:                     time.Second,
+			MaxConnIdleTime:                    30 * time.Second,
+			MaxConnIdleTimeSet:                 true,
+			MaxConnsPerHost:                    150,
+			MaxConnsPerHostSet:                 true,
+			MaxIdleConnsPerHost:                20,
+			MaxIdleConnsPerHostSet:             true,
+			ReplicaSet:                         "foo",
+			ServerSelectionTimeoutSet:          true,
+			ServerSelectionTimeout:             time.Second,
+			Connect:                            connstring.AutoConnect,
+			ConnectSet:                         true,
+			SocketTimeout:                      2 * time.Second,
+			SocketTimeoutSet:                   true,
+			SSL:                                true,
+			SSLSet:                             true,
 			SSLClientCertificateKeyFile:        "client.pem",
 			SSLClientCertificateKeyFileSet:     true,
 			SSLClientCertificateKeyPassword:    nil,

mongo/command_monitoring_test.go

@@ -167,7 +167,7 @@ func runCmTestFile(t *testing.T, filepath string) {
 
 		coll := db.Collection(collName)
 		err = insertDocuments(doc.Lookup("data").MutableArray(), coll)
-		testhelpers.RequireNil(t, err, "error inserting starting data: %s")
+		testhelpers.RequireNil(t, err, "error inserting starting data: %s", err)
 
 		operationDoc := testDoc.Lookup("operation").MutableDocument()