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

Merge pull request #16448 from testwill/pkg-import

Browse Source 
chore: pkg import more than once
This commit is contained in:
Benjamin Wang 2023-08-21 18:11:06 +08:00 committed by GitHub
commit e2e17c75fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/etcdserver/api/membership/membership_test.go
View File

@ -21,7 +21,6 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/pkg/v3/types"
"go.etcd.io/etcd/server/v3/etcdserver/version"
serverversion "go.etcd.io/etcd/server/v3/etcdserver/version" serverversion "go.etcd.io/etcd/server/v3/etcdserver/version"
"go.uber.org/zap" "go.uber.org/zap"
@ -57,7 +56,7 @@ type backendMock struct {
members map[types.ID]*Member members map[types.ID]*Member
removed map[types.ID]bool removed map[types.ID]bool
version *semver.Version version *semver.Version
downgradeInfo *version.DowngradeInfo downgradeInfo *serverversion.DowngradeInfo
} }
var _ MembershipBackend = (*backendMock)(nil) var _ MembershipBackend = (*backendMock)(nil)
@ -93,7 +92,7 @@ func (b *backendMock) MustDeleteMemberFromBackend(id types.ID) {
b.removed[id] = true b.removed[id] = true
} }
func (b *backendMock) MustSaveDowngradeToBackend(downgradeInfo *version.DowngradeInfo) { func (b *backendMock) MustSaveDowngradeToBackend(downgradeInfo *serverversion.DowngradeInfo) {
b.downgradeInfo = downgradeInfo b.downgradeInfo = downgradeInfo
} }
func (b *backendMock) DowngradeInfoFromBackend() *version.DowngradeInfo { return b.downgradeInfo } func (b *backendMock) DowngradeInfoFromBackend() *serverversion.DowngradeInfo { return b.downgradeInfo }