Fix some failures

reviewable/pr6737/r7
Craig Tiller 9 years ago
parent ad1bd46028
commit 8da7b1f779
  1. 2
      test/cpp/qps/gen_build_yaml.py
  2. 2
      tools/dockerfile/test/python_pyenv_x64/Dockerfile
  3. 32
      tools/run_tests/tests.json

@ -82,7 +82,7 @@ print yaml.dump({
'defaults': 'boringssl',
'cpu_cost': guess_cpu(scenario_json),
'exclude_configs': [],
'timeout_seconds': 15
'timeout_seconds': 3*60
}
for scenario_json in scenario_config.CXXLanguage().scenarios()
]

@ -76,7 +76,7 @@ RUN apt-get update && apt-get install -y \
# Install Python packages from PyPI
RUN pip install pip --upgrade
RUN pip install virtualenv
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 six==1.10.0
# Install dependencies for pyenv
RUN apt-get update && apt-get install -y \

@ -27157,7 +27157,7 @@
"windows"
],
"shortname": "json_run_localhost:cpp_generic_async_streaming_ping_pong_secure",
"timeout_seconds": 15
"timeout_seconds": 180
},
{
"args": [
@ -27184,7 +27184,7 @@
"windows"
],
"shortname": "json_run_localhost:cpp_protobuf_async_streaming_ping_pong_secure",
"timeout_seconds": 15
"timeout_seconds": 180
},
{
"args": [
@ -27211,7 +27211,7 @@
"windows"
],
"shortname": "json_run_localhost:cpp_protobuf_async_unary_ping_pong_secure",
"timeout_seconds": 15
"timeout_seconds": 180
},
{
"args": [
@ -27238,7 +27238,7 @@
"windows"
],
"shortname": "json_run_localhost:cpp_protobuf_sync_unary_ping_pong_secure",
"timeout_seconds": 15
"timeout_seconds": 180
},
{
"args": [
@ -27265,7 +27265,7 @@
"windows"
],
"shortname": "json_run_localhost:cpp_protobuf_async_unary_qps_unconstrained_secure",
"timeout_seconds": 15
"timeout_seconds": 180
},
{
"args": [
@ -27292,7 +27292,7 @@
"windows"
],
"shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_secure",
"timeout_seconds": 15
"timeout_seconds": 180
},
{
"args": [
@ -27319,7 +27319,7 @@
"windows"
],
"shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_secure",
"timeout_seconds": 15
"timeout_seconds": 180
},
{
"args": [
@ -27346,7 +27346,7 @@
"windows"
],
"shortname": "json_run_localhost:cpp_generic_async_streaming_qps_one_server_core_secure",
"timeout_seconds": 15
"timeout_seconds": 180
},
{
"args": [
@ -27373,7 +27373,7 @@
"windows"
],
"shortname": "json_run_localhost:cpp_generic_async_streaming_ping_pong_insecure",
"timeout_seconds": 15
"timeout_seconds": 180
},
{
"args": [
@ -27400,7 +27400,7 @@
"windows"
],
"shortname": "json_run_localhost:cpp_protobuf_async_streaming_ping_pong_insecure",
"timeout_seconds": 15
"timeout_seconds": 180
},
{
"args": [
@ -27427,7 +27427,7 @@
"windows"
],
"shortname": "json_run_localhost:cpp_protobuf_async_unary_ping_pong_insecure",
"timeout_seconds": 15
"timeout_seconds": 180
},
{
"args": [
@ -27454,7 +27454,7 @@
"windows"
],
"shortname": "json_run_localhost:cpp_protobuf_sync_unary_ping_pong_insecure",
"timeout_seconds": 15
"timeout_seconds": 180
},
{
"args": [
@ -27481,7 +27481,7 @@
"windows"
],
"shortname": "json_run_localhost:cpp_protobuf_async_unary_qps_unconstrained_insecure",
"timeout_seconds": 15
"timeout_seconds": 180
},
{
"args": [
@ -27508,7 +27508,7 @@
"windows"
],
"shortname": "json_run_localhost:cpp_protobuf_async_streaming_qps_unconstrained_insecure",
"timeout_seconds": 15
"timeout_seconds": 180
},
{
"args": [
@ -27535,7 +27535,7 @@
"windows"
],
"shortname": "json_run_localhost:cpp_generic_async_streaming_qps_unconstrained_insecure",
"timeout_seconds": 15
"timeout_seconds": 180
},
{
"args": [
@ -27562,7 +27562,7 @@
"windows"
],
"shortname": "json_run_localhost:cpp_generic_async_streaming_qps_one_server_core_insecure",
"timeout_seconds": 15
"timeout_seconds": 180
},
{
"args": [

Loading…
Cancel
Save