aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ruby/spec/client_server_spec.rb
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-06-17 09:15:48 -0700
committerGravatar Craig Tiller <ctiller@google.com>2015-06-17 09:15:48 -0700
commitbf8ac3f4060a77ecb2c5d75acffb9d1fd070531c (patch)
tree3ddd49e1e4169bcee662f27cc4d76f7c138ac823 /src/ruby/spec/client_server_spec.rb
parent4c32de585a0f95139d0c2487bc4f4dc954ed2be7 (diff)
parent44a1dd36f5370cf62385ac6701bd0bd3bd160d46 (diff)
Merge branch 'you-complete-me' into we-dont-need-no-backup
Diffstat (limited to 'src/ruby/spec/client_server_spec.rb')
-rw-r--r--src/ruby/spec/client_server_spec.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/ruby/spec/client_server_spec.rb b/src/ruby/spec/client_server_spec.rb
index b247882241..0e85441209 100644
--- a/src/ruby/spec/client_server_spec.rb
+++ b/src/ruby/spec/client_server_spec.rb
@@ -42,11 +42,8 @@ shared_context 'setup: tags' do
let(:sent_message) { 'sent message' }
let(:reply_text) { 'the reply' }
before(:example) do
- @server_finished_tag = Object.new
- @client_finished_tag = Object.new
- @client_metadata_tag = Object.new
+ @client_tag = Object.new
@server_tag = Object.new
- @tag = Object.new
end
def deadline
@@ -395,7 +392,7 @@ describe 'the http client/server' do
after(:example) do
@ch.close
- @server.close
+ @server.close(@server_queue, deadline)
end
it_behaves_like 'basic GRPC message delivery is OK' do
@@ -421,7 +418,7 @@ describe 'the secure http client/server' do
end
after(:example) do
- @server.close
+ @server.close(@server_queue, deadline)
end
it_behaves_like 'basic GRPC message delivery is OK' do