github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10187 from hashicorp/fixup/ent-tproxy-test

pull/10201/head
Freddy 2021-05-06 14:47:44 -06:00 committed by hc-github-team-consul-core
parent dfc329d620
commit 32e013c834
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
agent/config_endpoint_test.go
View File

@ -116,9 +116,10 @@ func TestConfig_Get(t *testing.T) {
ce, ok := obj.(*structs.MeshConfigEntry) ce, ok := obj.(*structs.MeshConfigEntry)
require.True(t, ok, "wrong type %T", obj) require.True(t, ok, "wrong type %T", obj)
// Set indexes to expected values for assertions // Set indexes and EnterpriseMeta to expected values for assertions
ce.CreateIndex = 12 ce.CreateIndex = 12
ce.ModifyIndex = 13 ce.ModifyIndex = 13
ce.EnterpriseMeta = structs.EnterpriseMeta{}
out, err := a.srv.marshalJSON(req, obj) out, err := a.srv.marshalJSON(req, obj)
require.NoError(t, err) require.NoError(t, err)

2
agent/proxycfg/state_test.go
View File

@ -1814,7 +1814,7 @@ func TestState_WatchesAndUpdates(t *testing.T) {
}, },
events: []cache.UpdateEvent{ events: []cache.UpdateEvent{
{ {
CorrelationID: "discovery-chain:db", CorrelationID: "discovery-chain:" + db.String(),
Result: &structs.DiscoveryChainResponse{ Result: &structs.DiscoveryChainResponse{
Chain: discoverychain.TestCompileConfigEntries(t, "db", "default", "dc1", "trustdomain.consul", "dc1", nil, Chain: discoverychain.TestCompileConfigEntries(t, "db", "default", "dc1", "trustdomain.consul", "dc1", nil,
&structs.ServiceResolverConfigEntry{ &structs.ServiceResolverConfigEntry{