diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-08-13 02:07:12 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-08-13 02:07:12 +0200 |
| commit | d9745cab08c168db07afb4b2a6499f51123a67c9 (patch) | |
| tree | 56b6f248fd9aaf00979d6e2e23414cb3c543596f /src/ruby/spec/channel_spec.rb | |
| parent | 720903ae6da6a71641f57184b102b4385db64b99 (diff) | |
| parent | 46e786ba60283e696a88ec1cf16e7eeb3a20efe5 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into the-ultimate-showdown
Conflicts:
src/ruby/ext/grpc/rb_channel.c
Diffstat (limited to 'src/ruby/spec/channel_spec.rb')
| -rw-r--r-- | src/ruby/spec/channel_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ruby/spec/channel_spec.rb b/src/ruby/spec/channel_spec.rb index 9081f0e20c..25cefcdfb7 100644 --- a/src/ruby/spec/channel_spec.rb +++ b/src/ruby/spec/channel_spec.rb @@ -117,7 +117,7 @@ describe GRPC::Core::Channel do deadline = Time.now + 5 blk = proc do - ch.create_call(cq, 'dummy_method', nil, deadline) + ch.create_call(cq, nil, nil, 'dummy_method', nil, deadline) end expect(&blk).to_not raise_error end @@ -128,7 +128,7 @@ describe GRPC::Core::Channel do deadline = Time.now + 5 blk = proc do - ch.create_call(cq, 'dummy_method', nil, deadline) + ch.create_call(cq, nil, nil, 'dummy_method', nil, deadline) end expect(&blk).to raise_error(RuntimeError) end |