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: Move UseGRPC to member config

Browse Source
This commit is contained in:
Marek Siarkowicz 2022-01-18 15:58:54 +01:00
parent 87c8e8b868
commit 51f72915e4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/framework/integration/cluster.go
View File

@ -319,13 +319,9 @@ func (c *Cluster) mustNewMember(t testutil.TB) *Member {
WatchProgressNotifyInterval: c.Cfg.WatchProgressNotifyInterval, WatchProgressNotifyInterval: c.Cfg.WatchProgressNotifyInterval,
ExperimentalMaxLearners: c.Cfg.ExperimentalMaxLearners, ExperimentalMaxLearners: c.Cfg.ExperimentalMaxLearners,
StrictReconfigCheck: c.Cfg.StrictReconfigCheck, StrictReconfigCheck: c.Cfg.StrictReconfigCheck,
UseGRPC: c.Cfg.UseGRPC,
}) })
m.DiscoveryURL = c.Cfg.DiscoveryURL m.DiscoveryURL = c.Cfg.DiscoveryURL
if c.Cfg.UseGRPC {
if err := m.listenGRPC(); err != nil {
t.Fatal(err)
}
}
return m return m
} }
@ -632,6 +628,7 @@ type MemberConfig struct {
WatchProgressNotifyInterval time.Duration WatchProgressNotifyInterval time.Duration
ExperimentalMaxLearners int ExperimentalMaxLearners int
StrictReconfigCheck bool StrictReconfigCheck bool
UseGRPC bool
} }
// MustNewMember return an inited member with the given name. If peerTLS is // MustNewMember return an inited member with the given name. If peerTLS is
@ -744,6 +741,11 @@ func MustNewMember(t testutil.TB, mcfg MemberConfig) *Member {
m.GrpcServerRecorder = &grpc_testing.GrpcRecorder{} m.GrpcServerRecorder = &grpc_testing.GrpcRecorder{}
m.Logger = memberLogger(t, mcfg.Name) m.Logger = memberLogger(t, mcfg.Name)
m.StrictReconfigCheck = mcfg.StrictReconfigCheck m.StrictReconfigCheck = mcfg.StrictReconfigCheck
if mcfg.UseGRPC {
if err := m.listenGRPC(); err != nil {
t.Fatal(err)
}
}
t.Cleanup(func() { t.Cleanup(func() {
// if we didn't cleanup the logger, the consecutive test // if we didn't cleanup the logger, the consecutive test
// might reuse this (t). // might reuse this (t).