kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 02:15:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Tests build

Browse Source
This commit is contained in:
Alex Dadgar
2017-02-02 17:50:06 -08:00
parent 90f71651e3
commit 7a1bdf9696
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nomad/heartbeat_test.go
View File

@@ -199,7 +199,7 @@ func TestServer_HeartbeatTTL_Failover(t *testing.T) {
testutil.WaitForResult(func() (bool, error) {
peers, _ := s1.numPeers()
return len(peers) == 3, nil
return peers == 3, nil
}, func(err error) {
t.Fatalf("should have 3 peers")
})

16
nomad/leader_test.go
View File

@@ -30,7 +30,7 @@ func TestLeader_LeftServer(t *testing.T) {
for _, s := range servers {
testutil.WaitForResult(func() (bool, error) {
peers, _ := s.numPeers()
return len(peers) == 3, nil
return peers == 3, nil
}, func(err error) {
t.Fatalf("should have 3 peers")
})
@@ -49,7 +49,7 @@ func TestLeader_LeftServer(t *testing.T) {
for _, s := range servers[1:] {
peers, _ := s.numPeers()
return len(peers) == 2, errors.New(fmt.Sprintf("%v", peers))
return peers == 2, errors.New(fmt.Sprintf("%v", peers))
}
return true, nil
@@ -77,7 +77,7 @@ func TestLeader_LeftLeader(t *testing.T) {
for _, s := range servers {
testutil.WaitForResult(func() (bool, error) {
peers, _ := s.numPeers()
return len(peers) == 3, nil
return peers == 3, nil
}, func(err error) {
t.Fatalf("should have 3 peers")
})
@@ -103,7 +103,7 @@ func TestLeader_LeftLeader(t *testing.T) {
}
testutil.WaitForResult(func() (bool, error) {
peers, _ := s.numPeers()
return len(peers) == 2, errors.New(fmt.Sprintf("%v", peers))
return peers == 2, errors.New(fmt.Sprintf("%v", peers))
}, func(err error) {
t.Fatalf("should have 2 peers: %v", err)
})
@@ -131,7 +131,7 @@ func TestLeader_MultiBootstrap(t *testing.T) {
// Ensure we don't have multiple raft peers
for _, s := range servers {
peers, _ := s.numPeers()
if len(peers) != 1 {
if peers != 1 {
t.Fatalf("should only have 1 raft peer!")
}
}
@@ -156,7 +156,7 @@ func TestLeader_PlanQueue_Reset(t *testing.T) {
for _, s := range servers {
testutil.WaitForResult(func() (bool, error) {
peers, _ := s.numPeers()
return len(peers) == 3, nil
return peers == 3, nil
}, func(err error) {
t.Fatalf("should have 3 peers")
})
@@ -233,7 +233,7 @@ func TestLeader_EvalBroker_Reset(t *testing.T) {
for _, s := range servers {
testutil.WaitForResult(func() (bool, error) {
peers, _ := s.numPeers()
return len(peers) == 3, nil
return peers == 3, nil
}, func(err error) {
t.Fatalf("should have 3 peers")
})
@@ -310,7 +310,7 @@ func TestLeader_PeriodicDispatcher_Restore_Adds(t *testing.T) {
for _, s := range servers {
testutil.WaitForResult(func() (bool, error) {
peers, _ := s.numPeers()
return len(peers) == 3, nil
return peers == 3, nil
}, func(err error) {
t.Fatalf("should have 3 peers")
})

2
nomad/node_endpoint_test.go
View File

@@ -537,7 +537,7 @@ func TestClientEndpoint_UpdateStatus_HeartbeatOnly(t *testing.T) {
for _, s := range servers {
testutil.WaitForResult(func() (bool, error) {
peers, _ := s.numPeers()
return len(peers) == 3, nil
return peers == 3, nil
}, func(err error) {
t.Fatalf("should have 3 peers")
})

8
nomad/serf_test.go
View File

@@ -106,14 +106,14 @@ func TestNomad_BootstrapExpect(t *testing.T) {
testJoin(t, s1, s2)
testutil.WaitForResult(func() (bool, error) {
peers, err := s1.numOtherPeers()
peers, err := s1.numPeers()
if err != nil {
return false, err
}
if peers != 1 {
return false, fmt.Errorf("bad: %#v", peers)
}
peers, err = s2.numOtherPeers()
peers, err = s2.numPeers()
if err != nil {
return false, err
}
@@ -163,8 +163,8 @@ func TestNomad_BadExpect(t *testing.T) {
testutil.WaitForResult(func() (bool, error) {
for _, s := range servers {
p, _ := s.numPeers()
if len(p) != 0 {
return false, fmt.Errorf("%d", len(p))
if p != 0 {
return false, fmt.Errorf("%d", p)
}
}
return true, nil