Support Python 3 #2831
Merged
Support Python 3 #2831
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
Codecov Report
@@ Coverage Diff @@
## master #2831 +/- ##
==========================================
+ Coverage 84.65% 88.37% +3.72%
==========================================
Files 660 4 -656
Lines 37759 86 -37673
Branches 4535 8 -4527
==========================================
- Hits 31963 76 -31887
+ Misses 4462 6 -4456
+ Partials 1334 4 -1330 |
nmuesch
requested changes
Dec 26, 2018
statsd/tests/test_statsd.py
Outdated
| # The only good way to mock this would be to duplicate the logic in the check | ||
| # which doesn't make a very good test. | ||
| # Instead, just add a sleep here since the container is pretty quick to spin up | ||
| time.sleep(10) |
There was a problem hiding this comment.
Suggested change
| time.sleep(10) | |
| log_patterns=['server is up'] |
There was a problem hiding this comment.
Looks like the container emits the above log line that we can wait for instead of hardcoding a time.
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.
What does this PR do?
Make Statsd support Python 3
Motivation
🐍 🚂
Review checklist
no-changeloglabel attachedAdditional Notes
There's a few things to note:
This check has extensive string handling. I have done my best to ensure that, I believe, it is handled consistently between the two versions. But it's complex enough that I am not 100% positive I didn't accidentally introduce a bug.
In Python 2 we used the URL checker to ensure that the docker container spun up. However, it did not really do that. It relied on a bug in the implementation.
There's no good way to do this for a raw tcp connection (instead of an http connection) without replicating the tcp handling logic we have in the check. So, instead, I've just put a sleep in there. This docker container is simple enough that it should always spin up in time.
However, it does introduce a source of uncertainty that is problematic. If someone has a thought on how to better to do this, I'm open to hearing it.