Fix some buildbot tests under Python 3 #2610
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
|
@rodrigc, thanks for your PR! By analyzing the history of the files in this pull request, we identified @douglatornell, @djmitche and @tardyp to be potential reviewers. |
tardyp
requested changes
Jan 17, 2017
| @@ -812,7 +813,8 @@ def addLogWithFailure(self, why, logprefix=""): | |||
| # helper for showing exceptions to the users | |||
| try: | |||
| yield self.addCompleteLog(logprefix + "err.text", why.getTraceback()) | |||
| yield self.addHTMLLog(logprefix + "err.html", formatFailure(why)) | |||
| yield self.addHTMLLog(logprefix + "err.html", | |||
| bytes2NativeString(formatFailure(why))) | |||
There was a problem hiding this comment.
I would expect addHTMLLog to do the ascii2unicode by itself (will probably save you a lot of fixes)
There was a problem hiding this comment.
OK I made the change.
cStringIO is gone in Python 3
cStringIO is gone in Python 3
cStringIO is gone in Python 3
cStringIO is gone in Python 3
StringIO.StringIO is gone in Python 3
On Python 3, map() returns a generator, not a list. This eliminates these errors on Python 3: "'map' object is not subscriptable"
stringified representation of the json. In Python 2 and Python 3, the order of the dictionary is different, so this was causing the stringified json to be in a slightly different order on Python 3, causing the test to fail.
This fixes errors on Python 3
This fixes errors on Python 3
This fixes problems on Python 3
…rors on Python 3. Refactor into helper function.
This fixes errors on Python 3
|
sorry, I've been struggling with the CI instabilities. need to make sure everything is okay |
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.
These tests now work under Python 3: