fix inconsistency in TestConnectCAConfig_GetSet

kyhavlov · kyhavlov · commit fa0d8aff335a · 2018-07-26T07:46:47.000-07:00
diff --git a/agent/consul/connect_ca_endpoint_test.go b/agent/consul/connect_ca_endpoint_test.go
@@ -14,6 +14,7 @@ import (
 	ca "github.com/hashicorp/consul/agent/connect/ca"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/testrpc"
+	"github.com/hashicorp/consul/testutil/retry"
 	"github.com/hashicorp/net-rpc-msgpackrpc"
 	"github.com/stretchr/testify/assert"
 )
@@ -114,8 +115,9 @@ func TestConnectCAConfig_GetSet(t *testing.T) {
 			Config:     newConfig,
 		}
 		var reply interface{}
-
-		assert.NoError(msgpackrpc.CallWithCodec(codec, "ConnectCA.ConfigurationSet", args, &reply))
+		retry.Run(t, func(r *retry.R) {
+			r.Check(msgpackrpc.CallWithCodec(codec, "ConnectCA.ConfigurationSet", args, &reply))
+		})
 	}
 
 	// Verify the new config was set

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import (`
`14`	`14`	`ca "github.com/hashicorp/consul/agent/connect/ca"`
`15`	`15`	`"github.com/hashicorp/consul/agent/structs"`
`16`	`16`	`"github.com/hashicorp/consul/testrpc"`
	`17`	`+ "github.com/hashicorp/consul/testutil/retry"`
`17`	`18`	`"github.com/hashicorp/net-rpc-msgpackrpc"`
`18`	`19`	`"github.com/stretchr/testify/assert"`
`19`	`20`	`)`
`@@ -114,8 +115,9 @@ func TestConnectCAConfig_GetSet(t *testing.T) {`
`114`	`115`	`Config: newConfig,`
`115`	`116`	`}`
`116`	`117`	`var reply interface{}`
`117`		`-`
`118`		`- assert.NoError(msgpackrpc.CallWithCodec(codec, "ConnectCA.ConfigurationSet", args, &reply))`
	`118`	`+ retry.Run(t, func(r *retry.R) {`
	`119`	`+ r.Check(msgpackrpc.CallWithCodec(codec, "ConnectCA.ConfigurationSet", args, &reply))`
	`120`	`+ })`
`119`	`121`	`}`
`120`	`122`
`121`	`123`	`// Verify the new config was set`