diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-05-16 18:43:49 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-05-16 18:43:49 -0700 |
| commit | 19144a6a04ff68286bb23a28a774564b306958ad (patch) | |
| tree | 345c2b9847bb6c2ab55961a291f26613df1eafed /tools/run_tests | |
| parent | f1dc3deed72126df02fe56667ff322ecefd0e164 (diff) | |
| parent | af1fe578e099f5e470a9e1a853181983753ceefa (diff) | |
Merge pull request #6439 from kpayson64/python_health_check
Reworked python health checking and added tests
Diffstat (limited to 'tools/run_tests')
| -rwxr-xr-x | tools/run_tests/build_python.sh | 4 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tools/run_tests/build_python.sh b/tools/run_tests/build_python.sh index 594c20b14c..4cc6881ef5 100755 --- a/tools/run_tests/build_python.sh +++ b/tools/run_tests/build_python.sh @@ -55,3 +55,7 @@ $ROOT/.tox/${TOX_PYTHON_ENV}/bin/python $ROOT/setup.py build $ROOT/.tox/${TOX_PYTHON_ENV}/bin/python $ROOT/setup.py build_py $ROOT/.tox/${TOX_PYTHON_ENV}/bin/python $ROOT/setup.py build_ext --inplace $ROOT/.tox/${TOX_PYTHON_ENV}/bin/python $ROOT/setup.py gather --test + +# Build the health checker +$ROOT/.tox/${TOX_PYTHON_ENV}/bin/python $ROOT/src/python/grpcio_health_checking/setup.py build +$ROOT/.tox/${TOX_PYTHON_ENV}/bin/python $ROOT/src/python/grpcio_health_checking/setup.py build_py diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index fd5564adb2..65596dea7f 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -383,7 +383,9 @@ class PythonLanguage(object): with open('src/python/grpcio/tests/tests.json') as tests_json_file: tests_json = json.load(tests_json_file) environment = dict(_FORCE_ENVIRON_FOR_WRAPPERS) - environment['PYTHONPATH'] = os.path.abspath('src/python/gens') + environment['PYTHONPATH'] = '{}:{}'.format( + os.path.abspath('src/python/gens'), + os.path.abspath('src/python/grpcio_health_checking')) if self.config.build_config != 'gcov': return [self.config.job_spec( ['tools/run_tests/run_python.sh', self._tox_env], |