Skip to content

Commit a1cb13b

Browse files
committed
fix failed test cases
Signed-off-by: Benjamin Wang <[email protected]>
1 parent e3cd57a commit a1cb13b

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

server/etcdserver/api/membership/cluster_test.go

+5
Original file line numberDiff line numberDiff line change
@@ -1048,6 +1048,11 @@ func TestAddMemberSyncsBackendAndStoreV2(t *testing.T) {
10481048
name: "Adding member should succeed if it was only in backend",
10491049
backendMembers: []*Member{alice},
10501050
},
1051+
{
1052+
name: "Adding member should success if it exists in both",
1053+
storeV2Members: []*Member{alice},
1054+
backendMembers: []*Member{alice},
1055+
},
10511056
{
10521057
name: "Adding member should fail if it exists in storeV2 and backend is nil",
10531058
storeV2Members: []*Member{alice},

server/etcdserver/server_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,7 @@ func TestApplyConfigChangeUpdatesConsistIndex(t *testing.T) {
655655

656656
be, _ := betesting.NewDefaultTmpBackend(t)
657657
defer betesting.Close(t, be)
658+
cl.SetBackend(be)
658659
cindex.CreateMetaBucket(be.BatchTx())
659660

660661
cl.AddMember(&membership.Member{ID: types.ID(1)}, true)

tests/e2e/ctl_v2_test.go

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"testing"
2323
"time"
2424

25+
"go.etcd.io/etcd/server/v3/verify"
2526
"go.etcd.io/etcd/tests/v3/framework/e2e"
2627
)
2728

@@ -229,6 +230,10 @@ func TestUtlCtlV2Backup(t *testing.T) {
229230
func testUtlCtlV2Backup(t *testing.T, snapCount int, v3 bool, utl bool) {
230231
BeforeTestV2(t)
231232

233+
// disable the verification because this case updated the db offline
234+
revertFunc := verify.DisableVerification()
235+
defer revertFunc()
236+
232237
backupDir, err := ioutil.TempDir(t.TempDir(), "testbackup0.etcd")
233238
if err != nil {
234239
t.Fatal(err)

0 commit comments

Comments
 (0)