diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-09-24 11:33:04 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-09-24 11:33:04 -0700 |
| commit | f8b14ca5f24448767c8627bb11508ba91ce608a0 (patch) | |
| tree | 9c674d6529e8da204ca26021ca50d005211bc27f /tools/dockerfile/grpc_python/Dockerfile | |
| parent | b9d3596cb1cf9406ea6b1c67eda04a497857f6b4 (diff) | |
| parent | 9e71674ab942c748f24e945327424163c15b5e66 (diff) | |
Merge github.com:grpc/grpc into come-out-of-the-shadow
Diffstat (limited to 'tools/dockerfile/grpc_python/Dockerfile')
| -rw-r--r-- | tools/dockerfile/grpc_python/Dockerfile | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/tools/dockerfile/grpc_python/Dockerfile b/tools/dockerfile/grpc_python/Dockerfile index aa29685bee..bce35adc8b 100644 --- a/tools/dockerfile/grpc_python/Dockerfile +++ b/tools/dockerfile/grpc_python/Dockerfile @@ -40,28 +40,12 @@ RUN make install_c -j12 -C /var/local/git/grpc # Build Python GRPC RUN cd /var/local/git/grpc \ - && pip install src/python/src \ - && pip install src/python/interop + && pip install src/python/grpcio \ + && pip install src/python/grpcio_test # Run Python GRPC's tests -# TODO(nathaniel): It would be nice for these to be auto-discoverable? RUN cd /var/local/git/grpc \ - && python2.7 -B -m grpc._adapter._blocking_invocation_inline_service_test \ - && python2.7 -B -m grpc._adapter._c_test \ - && python2.7 -B -m grpc._adapter._event_invocation_synchronous_event_service_test \ - && python2.7 -B -m grpc._adapter._future_invocation_asynchronous_event_service_test \ - && 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.early_adopter.implementations_test \ - && python2.7 -B -m grpc.framework.base.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 interop._insecure_interop_test \ - && python2.7 -B -m interop._secure_interop_test + && python2.7 -B src/python/grpcio_test/setup.py test # Add a cacerts directory containing the Google root pem file, allowing the interop client to access the production test instance ADD cacerts cacerts |