Fix tests

Author: timvaillancourt

go/mysql/connection_test.go

@@ -24,9 +24,9 @@ func init() {
 func TestNewConnectionConfig(t *testing.T) {
 	c := NewConnectionConfig()
 	test.S(t).ExpectEquals(c.Key.Hostname, "")
-	test.S(t).ExpectEquals(c.Key.Port, 0)
+	test.S(t).ExpectEquals(c.Key.Port, int64(0))
 	test.S(t).ExpectEquals(c.ImpliedKey.Hostname, "")
-	test.S(t).ExpectEquals(c.ImpliedKey.Port, 0)
+	test.S(t).ExpectEquals(c.ImpliedKey.Port, int64(0))
 	test.S(t).ExpectEquals(c.User, "")
 	test.S(t).ExpectEquals(c.Password, "")
 	test.S(t).ExpectEquals(c.TransactionIsolation, "")
@@ -45,9 +45,9 @@ func TestDuplicateCredentials(t *testing.T) {
 
 	dup := c.DuplicateCredentials(InstanceKey{Hostname: "otherhost", Port: 3310})
 	test.S(t).ExpectEquals(dup.Key.Hostname, "otherhost")
-	test.S(t).ExpectEquals(dup.Key.Port, 3310)
+	test.S(t).ExpectEquals(dup.Key.Port, int64(3310))
 	test.S(t).ExpectEquals(dup.ImpliedKey.Hostname, "otherhost")
-	test.S(t).ExpectEquals(dup.ImpliedKey.Port, 3310)
+	test.S(t).ExpectEquals(dup.ImpliedKey.Port, int64(3310))
 	test.S(t).ExpectEquals(dup.User, "gromit")
 	test.S(t).ExpectEquals(dup.Password, "penguin")
 	test.S(t).ExpectEquals(dup.tlsConfig, c.tlsConfig)
@@ -63,9 +63,9 @@ func TestDuplicate(t *testing.T) {
 
 	dup := c.Duplicate()
 	test.S(t).ExpectEquals(dup.Key.Hostname, "myhost")
-	test.S(t).ExpectEquals(dup.Key.Port, 3306)
+	test.S(t).ExpectEquals(dup.Key.Port, int64(3306))
 	test.S(t).ExpectEquals(dup.ImpliedKey.Hostname, "myhost")
-	test.S(t).ExpectEquals(dup.ImpliedKey.Port, 3306)
+	test.S(t).ExpectEquals(dup.ImpliedKey.Port, int64(3306))
 	test.S(t).ExpectEquals(dup.User, "gromit")
 	test.S(t).ExpectEquals(dup.Password, "penguin")
 	test.S(t).ExpectEquals(dup.TransactionIsolation, transactionIsolation)

go/mysql/instance_key_test.go

@@ -21,43 +21,43 @@ func TestParseInstanceKey(t *testing.T) {
 		key, err := ParseInstanceKey("myhost:1234")
 		test.S(t).ExpectNil(err)
 		test.S(t).ExpectEquals(key.Hostname, "myhost")
-		test.S(t).ExpectEquals(key.Port, 1234)
+		test.S(t).ExpectEquals(key.Port, int64(1234))
 	}
 	{
 		key, err := ParseInstanceKey("myhost")
 		test.S(t).ExpectNil(err)
 		test.S(t).ExpectEquals(key.Hostname, "myhost")
-		test.S(t).ExpectEquals(key.Port, 3306)
+		test.S(t).ExpectEquals(key.Port, DefaultInstancePort)
 	}
 	{
 		key, err := ParseInstanceKey("10.0.0.3:3307")
 		test.S(t).ExpectNil(err)
 		test.S(t).ExpectEquals(key.Hostname, "10.0.0.3")
-		test.S(t).ExpectEquals(key.Port, 3307)
+		test.S(t).ExpectEquals(key.Port, int64(3307))
 	}
 	{
 		key, err := ParseInstanceKey("10.0.0.3")
 		test.S(t).ExpectNil(err)
 		test.S(t).ExpectEquals(key.Hostname, "10.0.0.3")
-		test.S(t).ExpectEquals(key.Port, 3306)
+		test.S(t).ExpectEquals(key.Port, DefaultInstancePort)
 	}
 	{
 		key, err := ParseInstanceKey("[2001:db8:1f70::999:de8:7648:6e8]:3308")
 		test.S(t).ExpectNil(err)
 		test.S(t).ExpectEquals(key.Hostname, "2001:db8:1f70::999:de8:7648:6e8")
-		test.S(t).ExpectEquals(key.Port, 3308)
+		test.S(t).ExpectEquals(key.Port, int64(3308))
 	}
 	{
 		key, err := ParseInstanceKey("::1")
 		test.S(t).ExpectNil(err)
 		test.S(t).ExpectEquals(key.Hostname, "::1")
-		test.S(t).ExpectEquals(key.Port, 3306)
+		test.S(t).ExpectEquals(key.Port, DefaultInstancePort)
 	}
 	{
 		key, err := ParseInstanceKey("0:0:0:0:0:0:0:0")
 		test.S(t).ExpectNil(err)
 		test.S(t).ExpectEquals(key.Hostname, "0:0:0:0:0:0:0:0")
-		test.S(t).ExpectEquals(key.Port, 3306)
+		test.S(t).ExpectEquals(key.Port, DefaultInstancePort)
 	}
 	{
 		_, err := ParseInstanceKey("[2001:xxxx:1f70::999:de8:7648:6e8]:3308")