From feecb2918ee9f42f303777c1b4cf77eba5881051 Mon Sep 17 00:00:00 2001 From: Benjamin Wang Date: Mon, 11 Sep 2023 12:38:16 +0100 Subject: [PATCH] test: simply the expected output for some curl test cases" Signed-off-by: Benjamin Wang --- tests/e2e/v3_curl_auth_test.go | 2 +- tests/e2e/v3_curl_election_test.go | 4 ++-- tests/e2e/v3_curl_kv_test.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/e2e/v3_curl_auth_test.go b/tests/e2e/v3_curl_auth_test.go index 59a68efea139..8ce8c61377fb 100644 --- a/tests/e2e/v3_curl_auth_test.go +++ b/tests/e2e/v3_curl_auth_test.go @@ -121,7 +121,7 @@ func testCurlV3Auth(cx ctlCtx) { if err = e2e.CURLPost(cx.epc, e2e.CURLReq{ Endpoint: "/v3/kv/put", Value: string(putreq), - Expected: expect.ExpectedResponse{Value: "error"}, + Expected: expect.ExpectedResponse{Value: "etcdserver: user name is empty"}, }); err != nil { cx.t.Fatalf("testCurlV3Auth failed to put without token (%v)", err) } diff --git a/tests/e2e/v3_curl_election_test.go b/tests/e2e/v3_curl_election_test.go index 8904da0f86b5..01c7194ed3b6 100644 --- a/tests/e2e/v3_curl_election_test.go +++ b/tests/e2e/v3_curl_election_test.go @@ -124,7 +124,7 @@ func testCurlV3ProclaimMissiongLeaderKey(cx ctlCtx) { if err = e2e.CURLPost(cx.epc, e2e.CURLReq{ Endpoint: "/v3/election/proclaim", Value: string(pdata), - Expected: expect.ExpectedResponse{Value: `{"error":"\"leader\" field must be provided","code":2,"message":"\"leader\" field must be provided"}`}, + Expected: expect.ExpectedResponse{Value: `"message":"\"leader\" field must be provided"`}, }); err != nil { cx.t.Fatalf("failed post proclaim request (%v)", err) } @@ -138,7 +138,7 @@ func testCurlV3ResignMissiongLeaderKey(cx ctlCtx) { if err := e2e.CURLPost(cx.epc, e2e.CURLReq{ Endpoint: "/v3/election/resign", Value: `{}`, - Expected: expect.ExpectedResponse{Value: `{"error":"\"leader\" field must be provided","code":2,"message":"\"leader\" field must be provided"}`}, + Expected: expect.ExpectedResponse{Value: `"message":"\"leader\" field must be provided"`}, }); err != nil { cx.t.Fatalf("failed post resign request (%v)", err) } diff --git a/tests/e2e/v3_curl_kv_test.go b/tests/e2e/v3_curl_kv_test.go index ce5b475f744d..3c553ae4ad8c 100644 --- a/tests/e2e/v3_curl_kv_test.go +++ b/tests/e2e/v3_curl_kv_test.go @@ -155,7 +155,7 @@ func testCurlV3KVTxn(cx ctlCtx) { jsonDat, jerr := m.Marshal(txn) require.NoError(cx.t, jerr) - expected := `"succeeded":true,"responses":[{"response_put":{"header":{"revision":"2"}}}]` + expected := `"succeeded":true` err := e2e.CURLPost(cx.epc, e2e.CURLReq{ Endpoint: "/v3/kv/txn", Value: string(jsonDat), @@ -168,7 +168,7 @@ func testCurlV3KVTxn(cx ctlCtx) { err = e2e.CURLPost(cx.epc, e2e.CURLReq{ Endpoint: "/v3/kv/txn", Value: malformed, - Expected: expect.ExpectedResponse{Value: "error"}, + Expected: expect.ExpectedResponse{Value: "etcdserver: key not found"}, }) require.NoErrorf(cx.t, err, "testCurlV3Txn with malformed request failed") }