diff options
| author |  Yang Gao <yangg@google.com> | 2015-03-16 11:39:14 -0700 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-03-16 11:39:14 -0700 |
| commit | 5333c5a261e1e23aa59046cd31cf53dbc9c681e9 (patch) | |
| tree | 2e791a395e13813113fa773552c6a77bb7260837 /tools | |
| parent | dca15a6d1e156ea06a040f0a595867de2056b789 (diff) | |
| parent | 1cc9fae6b4e5e9631c7ccb8f8c1c202db9231734 (diff) | |
Merge branch 'master' into untypedAPI
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dockerfile/grpc_python/Dockerfile | 6 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/dockerfile/grpc_python/Dockerfile b/tools/dockerfile/grpc_python/Dockerfile index 58a3d8c14f..fd07e9cc6a 100644 --- a/tools/dockerfile/grpc_python/Dockerfile +++ b/tools/dockerfile/grpc_python/Dockerfile @@ -53,13 +53,15 @@ RUN cd /var/local/git/grpc \ && python2.7 -B -m grpc._adapter._links_test \ && python2.7 -B -m grpc._adapter._lonely_rear_link_test \ && python2.7 -B -m grpc._adapter._low_test \ - && python2.7 -B -m grpc.framework.assembly.implementations_test \ + && python2.7 -B -m grpc.early_adopter.implementations_test \ && python2.7 -B -m grpc.framework.base.packets.implementations_test \ && python2.7 -B -m grpc.framework.face.blocking_invocation_inline_service_test \ && python2.7 -B -m grpc.framework.face.event_invocation_synchronous_event_service_test \ && python2.7 -B -m grpc.framework.face.future_invocation_asynchronous_event_service_test \ && python2.7 -B -m grpc.framework.foundation._later_test \ - && python2.7 -B -m grpc.framework.foundation._logging_pool_test + && python2.7 -B -m grpc.framework.foundation._logging_pool_test \ + && python2.7 -B -m interop._insecure_interop_test \ + && python2.7 -B -m interop._secure_interop_test # Add a cacerts directory containing the Google root pem file, allowing the interop client to access the production test instance ADD cacerts cacerts diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index aee19cdc42..a132ef4541 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -240,7 +240,7 @@ _CONFIGS = { } -_DEFAULT = ['dbg', 'opt'] +_DEFAULT = ['opt'] _LANGUAGES = { 'c++': CLanguage('cxx', 'c++'), 'c': CLanguage('c', 'c'), |