aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2018-11-20 17:13:43 +0100
committerGravatar GitHub <noreply@github.com>2018-11-20 17:13:43 +0100
commita0912d5f1b067faf8e53f88be6bfbbaef5071634 (patch)
treece505eb3d463ba99b04c27d5dd75be626f616296 /tools/run_tests
parent92ceed8730aa007e62fdd1c629420784c89dcc29 (diff)
parent51e238c2ed02f191aac6e2dbd660cfbd949c73d0 (diff)
Merge pull request #17254 from jtattermusch/runtests_python_nits
run_tests.py cleanup: nits in PythonLanguage
Diffstat (limited to 'tools/run_tests')
-rwxr-xr-xtools/run_tests/run_tests.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index a1f2aaab2f..f00355bafc 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -756,9 +756,10 @@ class PythonLanguage(object):
def dockerfile_dir(self):
return 'tools/dockerfile/test/python_%s_%s' % (
- self.python_manager_name(), _docker_arch_suffix(self.args.arch))
+ self._python_manager_name(), _docker_arch_suffix(self.args.arch))
- def python_manager_name(self):
+ def _python_manager_name(self):
+ """Choose the docker image to use based on python version."""
if self.args.compiler in [
'python2.7', 'python3.5', 'python3.6', 'python3.7'
]:
@@ -771,6 +772,7 @@ class PythonLanguage(object):
return 'stretch_3.7'
def _get_pythons(self, args):
+ """Get python runtimes to test with, based on current platform, architecture, compiler etc."""
if args.arch == 'x86':
bits = '32'
else: