Skip to content

test: remove unnecessary response body data check#6545

Merged
spacewander merged 9 commits into
apache:masterfrom
Chever-John:sh4testFiles
Mar 15, 2022
Merged

test: remove unnecessary response body data check#6545
spacewander merged 9 commits into
apache:masterfrom
Chever-John:sh4testFiles

Conversation

@Chever-John

@Chever-John Chever-John commented Mar 8, 2022 •
edited by spacewander
Loading

Copy link
Copy Markdown
Contributor

What this PR does / why we need it:

In the test file, there is a lot of redundant request response body data, and some just duplicate the input content. For this reason, a PR is needed to improve the test example situation.

Fix #6538

Pre-submission checklist:

  • Did you explain what problem does this PR solve? Or what new features have been added?
  • Have you added corresponding test cases?
  • Have you modified the corresponding document?
  • Is this PR backward compatible? If it is not backward compatible, please discuss on the mailing list first

@Chever-John Chever-John changed the title docs: most have been removed docs: remove invalid response body data of test files Mar 8, 2022
spacewander
spacewander reviewed Mar 8, 2022
View reviewed changes

@spacewander spacewander left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look like we need to update:

ngx.status = code

to

if code >= 300 then
    ngx.status = code
end

Because the response data check will convert the status code to 200:

apisix/t/lib/test_admin.lua

Lines 204 to 214 in 9b0460f

if pattern == nil then
return res.status, "passed", res.body, res.headers
end
local res_data = json.decode(res.body)
local ok, err = _M.comp_tab(pattern, res_data)
if not ok then
return 500, "failed, " .. err, res_data
end
return 200, "passed", res_data, res.headers

@spacewander spacewander changed the title docs: remove invalid response body data of test files test: remove unnecessary response body data check Mar 8, 2022
@spacewander spacewander mentioned this pull request Mar 10, 2022
Merged
4 tasks
@spacewander
spacewander merged commit 01da57f into apache:master Mar 15, 2022
@spacewander spacewander mentioned this pull request Mar 17, 2022
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@spacewander spacewander spacewander approved these changes
@shuaijinchao shuaijinchao shuaijinchao approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

docs: remove invalid response body data of test files

3 participants

@Chever-John @spacewander @shuaijinchao