status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: fix flakey scada provider test

This commit is contained in:
DanStough 2022-09-30 11:33:49 -04:00 committed by Dan Stough
parent 47eb44fe35
commit 7f8971d77f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
agent/agent_test.go
View File

@ -28,8 +28,6 @@ import (
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts" "github.com/google/go-cmp/cmp/cmpopts"
"github.com/google/tcpproxy" "github.com/google/tcpproxy"
"github.com/hashicorp/consul/agent/hcp"
"github.com/hashicorp/consul/agent/hcp/scada"
"github.com/hashicorp/go-hclog" "github.com/hashicorp/go-hclog"
"github.com/hashicorp/hcp-scada-provider/capability" "github.com/hashicorp/hcp-scada-provider/capability"
"github.com/hashicorp/serf/coordinate" "github.com/hashicorp/serf/coordinate"
@ -47,6 +45,8 @@ import (
"github.com/hashicorp/consul/agent/config" "github.com/hashicorp/consul/agent/config"
"github.com/hashicorp/consul/agent/connect" "github.com/hashicorp/consul/agent/connect"
"github.com/hashicorp/consul/agent/consul" "github.com/hashicorp/consul/agent/consul"
"github.com/hashicorp/consul/agent/hcp"
"github.com/hashicorp/consul/agent/hcp/scada"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/agent/token" "github.com/hashicorp/consul/agent/token"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
@ -6082,8 +6082,6 @@ func TestAgent_startListeners_scada(t *testing.T) {
} }
func TestAgent_scadaProvider(t *testing.T) { func TestAgent_scadaProvider(t *testing.T) {
t.Parallel()
pvd := scada.NewMockProvider(t) pvd := scada.NewMockProvider(t)
// this listener is used when mocking out the scada provider // this listener is used when mocking out the scada provider
@ -6095,7 +6093,7 @@ func TestAgent_scadaProvider(t *testing.T) {
pvd.EXPECT().Start().Return(nil).Once() pvd.EXPECT().Start().Return(nil).Once()
pvd.EXPECT().Listen(scada.CAPCoreAPI.Capability()).Return(l, nil).Once() pvd.EXPECT().Listen(scada.CAPCoreAPI.Capability()).Return(l, nil).Once()
pvd.EXPECT().Stop().Return(nil).Once() pvd.EXPECT().Stop().Return(nil).Once()
pvd.EXPECT().SessionStatus().Return("test").Once() pvd.EXPECT().SessionStatus().Return("test")
a := TestAgent{ a := TestAgent{
OverrideDeps: func(deps *BaseDeps) { OverrideDeps: func(deps *BaseDeps) {
deps.HCP.Provider = pvd deps.HCP.Provider = pvd