From 092abb8cd450fb9865b0166ace72ca4e70b22fd4 Mon Sep 17 00:00:00 2001 From: Luiz Aoqui Date: Thu, 2 Sep 2021 11:36:02 -0400 Subject: [PATCH] test: use Len instead of Equal on system and sysbatch node constraint tests --- scheduler/scheduler_sysbatch_test.go | 4 ++-- scheduler/scheduler_system_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scheduler/scheduler_sysbatch_test.go b/scheduler/scheduler_sysbatch_test.go index e7c23b36a..302c5c0bd 100644 --- a/scheduler/scheduler_sysbatch_test.go +++ b/scheduler/scheduler_sysbatch_test.go @@ -934,7 +934,7 @@ func TestSysBatch_JobConstraint_AddNode(t *testing.T) { require.Equal(t, "complete", h.Evals[1].Status) // Ensure no new plans - require.Equal(t, 1, len(h.Plans)) + require.Len(t, h.Plans, 1) // Ensure all NodeAllocations are from first Eval for _, allocs := range h.Plans[0].NodeAllocation { @@ -966,7 +966,7 @@ func TestSysBatch_JobConstraint_AddNode(t *testing.T) { require.Equal(t, "complete", h.Evals[2].Status) // Ensure `groupA` fails to be placed due to its constraint, but `groupB` doesn't - require.Equal(t, 1, len(h.Evals[2].FailedTGAllocs)) + require.Len(t, h.Evals[2].FailedTGAllocs, 1) require.Contains(t, h.Evals[2].FailedTGAllocs, "groupA") require.NotContains(t, h.Evals[2].FailedTGAllocs, "groupB") diff --git a/scheduler/scheduler_system_test.go b/scheduler/scheduler_system_test.go index c5c390f02..b46bbc9e4 100644 --- a/scheduler/scheduler_system_test.go +++ b/scheduler/scheduler_system_test.go @@ -1264,7 +1264,7 @@ func TestSystemSched_JobConstraint_AddNode(t *testing.T) { require.Equal(t, "complete", h.Evals[1].Status) // Ensure no new plans - require.Equal(t, 1, len(h.Plans)) + require.Len(t, h.Plans, 1) // Ensure all NodeAllocations are from first Eval for _, allocs := range h.Plans[0].NodeAllocation { @@ -1296,7 +1296,7 @@ func TestSystemSched_JobConstraint_AddNode(t *testing.T) { require.Equal(t, "complete", h.Evals[2].Status) // Ensure `groupA` fails to be placed due to its constraint, but `groupB` doesn't - require.Equal(t, 1, len(h.Evals[2].FailedTGAllocs)) + require.Len(t, h.Evals[2].FailedTGAllocs, 1) require.Contains(t, h.Evals[2].FailedTGAllocs, "groupA") require.NotContains(t, h.Evals[2].FailedTGAllocs, "groupB")