Skip to content

Commit

Permalink
unify test naming
Browse files Browse the repository at this point in the history
  • Loading branch information
@nfi-hashicorp
nfi-hashicorp committed Jul 18, 2023
1 parent 58a7834 commit 9ae08f2
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion test-integ/peering_commontopo/ac3_service_defaults_upstream_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ type ac3SvcDefaultsSuite struct {
var _ commonTopoSuite = (*ac3SvcDefaultsSuite)(nil)

func (s *ac3SvcDefaultsSuite) testName() string {
return fmt.Sprintf("ac3 service defaults upstreams %s -> %s", s.DC, s.Peer)
return fmt.Sprintf("ac3 service defaults upstreams %s->%s", s.DC, s.Peer)
}

// creates clients in s.DC and servers in s.Peer
Expand Down
2 changes: 1 addition & 1 deletion test-integ/peering_commontopo/ac4_proxy_defaults_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestAC4ProxyDefaults(t *testing.T) {
}

func (s *ac4ProxyDefaultsSuite) testName() string {
return fmt.Sprintf("ac4 proxy defaults %s_%s", s.DC, s.Peer)
return fmt.Sprintf("ac4 proxy defaults %s->%s", s.DC, s.Peer)
}

// creates clients in s.DC and servers in s.Peer
Expand Down
24 changes: 12 additions & 12 deletions test-integ/peering_commontopo/ac5_1_test.go → ...ring_commontopo/ac5_1_no_svc_mesh_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import (

"testing"

"github.com/hashicorp/consul/testing/deployer/topology"
"github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/sdk/testutil/retry"
libassert "github.com/hashicorp/consul/test/integration/consul-container/libs/assert"
"github.com/hashicorp/consul/testing/deployer/topology"
"github.com/stretchr/testify/require"
)

type serviceMeshDisabledSuite struct {
type ac5_1NoSvcMeshSuite struct {
DC string
Peer string

Expand All @@ -21,22 +21,22 @@ type serviceMeshDisabledSuite struct {
}

var (
serviceMeshDisabledSuites []commonTopoSuite = []commonTopoSuite{
&serviceMeshDisabledSuite{DC: "dc1", Peer: "dc2"},
&serviceMeshDisabledSuite{DC: "dc2", Peer: "dc1"},
ac5_1NoSvcMeshSuites []commonTopoSuite = []commonTopoSuite{
&ac5_1NoSvcMeshSuite{DC: "dc1", Peer: "dc2"},
&ac5_1NoSvcMeshSuite{DC: "dc2", Peer: "dc1"},
}
)

func TestAC5ServiceMeshDisabledSuite(t *testing.T) {
setupAndRunTestSuite(t, serviceMeshDisabledSuites, true, true)
setupAndRunTestSuite(t, ac5_1NoSvcMeshSuites, true, true)
}

func (s *serviceMeshDisabledSuite) testName() string {
return "Service mesh disabled assertions"
func (s *ac5_1NoSvcMeshSuite) testName() string {
return fmt.Sprintf("ac5.1 no service mesh %s->%s", s.DC, s.Peer)
}

// creates clients in s.DC and servers in s.Peer
func (s *serviceMeshDisabledSuite) setup(t *testing.T, ct *commonTopo) {
func (s *ac5_1NoSvcMeshSuite) setup(t *testing.T, ct *commonTopo) {
clu := ct.ClusterByDatacenter(t, s.DC)
peerClu := ct.ClusterByDatacenter(t, s.Peer)

Expand Down Expand Up @@ -90,7 +90,7 @@ func (s *serviceMeshDisabledSuite) setup(t *testing.T, ct *commonTopo) {
s.serverSID = serverSID
}

func (s *serviceMeshDisabledSuite) test(t *testing.T, ct *commonTopo) {
func (s *ac5_1NoSvcMeshSuite) test(t *testing.T, ct *commonTopo) {
dc := ct.Sprawl.Topology().Clusters[s.DC]
peer := ct.Sprawl.Topology().Clusters[s.Peer]
cl := ct.APIClientForCluster(t, dc)
Expand All @@ -100,7 +100,7 @@ func (s *serviceMeshDisabledSuite) test(t *testing.T, ct *commonTopo) {
s.testProxyDisabledInDC2(t, cl, peerName)
}

func (s *serviceMeshDisabledSuite) testServiceHealthInCatalog(t *testing.T, ct *commonTopo, cl *api.Client, peer string) {
func (s *ac5_1NoSvcMeshSuite) testServiceHealthInCatalog(t *testing.T, ct *commonTopo, cl *api.Client, peer string) {
t.Run("validate service health in catalog", func(t *testing.T) {
libassert.CatalogServiceExists(t, cl, s.clientSID.Name, &api.QueryOptions{
Peer: peer,
Expand All @@ -110,7 +110,7 @@ func (s *serviceMeshDisabledSuite) testServiceHealthInCatalog(t *testing.T, ct *
})
}

func (s *serviceMeshDisabledSuite) testProxyDisabledInDC2(t *testing.T, cl *api.Client, peer string) {
func (s *ac5_1NoSvcMeshSuite) testProxyDisabledInDC2(t *testing.T, cl *api.Client, peer string) {
t.Run("service mesh is disabled", func(t *testing.T) {
var (
services map[string][]string
Expand Down
54 changes: 27 additions & 27 deletions test-integ/peering_commontopo/ac5_2_test.go → ...ring_commontopo/ac5_2_pq_failover_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,29 @@ import (
// 8. Repeat step 4
// 9. Delete failing health check from step 3
// 10. Repeat step 2
type preparedQueryFailoverSuite struct {
type ac5_2PQFailoverSuite struct {
clientSID topology.ServiceID
serverSID topology.ServiceID
nodeServer topology.NodeID
}

var ac5Context = make(map[nodeKey]preparedQueryFailoverSuite)
var ac5_2Context = make(map[nodeKey]ac5_2PQFailoverSuite)

func TestAC5PreparedQueryFailoverSuite(t *testing.T) {
setupAndRunTestSuite(t, []commonTopoSuite{&preparedQueryFailoverSuite{}}, false, false)
func TestAC5PreparedQueryFailover(t *testing.T) {
setupAndRunTestSuite(t, []commonTopoSuite{&ac5_2PQFailoverSuite{}}, false, false)
}

func (s *preparedQueryFailoverSuite) testName() string {
return "prepared query failover assertions"
func (s *ac5_2PQFailoverSuite) testName() string {
return "ac5.2 prepared query failover"
}

func (s *preparedQueryFailoverSuite) setup(t *testing.T, ct *commonTopo) {
func (s *ac5_2PQFailoverSuite) setup(t *testing.T, ct *commonTopo) {
s.setupDC(ct, ct.DC1, ct.DC2)
s.setupDC(ct, ct.DC2, ct.DC1)
s.setupDC3(ct, ct.DC3, ct.DC1, ct.DC2)
}

func (s *preparedQueryFailoverSuite) setupDC(ct *commonTopo, clu, peerClu *topology.Cluster) {
func (s *ac5_2PQFailoverSuite) setupDC(ct *commonTopo, clu, peerClu *topology.Cluster) {
// TODO: handle all partitions
partition := "default"
peer := LocalPeerName(peerClu, partition)
Expand Down Expand Up @@ -89,14 +89,14 @@ func (s *preparedQueryFailoverSuite) setupDC(ct *commonTopo, clu, peerClu *topol
}
serverNode := ct.AddServiceNode(clu, server)

ac5Context[nodeKey{clu.Datacenter, partition}] = preparedQueryFailoverSuite{
ac5_2Context[nodeKey{clu.Datacenter, partition}] = ac5_2PQFailoverSuite{
clientSID: clientSID,
serverSID: serverSID,
nodeServer: serverNode.ID(),
}
}

func (s *preparedQueryFailoverSuite) setupDC3(ct *commonTopo, clu, peer1, peer2 *topology.Cluster) {
func (s *ac5_2PQFailoverSuite) setupDC3(ct *commonTopo, clu, peer1, peer2 *topology.Cluster) {
var (
peers []string
partition = "default"
Expand Down Expand Up @@ -161,14 +161,14 @@ func (s *preparedQueryFailoverSuite) setupDC3(ct *commonTopo, clu, peer1, peer2

serverNode := ct.AddServiceNode(clu, server)

ac5Context[nodeKey{clu.Datacenter, partition}] = preparedQueryFailoverSuite{
ac5_2Context[nodeKey{clu.Datacenter, partition}] = ac5_2PQFailoverSuite{
clientSID: clientSID,
serverSID: serverSID,
nodeServer: serverNode.ID(),
}
}

func (s *preparedQueryFailoverSuite) createPreparedQuery(t *testing.T, ct *commonTopo, c *api.Client, serviceName, partition string) (*api.PreparedQueryDefinition, *api.PreparedQuery) {
func (s *ac5_2PQFailoverSuite) createPreparedQuery(t *testing.T, ct *commonTopo, c *api.Client, serviceName, partition string) (*api.PreparedQueryDefinition, *api.PreparedQuery) {
var (
peers []string
err error
Expand Down Expand Up @@ -202,7 +202,7 @@ func (s *preparedQueryFailoverSuite) createPreparedQuery(t *testing.T, ct *commo
return def, query
}

func (s *preparedQueryFailoverSuite) test(t *testing.T, ct *commonTopo) {
func (s *ac5_2PQFailoverSuite) test(t *testing.T, ct *commonTopo) {
partition := "default"
dc1 := ct.Sprawl.Topology().Clusters[ct.DC1.Name]
dc2 := ct.Sprawl.Topology().Clusters[ct.DC2.Name]
Expand All @@ -224,7 +224,7 @@ func (s *preparedQueryFailoverSuite) test(t *testing.T, ct *commonTopo) {
client := ct.APIClientForCluster(t, tc.cluster)

t.Run(s.testName(), func(t *testing.T) {
svc := ac5Context[nodeKey{tc.cluster.Name, partition}]
svc := ac5_2Context[nodeKey{tc.cluster.Name, partition}]
require.NotNil(t, svc.serverSID.Name, "expected service name to not be nil")
require.NotNil(t, svc.nodeServer, "expected node server to not be nil")

Expand All @@ -242,7 +242,7 @@ func (s *preparedQueryFailoverSuite) test(t *testing.T, ct *commonTopo) {
}
}

func (s *preparedQueryFailoverSuite) testPreparedQueryZeroFailover(t *testing.T, cl *api.Client, def *api.PreparedQueryDefinition, cluster *topology.Cluster) {
func (s *ac5_2PQFailoverSuite) testPreparedQueryZeroFailover(t *testing.T, cl *api.Client, def *api.PreparedQueryDefinition, cluster *topology.Cluster) {
t.Run(fmt.Sprintf("prepared query should not failover %s", cluster.Name), func(t *testing.T) {

// Validate prepared query exists in cluster
Expand All @@ -262,10 +262,10 @@ func (s *preparedQueryFailoverSuite) testPreparedQueryZeroFailover(t *testing.T,
})
}

func (s *preparedQueryFailoverSuite) testPreparedQuerySingleFailover(t *testing.T, ct *commonTopo, cl *api.Client, def *api.PreparedQueryDefinition, cluster, peerClu *topology.Cluster, partition string) {
func (s *ac5_2PQFailoverSuite) testPreparedQuerySingleFailover(t *testing.T, ct *commonTopo, cl *api.Client, def *api.PreparedQueryDefinition, cluster, peerClu *topology.Cluster, partition string) {
t.Run(fmt.Sprintf("prepared query with single failover %s", cluster.Name), func(t *testing.T) {
cfg := ct.Sprawl.Config()
svc := ac5Context[nodeKey{cluster.Name, partition}]
svc := ac5_2Context[nodeKey{cluster.Name, partition}]

nodeCfg := DisableNode(t, cfg, cluster.Name, svc.nodeServer)
require.NoError(t, ct.Sprawl.Relaunch(nodeCfg))
Expand Down Expand Up @@ -293,18 +293,18 @@ func (s *preparedQueryFailoverSuite) testPreparedQuerySingleFailover(t *testing.
})
}

func (s *preparedQueryFailoverSuite) testPreparedQueryTwoFailovers(t *testing.T, ct *commonTopo, cl *api.Client, def *api.PreparedQueryDefinition, cluster, peerClu, targetCluster *topology.Cluster, partition string) {
func (s *ac5_2PQFailoverSuite) testPreparedQueryTwoFailovers(t *testing.T, ct *commonTopo, cl *api.Client, def *api.PreparedQueryDefinition, cluster, peerClu, targetCluster *topology.Cluster, partition string) {
t.Run(fmt.Sprintf("prepared query with two failovers %s", cluster.Name), func(t *testing.T) {
cfg := ct.Sprawl.Config()

svc := ac5Context[nodeKey{peerClu.Name, partition}]
svc := ac5_2Context[nodeKey{peerClu.Name, partition}]

cfg = DisableNode(t, cfg, peerClu.Name, svc.nodeServer)
require.NoError(t, ct.Sprawl.Relaunch(cfg))

// assert server health status
assertServiceHealth(t, cl, ac5Context[nodeKey{cluster.Name, partition}].serverSID.Name, 0) // cluster: failing
assertServiceHealth(t, cl, svc.serverSID.Name, 0) // peer cluster: failing
assertServiceHealth(t, cl, ac5_2Context[nodeKey{cluster.Name, partition}].serverSID.Name, 0) // cluster: failing
assertServiceHealth(t, cl, svc.serverSID.Name, 0) // peer cluster: failing

queryDef, _, err := cl.PreparedQuery().Get(def.ID, nil)
require.NoError(t, err)
Expand All @@ -325,11 +325,11 @@ func (s *preparedQueryFailoverSuite) testPreparedQueryTwoFailovers(t *testing.T,
})
}

func (s *preparedQueryFailoverSuite) testPQSingleFailover(t *testing.T, ct *commonTopo, cl *api.Client, def *api.PreparedQueryDefinition, cluster, peerClu *topology.Cluster, partition string) {
func (s *ac5_2PQFailoverSuite) testPQSingleFailover(t *testing.T, ct *commonTopo, cl *api.Client, def *api.PreparedQueryDefinition, cluster, peerClu *topology.Cluster, partition string) {
t.Run(fmt.Sprintf("delete failing health check in %s and validate single failover %s", peerClu.Name, cluster.Name), func(t *testing.T) {
cfg := ct.Sprawl.Config()

svc := ac5Context[nodeKey{peerClu.Name, partition}]
svc := ac5_2Context[nodeKey{peerClu.Name, partition}]

cfg = EnableNode(t, cfg, peerClu.Name, svc.nodeServer)
require.NoError(t, ct.Sprawl.Relaunch(cfg))
Expand All @@ -352,18 +352,18 @@ func (s *preparedQueryFailoverSuite) testPQSingleFailover(t *testing.T, ct *comm
})
}

func (s *preparedQueryFailoverSuite) testPQZeroFailover(t *testing.T, ct *commonTopo, cl *api.Client, def *api.PreparedQueryDefinition, cluster, peerClu *topology.Cluster, partition string) {
func (s *ac5_2PQFailoverSuite) testPQZeroFailover(t *testing.T, ct *commonTopo, cl *api.Client, def *api.PreparedQueryDefinition, cluster, peerClu *topology.Cluster, partition string) {
t.Run(fmt.Sprintf("delete failing health check in %s and validate zero failover %s", cluster.Name, cluster.Name), func(t *testing.T) {
cfg := ct.Sprawl.Config()

svc := ac5Context[nodeKey{cluster.Name, partition}]
svc := ac5_2Context[nodeKey{cluster.Name, partition}]

cfg = EnableNode(t, cfg, cluster.Name, svc.nodeServer)
require.NoError(t, ct.Sprawl.Relaunch(cfg))

// assert server health status
assertServiceHealth(t, cl, ac5Context[nodeKey{cluster.Name, partition}].serverSID.Name, 1) // cluster: passing
assertServiceHealth(t, cl, svc.serverSID.Name, 1) // peer cluster: passing
assertServiceHealth(t, cl, ac5_2Context[nodeKey{cluster.Name, partition}].serverSID.Name, 1) // cluster: passing
assertServiceHealth(t, cl, svc.serverSID.Name, 1) // peer cluster: passing

queryDef, _, err := cl.PreparedQuery().Get(def.ID, nil)
require.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion test-integ/peering_commontopo/sharedtopology_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestSuitesOnSharedTopo(t *testing.T) {
commonTopoSuites = append(commonTopoSuites, ac2DiscoChainSuites...)
commonTopoSuites = append(commonTopoSuites, ac3SvcDefaultsSuites...)
commonTopoSuites = append(commonTopoSuites, ac4ProxyDefaultsSuites...)
commonTopoSuites = append(commonTopoSuites, serviceMeshDisabledSuites...)
commonTopoSuites = append(commonTopoSuites, ac5_1NoSvcMeshSuites...)

for _, s := range commonTopoSuites {
s.setup(t, ct)
Expand Down

0 comments on commit 9ae08f2

Please sign in to comment.