diff options
author | ganmacs <ganmacs@gmail.com> | 2018-05-16 00:09:48 +0900 |
---|---|---|
committer | ganmacs <ganmacs@gmail.com> | 2018-06-16 22:38:15 +0900 |
commit | 0b4fb6a5e2dc8ec61f55353b6d030d77240ca00a (patch) | |
tree | 98bfa77e4ac257ff635ea983d1fb2f5885088eff /src/ruby/spec/pb | |
parent | 7a94e535f80f6bb250b2c96e2106fae57d4b2d8d (diff) |
Move a script which has a pre-requirement to outside of spec
And make it to be execute when using `./tools/run_tests/run_tests.py -l ruby`
Diffstat (limited to 'src/ruby/spec/pb')
-rw-r--r-- | src/ruby/spec/pb/package_with_underscore/checker_spec.rb | 51 | ||||
-rw-r--r-- | src/ruby/spec/pb/package_with_underscore/data.proto | 23 | ||||
-rw-r--r-- | src/ruby/spec/pb/package_with_underscore/service.proto | 23 |
3 files changed, 0 insertions, 97 deletions
diff --git a/src/ruby/spec/pb/package_with_underscore/checker_spec.rb b/src/ruby/spec/pb/package_with_underscore/checker_spec.rb deleted file mode 100644 index dac7c14a9a..0000000000 --- a/src/ruby/spec/pb/package_with_underscore/checker_spec.rb +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2016 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -require 'open3' -require 'tmpdir' - -describe 'Package with underscore protobuf code generation' do - it 'should have the same content as created by code generation' do - root_dir = File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..') - pb_dir = File.join(root_dir, 'src', 'ruby', 'spec', 'pb') - - fail 'CONFIG env variable unexpectedly unset' unless ENV['CONFIG'] - bins_sub_dir = ENV['CONFIG'] - bins_dir = File.join(root_dir, 'bins', bins_sub_dir) - - plugin = File.join(bins_dir, 'grpc_ruby_plugin') - protoc = File.join(bins_dir, 'protobuf', 'protoc') - - got = nil - - Dir.mktmpdir do |tmp_dir| - gen_out = File.join(tmp_dir, 'package_with_underscore', 'service_services_pb.rb') - - pid = spawn( - protoc, - '-I.', - 'package_with_underscore/service.proto', - "--grpc_out=#{tmp_dir}", - "--plugin=protoc-gen-grpc=#{plugin}", - chdir: pb_dir) - Process.waitpid2(pid) - File.open(gen_out) { |f| got = f.read } - end - - correct_modularized_rpc = 'rpc :TestOne, ' \ - 'Grpc::Testing::PackageWithUnderscore::Data::Request, ' \ - 'Grpc::Testing::PackageWithUnderscore::Data::Response' - expect(got).to include(correct_modularized_rpc) - end -end diff --git a/src/ruby/spec/pb/package_with_underscore/data.proto b/src/ruby/spec/pb/package_with_underscore/data.proto deleted file mode 100644 index 2706f1d7be..0000000000 --- a/src/ruby/spec/pb/package_with_underscore/data.proto +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2018 gRPC authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package grpc.testing.package_with_underscore.data; - -message Request { -} - -message Response { -} diff --git a/src/ruby/spec/pb/package_with_underscore/service.proto b/src/ruby/spec/pb/package_with_underscore/service.proto deleted file mode 100644 index 814c7898cd..0000000000 --- a/src/ruby/spec/pb/package_with_underscore/service.proto +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2018 gRPC authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package grpc.testing.package_with_underscore.service; - -import "package_with_underscore/data.proto"; - -service MyService { - rpc TestOne(data.Request) returns (data.Response) {} -} |