Fix and re-enable newer mitmproxy usage in tests. #6201
Merged
Conversation
This file contains 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
wRAR
commented
Jan 5, 2024
| @@ -46,7 +47,7 @@ def start(self): | |||
| stdout=PIPE, | |||
| ) | |||
| line = self.proc.stdout.readline().decode("utf-8") | |||
| host_port = re.search(r"listening at http://([^:]+:\d+)", line).group(1) | |||
| host_port = re.search(r"listening at (?:http://)?([^:]+:\d+)", line).group(1) | |||
There was a problem hiding this comment.
The output format has changed in some newer version but we can support both.
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #6201 +/- ##
==========================================
- Coverage 88.63% 88.61% -0.02%
==========================================
Files 160 160
Lines 11615 11615
Branches 1890 1890
==========================================
- Hits 10295 10293 -2
- Misses 994 995 +1
- Partials 326 327 +1 |
wRAR
commented
Jan 5, 2024
| @@ -31,6 +31,7 @@ def start(self): | |||
| self.proc = Popen( | |||
| [ | |||
| sys.executable, | |||
| "-u", | |||
There was a problem hiding this comment.
mitmproxy changed the code that prints log lines and we now need to disable stdout buffering to get it via Popen.
kmike
reviewed
Jan 11, 2024
| #mitmproxy >= 5.3.0; python_version >= '3.9' and implementation_name != 'pypy' | ||
| # The tests hang with mitmproxy 8.0.0: https://github.com/scrapy/scrapy/issues/5454 | ||
| mitmproxy >= 4.0.4, < 8; python_version < '3.9' and implementation_name != 'pypy' | ||
| mitmproxy; implementation_name != 'pypy' |
There was a problem hiding this comment.
is there a minimal mitmproxy version, like >8?
There was a problem hiding this comment.
The code should work with any mitmproxy version.
kmike
approved these changes
Jan 11, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
As usual, a two-character fix.
Fixes #5454.