Skip to content

Merge release-0.12 into master#4306

Merged
jtattermusch merged 32 commits intogrpc:masterfrom
jcanizales:merge-release
Dec 8, 2015
Merged

Merge release-0.12 into master#4306
jtattermusch merged 32 commits intogrpc:masterfrom
jcanizales:merge-release

Conversation

@jcanizales
Copy link
Copy Markdown
Contributor

Fixes #4295, and keeps things consistent overall.

Manually solved conflicts for:

Let's wait for the test runs to make sure I didn't mess them up :)

CC @murgatroid99 and @w4-sjcho. This supersedes PR #4301

nicolasnoble and others added 27 commits December 1, 2015 22:52
For a termination action to properly mark an _End as having stopped it
must clear the _End's _cycle attribute. To be able to do that the
termination action must hold a reference to the _End instance.
Migrating the _termination_action behavior that creates termination
actions into the scope of the _End instance is the best way to afford
the needed instance reference.
Context management is implemented.

Stub deletion now cancels all RPCs immediately.
This reorganizes the Python code, scraps the current testing
infrastructure, and implements a simple test discovery and run script
based on the standard Python unittest library so we can trust that our
tests are running.
TODO:
- Documentation
- Make public
- Check I’ve implemented all NSMutDict required methods
Use a custom NSMutableDictionary subclass for request headers
Make Python testing predictable again.
…_change

Generalize metadata plugin arguments to future-proof it
@googlebot
Copy link
Copy Markdown

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.

@jtattermusch
Copy link
Copy Markdown
Contributor

LGTM, but let's wait for all the tests to finish.

@jtattermusch
Copy link
Copy Markdown
Contributor

This branch needs resolving.

@jtattermusch
Copy link
Copy Markdown
Contributor

Looks like the "tox" tool is not available in the python interop image:

+ cd /var/local/git/grpc/src/python/grpcio
+ tox --notest
./tools/run_tests/build_python.sh: line 47: tox: command not found

@soltanmm, @nathanielmanistaatgoogle looks like this has been introduced by by #4281, and that interop tests failure on that PR was ignored. Please fix.

@jcanizales
Copy link
Copy Markdown
Contributor Author

Yeah that's Issue #4317 :)

@jcanizales jcanizales removed the cla: no label Dec 7, 2015
@jcanizales
Copy link
Copy Markdown
Contributor Author

The Jenkins failures are just git exceptions, so I'm going to rerun them.

soltanmm and others added 3 commits December 7, 2015 15:52
The ideal fix would be to have a tox test command for running the
interop server and client.
Fix interop Python test invocation
@jcanizales
Copy link
Copy Markdown
Contributor Author

Please review my manual merge of NativeMetadataCredentialsPlugin.cs, line 100.

@jtattermusch
Copy link
Copy Markdown
Contributor

Changes of NativeMetadataCredentialsPlugin.cs, look good.

@jtattermusch
Copy link
Copy Markdown
Contributor

LGTM, feel free to merge once interop tests & Jenkins are green.

@jtattermusch
Copy link
Copy Markdown
Contributor

Merging as Jenkins looks good and this should fix iOS on travis.

jtattermusch added a commit that referenced this pull request Dec 8, 2015
@jtattermusch jtattermusch merged commit 56bab33 into grpc:master Dec 8, 2015
@jcanizales jcanizales deleted the merge-release branch December 8, 2015 07:56
@lock lock bot locked as resolved and limited conversation to collaborators Jan 29, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants