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

fix test compiling

This commit is contained in:
Alex Dadgar 2018-10-04 16:16:08 -07:00 committed by Michael Schurter
parent 7d9c069f09
commit 9baa7402ef
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/allocwatcher/alloc_watcher_test.go
View File

@ -45,7 +45,7 @@ func newFakeAllocRunner(t *testing.T, logger hclog.Logger) *fakeAllocRunner {
return &fakeAllocRunner{ return &fakeAllocRunner{
alloc: alloc, alloc: alloc,
AllocDir: allocdir.NewAllocDir(logger, path), AllocDir: allocdir.NewAllocDir(logger, path),
Broadcaster: cstructs.NewAllocBroadcaster(alloc), Broadcaster: cstructs.NewAllocBroadcaster(),
} }
} }

6
client/servers/manager_internal_test.go
View File

@ -36,14 +36,14 @@ func (cp *fauxConnPool) Ping(net.Addr) error {
} }
func testManager(t *testing.T) (m *Manager) { func testManager(t *testing.T) (m *Manager) {
logger := testlog.Logger(t) logger := testlog.HCLogger(t)
shutdownCh := make(chan struct{}) shutdownCh := make(chan struct{})
m = New(logger, shutdownCh, &fauxConnPool{}) m = New(logger, shutdownCh, &fauxConnPool{})
return m return m
} }
func testManagerFailProb(t *testing.T, failPct float64) (m *Manager) { func testManagerFailProb(t *testing.T, failPct float64) (m *Manager) {
logger := testlog.Logger(t) logger := testlog.HCLogger(t)
shutdownCh := make(chan struct{}) shutdownCh := make(chan struct{})
m = New(logger, shutdownCh, &fauxConnPool{failPct: failPct}) m = New(logger, shutdownCh, &fauxConnPool{failPct: failPct})
return m return m
@ -136,7 +136,7 @@ func TestManagerInternal_refreshServerRebalanceTimer(t *testing.T) {
{1000000, 19, 10 * time.Minute}, {1000000, 19, 10 * time.Minute},
} }
logger := testlog.Logger(t) logger := testlog.HCLogger(t)
shutdownCh := make(chan struct{}) shutdownCh := make(chan struct{})
for _, s := range clusters { for _, s := range clusters {

6
client/servers/manager_test.go
View File

@ -33,14 +33,14 @@ func (cp *fauxConnPool) Ping(net.Addr) error {
} }
func testManager(t *testing.T) (m *servers.Manager) { func testManager(t *testing.T) (m *servers.Manager) {
logger := testlog.Logger(t) logger := testlog.HCLogger(t)
shutdownCh := make(chan struct{}) shutdownCh := make(chan struct{})
m = servers.New(logger, shutdownCh, &fauxConnPool{}) m = servers.New(logger, shutdownCh, &fauxConnPool{})
return m return m
} }
func testManagerFailProb(t *testing.T, failPct float64) (m *servers.Manager) { func testManagerFailProb(t *testing.T, failPct float64) (m *servers.Manager) {
logger := testlog.Logger(t) logger := testlog.HCLogger(t)
shutdownCh := make(chan struct{}) shutdownCh := make(chan struct{})
m = servers.New(logger, shutdownCh, &fauxConnPool{failPct: failPct}) m = servers.New(logger, shutdownCh, &fauxConnPool{failPct: failPct})
return m return m
@ -113,7 +113,7 @@ func TestServers_FindServer(t *testing.T) {
} }
func TestServers_New(t *testing.T) { func TestServers_New(t *testing.T) {
logger := testlog.Logger(t) logger := testlog.HCLogger(t)
shutdownCh := make(chan struct{}) shutdownCh := make(chan struct{})
m := servers.New(logger, shutdownCh, &fauxConnPool{}) m := servers.New(logger, shutdownCh, &fauxConnPool{})
if m == nil { if m == nil {

2
client/stats/cpu_test.go
View File

@ -26,7 +26,7 @@ func TestHostStats_CPU(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
assert.Nil(shelpers.Init()) assert.Nil(shelpers.Init())
logger := testlog.Logger(t) logger := testlog.HCLogger(t)
cwd, err := os.Getwd() cwd, err := os.Getwd()
assert.Nil(err) assert.Nil(err)
hs := NewHostStatsCollector(logger, cwd) hs := NewHostStatsCollector(logger, cwd)

8
client/vaultclient/vaultclient_test.go
View File

@ -16,7 +16,7 @@ func TestVaultClient_TokenRenewals(t *testing.T) {
v := testutil.NewTestVault(t) v := testutil.NewTestVault(t)
defer v.Stop() defer v.Stop()
logger := testlog.Logger(t) logger := testlog.HCLogger(t)
v.Config.ConnectionRetryIntv = 100 * time.Millisecond v.Config.ConnectionRetryIntv = 100 * time.Millisecond
v.Config.TaskTokenTTL = "4s" v.Config.TaskTokenTTL = "4s"
c, err := NewVaultClient(v.Config, logger, nil) c, err := NewVaultClient(v.Config, logger, nil)
@ -100,7 +100,7 @@ func TestVaultClient_Heap(t *testing.T) {
conf.VaultConfig.Token = "testvaulttoken" conf.VaultConfig.Token = "testvaulttoken"
conf.VaultConfig.TaskTokenTTL = "10s" conf.VaultConfig.TaskTokenTTL = "10s"
logger := testlog.Logger(t) logger := testlog.HCLogger(t)
c, err := NewVaultClient(conf.VaultConfig, logger, nil) c, err := NewVaultClient(conf.VaultConfig, logger, nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -203,7 +203,7 @@ func TestVaultClient_RenewNonRenewableLease(t *testing.T) {
v := testutil.NewTestVault(t) v := testutil.NewTestVault(t)
defer v.Stop() defer v.Stop()
logger := testlog.Logger(t) logger := testlog.HCLogger(t)
v.Config.ConnectionRetryIntv = 100 * time.Millisecond v.Config.ConnectionRetryIntv = 100 * time.Millisecond
v.Config.TaskTokenTTL = "4s" v.Config.TaskTokenTTL = "4s"
c, err := NewVaultClient(v.Config, logger, nil) c, err := NewVaultClient(v.Config, logger, nil)
@ -252,7 +252,7 @@ func TestVaultClient_RenewNonexistentLease(t *testing.T) {
v := testutil.NewTestVault(t) v := testutil.NewTestVault(t)
defer v.Stop() defer v.Stop()
logger := testlog.Logger(t) logger := testlog.HCLogger(t)
v.Config.ConnectionRetryIntv = 100 * time.Millisecond v.Config.ConnectionRetryIntv = 100 * time.Millisecond
v.Config.TaskTokenTTL = "4s" v.Config.TaskTokenTTL = "4s"
c, err := NewVaultClient(v.Config, logger, nil) c, err := NewVaultClient(v.Config, logger, nil)