aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ruby/end2end
diff options
context:
space:
mode:
authorGravatar Alexander Polcyn <apolcyn@google.com>2017-05-17 13:08:34 -0700
committerGravatar Alexander Polcyn <apolcyn@google.com>2017-05-17 13:11:28 -0700
commit5c6dda8639bd390565e794192ddfb15af0837c92 (patch)
tree89f317f43188b359130b79ad7321b93132b5a3a4 /src/ruby/end2end
parent916893b618d602fef2ec1dbf9821611f67a7a1d3 (diff)
fix tentative startup bug
Diffstat (limited to 'src/ruby/end2end')
-rwxr-xr-xsrc/ruby/end2end/grpc_class_init_client.rb3
-rwxr-xr-xsrc/ruby/end2end/grpc_class_init_driver.rb6
2 files changed, 5 insertions, 4 deletions
diff --git a/src/ruby/end2end/grpc_class_init_client.rb b/src/ruby/end2end/grpc_class_init_client.rb
index 464c42d07a..e73ca76850 100755
--- a/src/ruby/end2end/grpc_class_init_client.rb
+++ b/src/ruby/end2end/grpc_class_init_client.rb
@@ -69,7 +69,7 @@ def run_concurrency_stress_test(test_proc)
test_proc.call
- raise 'exception thrown while child thread initing class'
+ fail 'exception thrown while child thread initing class'
end
# default (no gc_stress and no concurrency_stress)
@@ -78,6 +78,7 @@ def run_default_test(test_proc)
test_proc.call
end
test_proc.call
+ thd.join
end
def get_test_proc(grpc_class)
diff --git a/src/ruby/end2end/grpc_class_init_driver.rb b/src/ruby/end2end/grpc_class_init_driver.rb
index 195da3cf9f..c65ed547c5 100755
--- a/src/ruby/end2end/grpc_class_init_driver.rb
+++ b/src/ruby/end2end/grpc_class_init_driver.rb
@@ -65,9 +65,9 @@ def main
end
client_exit_code = $CHILD_STATUS
- # concurrency stress test type is expected to exit with a
- # non-zero status due to an exception being raised
- if client_exit_code != 0 and stress_test_type != 'concurrency'
+ # concurrency stress test type is expected to exit with a
+ # non-zero status due to an exception being raised
+ if client_exit_code != 0 && stress_test_type != 'concurrency'
fail "client failed, exit code #{client_exit_code}"
end
end