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

tests: use GreaterOrEqual and apply change to other tests

Browse source
This commit is contained in:
Mahmood Ali 2020-05-27 10:10:13 -04:00
parent 6dfe0f5d3b
commit 61e4f5aaf9
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
nomad/drainer_int_test.go
View file

@ -219,7 +219,8 @@ func TestDrainer_Simple_ServiceOnly(t *testing.T) {
// Check we got the right events // Check we got the right events
node, err := state.NodeByID(nil, n1.ID) node, err := state.NodeByID(nil, n1.ID)
require.NoError(err) require.NoError(err)
require.Len(node.Events, 3) // sometimes test gets a duplicate node drain complete event
require.GreaterOrEqualf(len(node.Events), 3, "unexpected number of events: %v", node.Events)
require.Equal(drainer.NodeDrainEventComplete, node.Events[2].Message) require.Equal(drainer.NodeDrainEventComplete, node.Events[2].Message)
} }
@ -314,7 +315,8 @@ func TestDrainer_Simple_ServiceOnly_Deadline(t *testing.T) {
// Check we got the right events // Check we got the right events
node, err := state.NodeByID(nil, n1.ID) node, err := state.NodeByID(nil, n1.ID)
require.NoError(err) require.NoError(err)
require.Len(node.Events, 3) // sometimes test gets a duplicate node drain complete event
require.GreaterOrEqualf(len(node.Events), 3, "unexpected number of events: %v", node.Events)
require.Equal(drainer.NodeDrainEventComplete, node.Events[2].Message) require.Equal(drainer.NodeDrainEventComplete, node.Events[2].Message)
require.Contains(node.Events[2].Details, drainer.NodeDrainEventDetailDeadlined) require.Contains(node.Events[2].Details, drainer.NodeDrainEventDetailDeadlined)
} }
@ -365,7 +367,8 @@ func TestDrainer_DrainEmptyNode(t *testing.T) {
// Check we got the right events // Check we got the right events
node, err := state.NodeByID(nil, n1.ID) node, err := state.NodeByID(nil, n1.ID)
require.NoError(err) require.NoError(err)
require.Len(node.Events, 3) // sometimes test gets a duplicate node drain complete event
require.GreaterOrEqualf(len(node.Events), 3, "unexpected number of events: %v", node.Events)
require.Equal(drainer.NodeDrainEventComplete, node.Events[2].Message) require.Equal(drainer.NodeDrainEventComplete, node.Events[2].Message)
} }
@ -529,7 +532,8 @@ func TestDrainer_AllTypes_Deadline(t *testing.T) {
// Check we got the right events // Check we got the right events
node, err := state.NodeByID(nil, n1.ID) node, err := state.NodeByID(nil, n1.ID)
require.NoError(err) require.NoError(err)
require.Len(node.Events, 3) // sometimes test gets a duplicate node drain complete event
require.GreaterOrEqualf(len(node.Events), 3, "unexpected number of events: %v", node.Events)
require.Equal(drainer.NodeDrainEventComplete, node.Events[2].Message) require.Equal(drainer.NodeDrainEventComplete, node.Events[2].Message)
require.Contains(node.Events[2].Details, drainer.NodeDrainEventDetailDeadlined) require.Contains(node.Events[2].Details, drainer.NodeDrainEventDetailDeadlined)
} }
@ -698,9 +702,7 @@ func TestDrainer_AllTypes_NoDeadline(t *testing.T) {
require.NoError(err) require.NoError(err)
// sometimes test gets a duplicate node drain complete event // sometimes test gets a duplicate node drain complete event
if len(node.Events) < 3 { require.GreaterOrEqualf(len(node.Events), 3, "unexpected number of events: %v", node.Events)
require.Len(node.Events, 3, "expected at least 3 events")
}
require.Equal(drainer.NodeDrainEventComplete, node.Events[2].Message) require.Equal(drainer.NodeDrainEventComplete, node.Events[2].Message)
} }
@ -872,7 +874,8 @@ func TestDrainer_AllTypes_Deadline_GarbageCollectedNode(t *testing.T) {
// Check we got the right events // Check we got the right events
node, err := state.NodeByID(nil, n1.ID) node, err := state.NodeByID(nil, n1.ID)
require.NoError(err) require.NoError(err)
require.Len(node.Events, 3) // sometimes test gets a duplicate node drain complete event
require.GreaterOrEqualf(len(node.Events), 3, "unexpected number of events: %v", node.Events)
require.Equal(drainer.NodeDrainEventComplete, node.Events[2].Message) require.Equal(drainer.NodeDrainEventComplete, node.Events[2].Message)
require.Contains(node.Events[2].Details, drainer.NodeDrainEventDetailDeadlined) require.Contains(node.Events[2].Details, drainer.NodeDrainEventDetailDeadlined)
} }
@ -1017,7 +1020,8 @@ func TestDrainer_Batch_TransitionToForce(t *testing.T) {
// Check we got the right events // Check we got the right events
node, err := state.NodeByID(nil, n1.ID) node, err := state.NodeByID(nil, n1.ID)
require.NoError(err) require.NoError(err)
require.Len(node.Events, 4) // sometimes test gets a duplicate node drain complete event
require.GreaterOrEqualf(len(node.Events), 4, "unexpected number of events: %v", node.Events)
require.Equal(drainer.NodeDrainEventComplete, node.Events[3].Message) require.Equal(drainer.NodeDrainEventComplete, node.Events[3].Message)
require.Contains(node.Events[3].Details, drainer.NodeDrainEventDetailDeadlined) require.Contains(node.Events[3].Details, drainer.NodeDrainEventDetailDeadlined)
}) })