Skip to content
Snippets Groups Projects
Commit 266494ca authored by Vijay Pai's avatar Vijay Pai
Browse files

Merge branch 'master' into fc_unary

parents cdc25353 b50eea86
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
examples/php/composer.json
+ 1
− 1
View file @ 266494ca
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
"name": "grpc/grpc-demo", "name": "grpc/grpc-demo",
"description": "gRPC example for PHP", "description": "gRPC example for PHP",
"require": { "require": {
"grpc/grpc": "v1.0.0", "grpc/grpc": "v1.0.0"
} }
} }
src/python/grpcio_tests/tests/unit/_cython/cygrpc_test.py
+ 0
− 3
View file @ 266494ca
...@@ -114,9 +114,6 @@ class TypeSmokeTest(unittest.TestCase): ...@@ -114,9 +114,6 @@ class TypeSmokeTest(unittest.TestCase):
lambda ignored_a, ignored_b: None, b'') lambda ignored_a, ignored_b: None, b'')
del plugin del plugin
@unittest.skipIf(
platform.python_implementation() == "PyPy",
'TODO(issue 7672): figure out why this fails on PyPy')
def testCallCredentialsFromPluginUpDown(self): def testCallCredentialsFromPluginUpDown(self):
plugin = cygrpc.CredentialsMetadataPlugin(_metadata_plugin_callback, b'') plugin = cygrpc.CredentialsMetadataPlugin(_metadata_plugin_callback, b'')
call_credentials = cygrpc.call_credentials_metadata_plugin(plugin) call_credentials = cygrpc.call_credentials_metadata_plugin(plugin)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment