From eaa7d203b51aba558eb141ca50ee95a8f7790617 Mon Sep 17 00:00:00 2001
From: Masood Malekghassemi <soltanmm@users.noreply.github.com>
Date: Mon, 7 Dec 2015 14:38:53 -0800
Subject: [PATCH] Fix interop Python test invocation
The ideal fix would be to have a tox test command for running the
interop server and client.
---
src/python/grpcio/tests/_loader.py | 8 --------
src/python/grpcio/tox.ini | 5 +----
tools/jenkins/grpc_interop_python/Dockerfile | 1 +
tools/run_tests/build_python.sh | 2 ++
tools/run_tests/run_interop_tests.py | 4 ++--
5 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/src/python/grpcio/tests/_loader.py b/src/python/grpcio/tests/_loader.py
index 14b22b0846..6992029b5e 100644
--- a/src/python/grpcio/tests/_loader.py
+++ b/src/python/grpcio/tests/_loader.py
@@ -34,14 +34,6 @@ import unittest
import coverage
-# Some global spooky-action-at-a-distance hackery to get around
-# system-installation issues where the google namespace is defaulted to the
-# system even though the egg is higher priority on sys.path. This inverts the
-# path priority on package module paths thus giving any installed eggs higher
-# priority and having little effect otherwise.
-import google
-google.__path__.reverse()
-
TEST_MODULE_REGEX = r'^.*_test$'
diff --git a/src/python/grpcio/tox.ini b/src/python/grpcio/tox.ini
index 0e3cae7861..bfb1ca0cfa 100644
--- a/src/python/grpcio/tox.ini
+++ b/src/python/grpcio/tox.ini
@@ -15,8 +15,5 @@ commands =
coverage html --include='grpc/*' --omit='grpc/framework/alpha/*','grpc/early_adopter/*','grpc/framework/base/*','grpc/framework/face/*','grpc/_adapter/fore.py','grpc/_adapter/rear.py'
coverage report --include='grpc/*' --omit='grpc/framework/alpha/*','grpc/early_adopter/*','grpc/framework/base/*','grpc/framework/face/*','grpc/_adapter/fore.py','grpc/_adapter/rear.py'
deps =
- cython
- coverage
- oauth2client
- protobuf
+ -rrequirements.txt
passenv = *
diff --git a/tools/jenkins/grpc_interop_python/Dockerfile b/tools/jenkins/grpc_interop_python/Dockerfile
index 5850f5f321..6034cbf955 100644
--- a/tools/jenkins/grpc_interop_python/Dockerfile
+++ b/tools/jenkins/grpc_interop_python/Dockerfile
@@ -75,6 +75,7 @@ RUN ln -s /usr/bin/ccache /usr/local/bin/clang++
# Install Python requisites
RUN /bin/bash -l -c "pip install --upgrade pip"
RUN /bin/bash -l -c "pip install virtualenv"
+RUN /bin/bash -l -c "pip install tox"
# Define the default command.
CMD ["bash"]
diff --git a/tools/run_tests/build_python.sh b/tools/run_tests/build_python.sh
index 7db14ce9d1..57080ce934 100755
--- a/tools/run_tests/build_python.sh
+++ b/tools/run_tests/build_python.sh
@@ -45,3 +45,5 @@ export GRPC_PYTHON_ENABLE_CYTHON_TRACING=1
cd $GRPCIO
tox --notest
+
+$GRPCIO/.tox/py27/bin/python $GRPCIO/setup.py build
diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py
index be47620048..02ed1d1e6c 100755
--- a/tools/run_tests/run_interop_tests.py
+++ b/tools/run_tests/run_interop_tests.py
@@ -267,7 +267,7 @@ class PythonLanguage:
def client_cmd(self, args):
return [
- 'python2.7_virtual_environment/bin/python',
+ 'src/python/grpcio/.tox/py27/bin/python',
'src/python/grpcio/setup.py',
'run_interop',
'--client',
@@ -279,7 +279,7 @@ class PythonLanguage:
def server_cmd(self, args):
return [
- 'python2.7_virtual_environment/bin/python',
+ 'src/python/grpcio/.tox/py27/bin/python',
'src/python/grpcio/setup.py',
'run_interop',
'--server',
--
GitLab