luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Fixed flaky watch tests (#4595)

This commit is contained in:
Pierre Souchay 2018-09-04 13:32:59 +02:00 committed by Freddy
parent e974ebd62e
commit aaaf448e21
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
watch/funcs_test.go
View File

@ -33,6 +33,7 @@ func TestKeyWatch(t *testing.T) {
t.Parallel() t.Parallel()
a := agent.NewTestAgent(t.Name(), ``) a := agent.NewTestAgent(t.Name(), ``)
defer a.Shutdown() defer a.Shutdown()
testrpc.WaitForTestAgent(t, a.RPC, "dc1")
invoke := makeInvokeCh() invoke := makeInvokeCh()
plan := mustParse(t, `{"type":"key", "key":"foo/bar/baz"}`) plan := mustParse(t, `{"type":"key", "key":"foo/bar/baz"}`)
@ -87,6 +88,7 @@ func TestKeyWatch_With_PrefixDelete(t *testing.T) {
t.Parallel() t.Parallel()
a := agent.NewTestAgent(t.Name(), ``) a := agent.NewTestAgent(t.Name(), ``)
defer a.Shutdown() defer a.Shutdown()
testrpc.WaitForTestAgent(t, a.RPC, "dc1")
invoke := makeInvokeCh() invoke := makeInvokeCh()
plan := mustParse(t, `{"type":"key", "key":"foo/bar/baz"}`) plan := mustParse(t, `{"type":"key", "key":"foo/bar/baz"}`)
@ -141,6 +143,7 @@ func TestKeyPrefixWatch(t *testing.T) {
t.Parallel() t.Parallel()
a := agent.NewTestAgent(t.Name(), ``) a := agent.NewTestAgent(t.Name(), ``)
defer a.Shutdown() defer a.Shutdown()
testrpc.WaitForTestAgent(t, a.RPC, "dc1")
invoke := makeInvokeCh() invoke := makeInvokeCh()
plan := mustParse(t, `{"type":"keyprefix", "prefix":"foo/"}`) plan := mustParse(t, `{"type":"keyprefix", "prefix":"foo/"}`)
@ -194,6 +197,7 @@ func TestServicesWatch(t *testing.T) {
t.Parallel() t.Parallel()
a := agent.NewTestAgent(t.Name(), ``) a := agent.NewTestAgent(t.Name(), ``)
defer a.Shutdown() defer a.Shutdown()
testrpc.WaitForTestAgent(t, a.RPC, "dc1")
invoke := makeInvokeCh() invoke := makeInvokeCh()
plan := mustParse(t, `{"type":"services"}`) plan := mustParse(t, `{"type":"services"}`)
@ -248,6 +252,7 @@ func TestNodesWatch(t *testing.T) {
t.Parallel() t.Parallel()
a := agent.NewTestAgent(t.Name(), ``) a := agent.NewTestAgent(t.Name(), ``)
defer a.Shutdown() defer a.Shutdown()
testrpc.WaitForTestAgent(t, a.RPC, "dc1")
invoke := makeInvokeCh() invoke := makeInvokeCh()
plan := mustParse(t, `{"type":"nodes"}`) plan := mustParse(t, `{"type":"nodes"}`)
@ -299,6 +304,7 @@ func TestServiceWatch(t *testing.T) {
t.Parallel() t.Parallel()
a := agent.NewTestAgent(t.Name(), ``) a := agent.NewTestAgent(t.Name(), ``)
defer a.Shutdown() defer a.Shutdown()
testrpc.WaitForTestAgent(t, a.RPC, "dc1")
invoke := makeInvokeCh() invoke := makeInvokeCh()
plan := mustParse(t, `{"type":"service", "service":"foo", "tag":"bar", "passingonly":true}`) plan := mustParse(t, `{"type":"service", "service":"foo", "tag":"bar", "passingonly":true}`)
@ -355,6 +361,7 @@ func TestChecksWatch_State(t *testing.T) {
t.Parallel() t.Parallel()
a := agent.NewTestAgent(t.Name(), ``) a := agent.NewTestAgent(t.Name(), ``)
defer a.Shutdown() defer a.Shutdown()
testrpc.WaitForTestAgent(t, a.RPC, "dc1")
invoke := makeInvokeCh() invoke := makeInvokeCh()
plan := mustParse(t, `{"type":"checks", "state":"warning"}`) plan := mustParse(t, `{"type":"checks", "state":"warning"}`)
@ -416,6 +423,7 @@ func TestChecksWatch_Service(t *testing.T) {
t.Parallel() t.Parallel()
a := agent.NewTestAgent(t.Name(), ``) a := agent.NewTestAgent(t.Name(), ``)
defer a.Shutdown() defer a.Shutdown()
testrpc.WaitForTestAgent(t, a.RPC, "dc1")
invoke := makeInvokeCh() invoke := makeInvokeCh()
plan := mustParse(t, `{"type":"checks", "service":"foobar"}`) plan := mustParse(t, `{"type":"checks", "service":"foobar"}`)
@ -482,6 +490,7 @@ func TestEventWatch(t *testing.T) {
t.Parallel() t.Parallel()
a := agent.NewTestAgent(t.Name(), ``) a := agent.NewTestAgent(t.Name(), ``)
defer a.Shutdown() defer a.Shutdown()
testrpc.WaitForTestAgent(t, a.RPC, "dc1")
invoke := makeInvokeCh() invoke := makeInvokeCh()
plan := mustParse(t, `{"type":"event", "name": "foo"}`) plan := mustParse(t, `{"type":"event", "name": "foo"}`)
@ -588,6 +597,7 @@ func TestConnectLeafWatch(t *testing.T) {
// NewTestAgent will bootstrap a new CA // NewTestAgent will bootstrap a new CA
a := agent.NewTestAgent(t.Name(), ``) a := agent.NewTestAgent(t.Name(), ``)
defer a.Shutdown() defer a.Shutdown()
testrpc.WaitForTestAgent(t, a.RPC, "dc1")
// Register a web service to get certs for // Register a web service to get certs for
{ {
@ -665,6 +675,7 @@ func TestConnectProxyConfigWatch(t *testing.T) {
} }
`) `)
defer a.Shutdown() defer a.Shutdown()
testrpc.WaitForTestAgent(t, a.RPC, "dc1")
// Register a local agent service with a managed proxy // Register a local agent service with a managed proxy
reg := &consulapi.AgentServiceRegistration{ reg := &consulapi.AgentServiceRegistration{