Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: enhance StartNewProc to accept one more parameter: EtcdProcessClusterConfig

Browse Source 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
This commit is contained in:
Benjamin Wang 2022-11-08 10:38:44 +08:00
parent 49ecea5dae
commit 080effc935
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/e2e/ctl_v3_auth_cluster_test.go
View File

@ -65,7 +65,7 @@ func TestAuthCluster(t *testing.T) {
}
// start second process
if err := epc.StartNewProc(ctx, t, rootUserClientOpts); err != nil {
if err := epc.StartNewProc(ctx, nil, t, rootUserClientOpts); err != nil {
t.Fatalf("could not start second etcd process (%v)", err)
}

2
tests/e2e/etcd_grpcproxy_test.go
View File

@ -65,7 +65,7 @@ func TestGrpcProxyAutoSync(t *testing.T) {
require.NoError(t, err)
// Add and start second member
err = epc.StartNewProc(ctx, t)
err = epc.StartNewProc(ctx, nil, t)
require.NoError(t, err)
// Wait for auto sync of endpoints

22
tests/framework/e2e/cluster.go
View File

@ -604,11 +604,15 @@ func (epc *EtcdProcessCluster) Endpoints(f func(ep EtcdProcess) []string) (ret [
func (epc *EtcdProcessCluster) CloseProc(ctx context.Context, finder func(EtcdProcess) bool, opts ...config.ClientOption) error {
procIndex := -1
for i := range epc.Procs {
if finder(epc.Procs[i]) {
procIndex = i
break
if finder != nil {
for i := range epc.Procs {
if finder(epc.Procs[i]) {
procIndex = i
break
}
}
} else {
procIndex = len(epc.Procs) - 1
}
if procIndex == -1 {
@ -651,8 +655,14 @@ func (epc *EtcdProcessCluster) CloseProc(ctx context.Context, finder func(EtcdPr
return proc.Close()
}
func (epc *EtcdProcessCluster) StartNewProc(ctx context.Context, tb testing.TB, opts ...config.ClientOption) error {
serverCfg := epc.Cfg.EtcdServerProcessConfig(tb, epc.nextSeq)
func (epc *EtcdProcessCluster) StartNewProc(ctx context.Context, cfg *EtcdProcessClusterConfig, tb testing.TB, opts ...config.ClientOption) error {
var serverCfg *EtcdServerProcessConfig
if cfg != nil {
serverCfg = cfg.EtcdServerProcessConfig(tb, epc.nextSeq)
} else {
serverCfg = epc.Cfg.EtcdServerProcessConfig(tb, epc.nextSeq)
}
epc.nextSeq++
initialCluster := []string{