Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#863 verify_response_with fix #864

Merged
merged 5 commits into from
Nov 18, 2023
Merged

#863 verify_response_with fix #864

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
738935c
#863 verify_response_with fix
octathorp May 12, 2023
f3a413a
Do not break verify_response_with for rest while fixing for mqtt
octathorp May 14, 2023
efbc24a
Merge branch 'master' into 863verifyresponsewithfix
octathorp May 14, 2023
6f7690d
Merge branch 'master' into 863verifyresponsewithfix
michaelboulton Nov 18, 2023
526455f
Fix test
michaelboulton Nov 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion tavern/response.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@ def check_ext_functions(verify_block):
"Badly formatted 'verify_response_with' block"
)

check_ext_functions(response_block.get("verify_response_with", None))
mqtt_responses = response_block.get("mqtt_responses")
for mqtt_response in mqtt_responses:
check_ext_functions(mqtt_response.get("verify_response_with", None))
Copy link
Member

Choose a reason for hiding this comment

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

This won't work because the response block can still be just a single mqtt response, or a rest response, or (soon) a gRPC response.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

As far as I tried with mqtt is working, with single or multiple responses, as even single responses reach this method in the json array form (with only one item, of course). You are totally right about rest response, simply I'm not using rest so I did not think about that.
No idea about future gRPC implementation, so no words about that.

I can try to update pull request with a proper rest response handling if that is enough, but I have no way to make a gRPC-future proof implementation. I was simply trying to fix the bug I reported some days ago.

Copy link
Member

Choose a reason for hiding this comment

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

You don't need to worry about the grpc thing, I'll handle that in the appropriate PR, I mainly just meant it still needs to work for rest responses. Something like

if mqtt_responses := response_block.get("mqtt_responses"):
  for mqtt_response in mqtt_responses:
    check_ext_functions(mqtt_response.get("verify_response_with", None))
else:
  check_ext_functions(response_block.get("verify_response_with", None))

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have updated PR with your code suggestion, thank you!


def check_deprecated_validate(name):
nfuncs = len(self.validate_functions)
Expand Down