goling(1) compliance pass (e.g. Rpc* -> RPC)

This commit is contained in:
Sean Chittenden
2016-06-10 23:26:15 -04:00
parent 6819f2b68d
commit 5331ea7bc6
8 changed files with 85 additions and 82 deletions

View File

@@ -119,10 +119,10 @@ func TestAgent_ServerConfig(t *testing.T) {
if addr := out.RPCAdvertise; addr.IP.String() != "127.0.0.1" || addr.Port != 4001 {
t.Fatalf("bad rpc advertise addr: %#v", addr)
}
if addr := a.serverHttpAddr; addr != "10.10.11.1:4005" {
if addr := a.serverHTTPAddr; addr != "10.10.11.1:4005" {
t.Fatalf("expect 10.11.11.1:4005, got: %v", addr)
}
if addr := a.serverRpcAddr; addr != "127.0.0.1:4001" {
if addr := a.serverRPCAddr; addr != "127.0.0.1:4001" {
t.Fatalf("expect 127.0.0.1:4001, got: %v", addr)
}
@@ -158,11 +158,11 @@ func TestAgent_ServerConfig(t *testing.T) {
if addr := out.SerfConfig.MemberlistConfig.BindAddr; addr != "127.0.0.2" {
t.Fatalf("expect 127.0.0.2, got: %s", addr)
}
if addr := a.serverHttpAddr; addr != "127.0.0.2:4646" {
if addr := a.serverHTTPAddr; addr != "127.0.0.2:4646" {
t.Fatalf("expect 127.0.0.2:4646, got: %s", addr)
}
// NOTE: AdvertiseAddr > Addresses > BindAddr > Defaults
if addr := a.serverRpcAddr; addr != "127.0.0.1:4001" {
if addr := a.serverRPCAddr; addr != "127.0.0.1:4001" {
t.Fatalf("expect 127.0.0.1:4001, got: %s", addr)
}
if addr := a.serverSerfAddr; addr != "127.0.0.1:4000" {
@@ -211,10 +211,10 @@ func TestAgent_ServerConfig(t *testing.T) {
if addr := out.SerfConfig.MemberlistConfig.BindAddr; addr != "127.0.0.3" {
t.Fatalf("expect 127.0.0.3, got: %s", addr)
}
if addr := a.serverHttpAddr; addr != "127.0.0.3:4646" {
if addr := a.serverHTTPAddr; addr != "127.0.0.3:4646" {
t.Fatalf("expect 127.0.0.3:4646, got: %s", addr)
}
if addr := a.serverRpcAddr; addr != "127.0.0.3:4647" {
if addr := a.serverRPCAddr; addr != "127.0.0.3:4647" {
t.Fatalf("expect 127.0.0.3:4647, got: %s", addr)
}
if addr := a.serverSerfAddr; addr != "127.0.0.3:4648" {