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

server: Integrate version validation logic into tests

Browse Source
This commit is contained in:
Marek Siarkowicz
2021-10-05 17:21:20 +02:00
parent 620832a4a5
commit f92b4f9a28
5 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/etcdserver/version/downgrade_test.go
View File

@ -110,7 +110,8 @@ func TestMustDetectDowngrade(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
lg := zaptest.NewLogger(t)
err := tryMustDetectDowngrade(lg, tt.clusterVersion, tt.downgrade)
sv := semver.Must(semver.NewVersion(version.Version))
err := tryMustDetectDowngrade(lg, sv, tt.clusterVersion, tt.downgrade)
if tt.success != (err == nil) {
t.Errorf("Unexpected status, got %q, wanted: %v", err, tt.success)
@ -123,11 +124,11 @@ func TestMustDetectDowngrade(t *testing.T) {
}
}
func tryMustDetectDowngrade(lg *zap.Logger, cv *semver.Version, d *DowngradeInfo) (err interface{}) {
func tryMustDetectDowngrade(lg *zap.Logger, sv, cv *semver.Version, d *DowngradeInfo) (err interface{}) {
defer func() {
err = recover()
}()
MustDetectDowngrade(lg, cv, d)
MustDetectDowngrade(lg, sv, cv, d)
return err
}