diff options
author | 2015-02-17 20:28:40 -0800 | |
---|---|---|
committer | 2015-02-17 20:28:40 -0800 | |
commit | 347b83c22288a20ae977f949ab8cd466e8aa52da (patch) | |
tree | 6b66bf0996c697e72e2a61fcc5885df0f3ef092a /src/ruby | |
parent | f222a4afe96381cc9289af1859a4e28b2d7f54f0 (diff) | |
parent | 560292ab6720aebe6fd40cc1f96e28faa92761d7 (diff) |
Merge github.com:grpc/grpc into copyright
Conflicts:
src/python/src/__init__.py
src/python/src/_adapter/__init__.py
src/python/src/_framework/__init__.py
src/python/src/_framework/base/__init__.py
src/python/src/_framework/base/packets/__init__.py
src/python/src/_framework/common/__init__.py
src/python/src/_framework/face/__init__.py
src/python/src/_framework/face/testing/__init__.py
src/python/src/_framework/foundation/__init__.py
src/python/src/_junkdrawer/__init__.py
Diffstat (limited to 'src/ruby')
-rw-r--r-- | src/ruby/spec/client_server_spec.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/ruby/spec/client_server_spec.rb b/src/ruby/spec/client_server_spec.rb index f5acae896a..1321727f5c 100644 --- a/src/ruby/spec/client_server_spec.rb +++ b/src/ruby/spec/client_server_spec.rb @@ -362,9 +362,11 @@ describe 'the secure http client/server' do @server.close end - it_behaves_like 'basic GRPC message delivery is OK' do - end + # TODO: uncomment after updating the to the new c api + # it_behaves_like 'basic GRPC message delivery is OK' do + # end - it_behaves_like 'GRPC metadata delivery works OK' do - end + # TODO: uncomment after updating the to the new c api + # it_behaves_like 'GRPC metadata delivery works OK' do + # end end |