-
Notifications
You must be signed in to change notification settings - Fork 2
Fix three bugs in step_manager (missing return, wrong error text, header array shape) #28
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.
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
Closed
benjithompson
wants to merge
3
commits into
Runscope:master
from
benjithompson:fix/step-manager-bugs
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -88,7 +88,7 @@ async def add_body_to_step( | |
| request_step_body["body"] = safe_json | ||
| except json.JSONDecodeError as e: | ||
| return BaseResult(error=f"Invalid JSON content provided for body_content: {str(e)}") | ||
| request_headers["Content-Type"] = "application/json" | ||
| request_headers["Content-Type"] = ["application/json"] | ||
|
|
||
| case "xml": | ||
| try: | ||
|
|
@@ -101,7 +101,7 @@ async def add_body_to_step( | |
| return BaseResult(error=f"Invalid XML content provided for body_content: {str(e)}") | ||
| except Exception as e: | ||
| return BaseResult(error=f"Error processing XML content: {str(e)}") | ||
| request_headers["Content-Type"] = "application/xml" | ||
| request_headers["Content-Type"] = ["application/xml"] | ||
|
Comment on lines
93
to
+104
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @benjithompson - FYI |
||
|
|
||
| case "html": | ||
| try: | ||
|
|
@@ -110,7 +110,7 @@ async def add_body_to_step( | |
| request_step_body["body"] = safe_html | ||
| except Exception as e: | ||
| return BaseResult(error=f"Error processing HTML content: {str(e)}") | ||
| request_headers["Content-Type"] = "text/html" | ||
| request_headers["Content-Type"] = ["text/html"] | ||
|
|
||
| case "text": | ||
| # Remove any null bytes and control characters except newlines/tabs | ||
|
|
@@ -121,9 +121,9 @@ async def add_body_to_step( | |
| request_step_body["body"] = safe_text | ||
| except Exception as e: | ||
| return BaseResult(error=f"Error processing text content: {str(e)}") | ||
| request_headers["Content-Type"] = "text/plain" | ||
| request_headers["Content-Type"] = ["text/plain"] | ||
| case _: | ||
| BaseResult( | ||
| return BaseResult( | ||
| error=f"Unsupported body_type {body_type}. Supported types are: json, xml, html, text" | ||
| ) | ||
|
|
||
|
|
@@ -156,7 +156,9 @@ async def add_assertion_to_step( | |
| ) -> BaseResult: | ||
| request_result = await self.read(bucket_key, test_id, step_id, result_formatter=None) | ||
| if not request_result or request_result.get("step_type") != "request": | ||
| return BaseResult(error=f"Step {step_id} is not a request step and cannot have a body added.") | ||
| return BaseResult( | ||
| error=f"Step {step_id} is not a request step and cannot have an assertion added." | ||
| ) | ||
| if "assertions" not in request_result or not isinstance(request_result["assertions"], list): | ||
| request_result["assertions"] = [] | ||
| new_assertion = {"source": assertion_source, "comparison": assertion_comparison} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@benjithompson - FYI