remove waitAndAssert and type casts

Tibor Vass · Tibor Vass · commit 649201dc4429 · 2019-09-09T21:09:57.000Z
Signed-off-by: Tibor Vass &lt;tibor@docker.com&gt;
diff --git a/integration-cli/docker_api_swarm_test.go b/integration-cli/docker_api_swarm_test.go
@@ -316,7 +316,7 @@ func (s *DockerSwarmSuite) TestAPISwarmLeaderElection(c *testing.T) {
 		followers []*daemon.Daemon // keep track of followers
 	)
 	var lastErr error
-	checkLeader := func(nodes ...*daemon.Daemon) interface{} {
+	checkLeader := func(nodes ...*daemon.Daemon) checkF {
 		return func(c *testing.T) (interface{}, string) {
 			// clear these out before each run
 			leader = nil
diff --git a/integration-cli/docker_utils_test.go b/integration-cli/docker_utils_test.go
@@ -413,54 +413,25 @@ func getErrorMessage(c *testing.T, body []byte) string {
 	return strings.TrimSpace(resp.Message)
 }
 
-func waitAndAssert(t *testing.T, timeout time.Duration, f interface{}, comparison interface{}, args ...interface{}) {
-	t1 := time.Now()
-	defer func() {
-		t2 := time.Now()
-		t.Logf("waited for %v (out of %v)", t2.Sub(t1), timeout)
-	}()
-
-	after := time.After(timeout)
-	for {
-		v, comment := f.(checkF)(t)
-		args = append([]interface{}{v}, args...)
-		shouldAssert := assert.Check(t, comparison, args...)
-		select {
-		case <-after:
-			shouldAssert = true
-		default:
-		}
-		if shouldAssert {
-			if len(comment) > 0 {
-				args = append(args, comment)
-			}
-			assert.Assert(t, comparison, args...)
-			return
-		}
-		time.Sleep(100 * time.Millisecond)
-	}
-}
-
 type checkF func(*testing.T) (interface{}, string)
 type reducer func(...interface{}) interface{}
 
-func pollCheck(t *testing.T, f interface{}, compare func(x interface{}) assert.BoolOrComparison) poll.Check {
+func pollCheck(t *testing.T, f checkF, compare func(x interface{}) assert.BoolOrComparison) poll.Check {
 	return func(poll.LogT) poll.Result {
-		ff := f.(checkF)
-		v, comment := ff(t)
+		v, comment := f(t)
 		if assert.Check(t, compare(v)) {
 			return poll.Success()
 		}
 		return poll.Continue(comment)
 	}
 }
 
-func reducedCheck(r reducer, funcs ...interface{}) checkF {
+func reducedCheck(r reducer, funcs ...checkF) checkF {
 	return func(c *testing.T) (interface{}, string) {
 		var values []interface{}
 		var comments []string
 		for _, f := range funcs {
-			v, comment := f.(checkF)(c)
+			v, comment := f(c)
 			values = append(values, v)
 			if len(comment) > 0 {
 				comments = append(comments, comment)

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ func (s DockerSwarmSuite) TestAPISwarmLeaderElection(c testing.T) {`
`316`	`316`	`followers []*daemon.Daemon // keep track of followers`
`317`	`317`	`)`
`318`	`318`	`var lastErr error`
`319`		`- checkLeader := func(nodes ...*daemon.Daemon) interface{} {`
	`319`	`+ checkLeader := func(nodes ...*daemon.Daemon) checkF {`
`320`	`320`	`return func(c *testing.T) (interface{}, string) {`
`321`	`321`	`// clear these out before each run`
`322`	`322`	`leader = nil`