aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Masood Malekghassemi <soltanmm@users.noreply.github.com>2015-02-20 15:54:46 -0800
committerGravatar Masood Malekghassemi <soltanmm@users.noreply.github.com>2015-02-20 15:54:46 -0800
commit04608c41345bf9b75f0153ff3ee5cd1b0e106ffc (patch)
treeec2382f569acc07e4692414fe6714a6661d867f1 /tools
parent98cb4767cdf5d9b7e83ccd039ef3c6206d87d1ca (diff)
parent7efe54e3367ead56d46f83efece67685ad03fd05 (diff)
Merge pull request #668 from nathanielmanistaatgoogle/assembly
The framework.assembly package.
Diffstat (limited to 'tools')
-rw-r--r--tools/dockerfile/grpc_python/Dockerfile13
-rwxr-xr-xtools/run_tests/run_python.sh1
2 files changed, 8 insertions, 6 deletions
diff --git a/tools/dockerfile/grpc_python/Dockerfile b/tools/dockerfile/grpc_python/Dockerfile
index d434b47351..362227bb65 100644
--- a/tools/dockerfile/grpc_python/Dockerfile
+++ b/tools/dockerfile/grpc_python/Dockerfile
@@ -24,12 +24,13 @@ 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.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.assembly.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
# 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_python.sh b/tools/run_tests/run_python.sh
index f21f854b09..1b8fe1982d 100755
--- a/tools/run_tests/run_python.sh
+++ b/tools/run_tests/run_python.sh
@@ -44,6 +44,7 @@ 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.framework.assembly.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