mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: Remove separation between V2 and V3 cluster in integration tests

Browse Source
This commit is contained in:
Marek Siarkowicz
2022-01-18 17:22:40 +01:00
parent 7b365e48d3
commit 264fdbb6a1
51 changed files with 390 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/integration/grpc_test.go
View File

@ -102,7 +102,7 @@ func TestAuthority(t *testing.T) {
UseIP: tc.useTCP,
}
cfg, tlsConfig := setupTLS(t, tc.useTLS, cfg)
clus := integration.NewClusterV3(t, &cfg)
clus := integration.NewCluster(t, &cfg)
defer clus.Terminate(t)
kv := setupClient(t, tc.clientURLPattern, clus, tlsConfig)
@ -132,7 +132,7 @@ func setupTLS(t *testing.T, useTLS bool, cfg integration.ClusterConfig) (integra
return cfg, nil
}
func setupClient(t *testing.T, endpointPattern string, clus *integration.ClusterV3, tlsConfig *tls.Config) *clientv3.Client {
func setupClient(t *testing.T, endpointPattern string, clus *integration.Cluster, tlsConfig *tls.Config) *clientv3.Client {
t.Helper()
endpoints := templateEndpoints(t, endpointPattern, clus)
kv, err := clientv3.New(clientv3.Config{
@ -147,7 +147,7 @@ func setupClient(t *testing.T, endpointPattern string, clus *integration.Cluster
return kv
}
func templateEndpoints(t *testing.T, pattern string, clus *integration.ClusterV3) []string {
func templateEndpoints(t *testing.T, pattern string, clus *integration.Cluster) []string {
t.Helper()
endpoints := []string{}
for _, m := range clus.Members {
@ -181,7 +181,7 @@ func templateAuthority(t *testing.T, pattern string, m *integration.Member) stri
return authority
}
func assertAuthority(t *testing.T, expectedAuthority string, clus *integration.ClusterV3) {
func assertAuthority(t *testing.T, expectedAuthority string, clus *integration.Cluster) {
t.Helper()
requestsFound := 0
for _, m := range clus.Members {