luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

update test for more realistic IP address from go-discover

Browse source
This commit is contained in:
Chelsea Holland Komlo 2018-05-04 16:21:17 -04:00
parent 8d3c739832
commit 5422b1b088
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
command/agent/retry_join.go
View file

@ -51,14 +51,15 @@ func (r *retryJoiner) RetryJoin(config *Config) {
attempt := 0
r.logger.Printf("[INFO] agent: Joining cluster...")
addrsToJoin := strings.Join(config.Server.RetryJoin, " ")
r.logger.Printf("[INFO] agent: Joining cluster... %s", addrsToJoin)
for {
var addrs []string
for _, addr := range config.Server.RetryJoin {
switch {
case strings.Contains(addr, "provider"):
case strings.Contains(addr, "provider="):
servers, err := r.discover.Addrs(addr, r.logger)
if err != nil {
r.logger.Printf("[ERR] agent: Join error %s", err)
@ -70,7 +71,13 @@ func (r *retryJoiner) RetryJoin(config *Config) {
}
}
if len(addrs) == 0 {
r.logger.Printf("[INFO] agent: Join completed. no addresses specified to sync with")
return
}
n, err := r.join(addrs)
if err == nil {
r.logger.Printf("[INFO] agent: Join completed. Synced with %d initial agents", n)
return

24
command/agent/retry_join_test.go
View file

@ -13,10 +13,15 @@ import (
"github.com/stretchr/testify/require"
)
type MockDiscover struct{}
type MockDiscover struct {
ReceivedAddrs string
}
const stubAddress = "127.0.0.1"
func (m *MockDiscover) Addrs(s string, l *log.Logger) ([]string, error) {
return []string{s}, nil
m.ReceivedAddrs = s
return []string{stubAddress}, nil
}
func (m *MockDiscover) Help() string { return "" }
func (m *MockDiscover) Names() []string {
@ -102,7 +107,7 @@ func TestRetryJoin_NonCloud(t *testing.T) {
joiner.RetryJoin(newConfig)
require.Equal(1, len(output))
require.Equal("127.0.0.1", output[0])
require.Equal(stubAddress, output[0])
}
func TestRetryJoin_Cloud(t *testing.T) {
@ -124,8 +129,9 @@ func TestRetryJoin_Cloud(t *testing.T) {
return 0, nil
}
mockDiscover := &MockDiscover{}
joiner := retryJoiner{
discover: &MockDiscover{},
discover: mockDiscover,
join: mockJoin,
logger: log.New(ioutil.Discard, "", 0),
errCh: make(chan struct{}),
@ -134,7 +140,8 @@ func TestRetryJoin_Cloud(t *testing.T) {
joiner.RetryJoin(newConfig)
require.Equal(1, len(output))
require.Equal("provider=aws, tag_value=foo", output[0])
require.Equal("provider=aws, tag_value=foo", mockDiscover.ReceivedAddrs)
require.Equal(stubAddress, output[0])
}
func TestRetryJoin_MixedProvider(t *testing.T) {
@ -156,8 +163,9 @@ func TestRetryJoin_MixedProvider(t *testing.T) {
return 0, nil
}
mockDiscover := &MockDiscover{}
joiner := retryJoiner{
discover: &MockDiscover{},
discover: mockDiscover,
join: mockJoin,
logger: log.New(ioutil.Discard, "", 0),
errCh: make(chan struct{}),
@ -166,6 +174,6 @@ func TestRetryJoin_MixedProvider(t *testing.T) {
joiner.RetryJoin(newConfig)
require.Equal(2, len(output))
require.Equal("provider=aws, tag_value=foo", output[0])
require.Equal("127.0.0.1", output[1])
require.Equal("provider=aws, tag_value=foo", mockDiscover.ReceivedAddrs)
require.Equal(stubAddress, output[0])
}