From 371ddf0b6908d9e4cdf95361e7da260e31e8a41c Mon Sep 17 00:00:00 2001 From: Piotr Tabor Date: Wed, 14 Oct 2020 18:25:43 +0200 Subject: [PATCH] tests: Update diagnostic update in tests after change of proto version. --- raft/testdata/confchange_v2_add_single_explicit.txt | 4 ++-- tests/e2e/v3_curl_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/raft/testdata/confchange_v2_add_single_explicit.txt b/raft/testdata/confchange_v2_add_single_explicit.txt index 3bb07d823..0042aac51 100644 --- a/raft/testdata/confchange_v2_add_single_explicit.txt +++ b/raft/testdata/confchange_v2_add_single_explicit.txt @@ -103,7 +103,7 @@ stabilize 1 2 propose-conf-change 1 v3 v4 v5 ---- -INFO 1 ignoring conf change {ConfChangeTransitionAuto [{ConfChangeAddNode 3 []} {ConfChangeAddNode 4 []} {ConfChangeAddNode 5 []}] [] []} at config voters=(1 2)&&(1): must transition out of joint config first +INFO 1 ignoring conf change {ConfChangeTransitionAuto [{ConfChangeAddNode 3 {} [] 0} {ConfChangeAddNode 4 {} [] 0} {ConfChangeAddNode 5 {} [] 0}] [] {} [] 0} at config voters=(1 2)&&(1): must transition out of joint config first # Propose a transition out of the joint config. We'll see this at index 6 below. propose-conf-change 1 @@ -165,7 +165,7 @@ stabilize # Check that trying to transition out again won't do anything. propose-conf-change 1 ---- -INFO 1 ignoring conf change {ConfChangeTransitionAuto [] [] []} at config voters=(1 2): not in joint state; refusing empty conf change +INFO 1 ignoring conf change {ConfChangeTransitionAuto [] [] {} [] 0} at config voters=(1 2): not in joint state; refusing empty conf change # Finishes work for the empty entry we just proposed. stabilize diff --git a/tests/e2e/v3_curl_test.go b/tests/e2e/v3_curl_test.go index 41814ff07..4f8290734 100644 --- a/tests/e2e/v3_curl_test.go +++ b/tests/e2e/v3_curl_test.go @@ -343,7 +343,7 @@ func testV3CurlProclaimMissiongLeaderKey(cx ctlCtx) { if err = cURLPost(cx.epc, cURLReq{ endpoint: path.Join(cx.apiPrefix, "/election/proclaim"), value: string(pdata), - expected: `{"error":"\"leader\" field must be provided","message":"\"leader\" field must be provided","code":2}`, + expected: `{"error":"\"leader\" field must be provided","code":2,"message":"\"leader\" field must be provided"}`, }); err != nil { cx.t.Fatalf("failed post proclaim request (%s) (%v)", cx.apiPrefix, err) } @@ -359,7 +359,7 @@ func testV3CurlResignMissiongLeaderKey(cx ctlCtx) { if err := cURLPost(cx.epc, cURLReq{ endpoint: path.Join(cx.apiPrefix, "/election/resign"), value: `{}`, - expected: `{"error":"\"leader\" field must be provided","message":"\"leader\" field must be provided","code":2}`, + expected: `{"error":"\"leader\" field must be provided","code":2,"message":"\"leader\" field must be provided"}`, }); err != nil { cx.t.Fatalf("failed post resign request (%s) (%v)", cx.apiPrefix, err) }