simplify logic

hashicorp · Mar 15, 2018 · bd262da · bd262da
1 parent 8f3b9fb
commit bd262da
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/scheduler/feasible.go b/scheduler/feasible.go
@@ -158,9 +158,7 @@ func (c *DriverChecker) hasDrivers(option *structs.Node) bool {
 				return false
 			}
 
-			if !enabled {
-				return false
-			}
+			return enabled
 		}
 	}
 	return true

diff --git a/scheduler/feasible_test.go b/scheduler/feasible_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/hashicorp/nomad/helper/uuid"
 	"github.com/hashicorp/nomad/nomad/mock"
 	"github.com/hashicorp/nomad/nomad/structs"
+	"github.com/stretchr/testify/require"
 )
 
 func TestStaticIterator_Reset(t *testing.T) {
@@ -127,7 +128,9 @@ func TestDriverChecker(t *testing.T) {
 }
 
 func TestDriverChecker_HealthChecks(t *testing.T) {
+	require := require.New(t)
 	_, ctx := testContext(t)
+
 	nodes := []*structs.Node{
 		mock.Node(),
 		mock.Node(),
@@ -182,9 +185,8 @@ func TestDriverChecker_HealthChecks(t *testing.T) {
 			testDrivers[i]: {},
 		}
 		checker := NewDriverChecker(ctx, drivers)
-		if act := checker.Feasible(c.Node); act != c.Result {
-			t.Fatalf("case(%d) failed: got %v; want %v", i, act, c.Result)
-		}
+		act := checker.Feasible(c.Node)
+		require.Equal(act, c.Result)
 	}
 }