Integrated internal changes from Google #2403
Conversation
The last up-integration from github to google3 was made at commit e28286f but somehow the change in that commit is not actually in the up-integration CL and as a result that change was reverted by the down-integration. Restoring them should make the jenkins tests running again.
Restore jenkins files.
Fixed JSPB test failures
|
We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm. |
A new test is now passing and so we can remove it from the failure whitelist.
|
LGTM |
The curly brace syntax for sets was introduced in Python 2.7, and so for compatibility with 2.6 we need to avoid using it for now.
This seems to be necessary to prevent warnings in some compiler configurations, particularly for tag numbers that are too large to fit in a signed 32-bit int.
acozzette
force-pushed
the
down-integrate-with-msvc-fix
branch
from
1f67e56 to
db35fe7
Compare
In Python 3 the values() method on a dictionary returns a view instead of a list, so we need to explicitly convert that to a list.
This makes a couple of changes to fix the tests for JRuby 1.7: - Avoid using assert_false since that assertion seems not to exist in older versions - Disable a test related to respond_to? for JRuby. It's hard to tell what is going wrong here but it looks like probably a JRuby bug that has been fixed in more recent versions.
|
@xfxyjwf I added a few more commits so do you want to take another look before I merge this? Now I believe all the tests should be passing. The CLA bot is confused but I think that shouldn't be a problem since and you and I are the only authors of commits in this pull request. |
|
Thanks Adam. The changes all look good to me. |
|
Thanks, Feng! I'll merge this now then. |
…th-msvc-fix Integrated internal changes from Google
No description provided.