From bcb870bf2050ff4d6243c2921a5bdc179e8fef37 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Wed, 30 Oct 2019 11:02:13 -0700 Subject: [PATCH 1/5] Make Windows test gRPC with Python 3.6 --- tools/run_tests/run_tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 59edaaed4ed..a27b4a96c1e 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -872,7 +872,7 @@ class PythonLanguage(object): if args.compiler == 'default': if os.name == 'nt': - return (python35_config,) + return (python36_config,) else: if args.iomgr_platform == 'asyncio': return (python36_config,) @@ -907,7 +907,7 @@ class PythonLanguage(object): python35_config, python36_config, python37_config, - # TODO: Add Python 3.8 once it's released. + python38_config, ) else: raise Exception('Compiler %s not supported.' % args.compiler) From e2ee7bb679cfc41d86ea8267750648df7b0bd44a Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Wed, 30 Oct 2019 17:00:16 -0700 Subject: [PATCH 2/5] Disable unit._channel_close_test.ChannelCloseTest --- src/python/grpcio_tests/commands.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/python/grpcio_tests/commands.py b/src/python/grpcio_tests/commands.py index 301a2bea23b..c1bad9c9123 100644 --- a/src/python/grpcio_tests/commands.py +++ b/src/python/grpcio_tests/commands.py @@ -191,7 +191,8 @@ class TestGevent(setuptools.Command): ) BANNED_WINDOWS_TESTS = ( # TODO(https://github.com/grpc/grpc/pull/15411) enable this test - 'unit._dns_resolver_test.DNSResolverTest.test_connect_loopback',) + 'unit._dns_resolver_test.DNSResolverTest.test_connect_loopback', + 'unit._channel_close_test.ChannelCloseTest',) description = 'run tests with gevent. Assumes grpc/gevent are installed' user_options = [] From 3cd792ad70b875ee088cc5015b8e02d498e2d428 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Wed, 30 Oct 2019 18:21:41 -0700 Subject: [PATCH 3/5] Make YAPF happy --- src/python/grpcio_tests/commands.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/python/grpcio_tests/commands.py b/src/python/grpcio_tests/commands.py index c1bad9c9123..dd11ab1261d 100644 --- a/src/python/grpcio_tests/commands.py +++ b/src/python/grpcio_tests/commands.py @@ -192,7 +192,8 @@ class TestGevent(setuptools.Command): BANNED_WINDOWS_TESTS = ( # TODO(https://github.com/grpc/grpc/pull/15411) enable this test 'unit._dns_resolver_test.DNSResolverTest.test_connect_loopback', - 'unit._channel_close_test.ChannelCloseTest',) + 'unit._channel_close_test.ChannelCloseTest', + ) description = 'run tests with gevent. Assumes grpc/gevent are installed' user_options = [] From 61d463672db63eab311a14587d33bef60e600927 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Thu, 31 Oct 2019 13:39:43 -0700 Subject: [PATCH 4/5] Windows' gevent is always special! --- src/python/grpcio_tests/commands.py | 4 +--- tools/run_tests/helper_scripts/build_python.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/python/grpcio_tests/commands.py b/src/python/grpcio_tests/commands.py index dd11ab1261d..301a2bea23b 100644 --- a/src/python/grpcio_tests/commands.py +++ b/src/python/grpcio_tests/commands.py @@ -191,9 +191,7 @@ class TestGevent(setuptools.Command): ) BANNED_WINDOWS_TESTS = ( # TODO(https://github.com/grpc/grpc/pull/15411) enable this test - 'unit._dns_resolver_test.DNSResolverTest.test_connect_loopback', - 'unit._channel_close_test.ChannelCloseTest', - ) + 'unit._dns_resolver_test.DNSResolverTest.test_connect_loopback',) description = 'run tests with gevent. Assumes grpc/gevent are installed' user_options = [] diff --git a/tools/run_tests/helper_scripts/build_python.sh b/tools/run_tests/helper_scripts/build_python.sh index 87c16a2ec4f..32cf2325769 100755 --- a/tools/run_tests/helper_scripts/build_python.sh +++ b/tools/run_tests/helper_scripts/build_python.sh @@ -166,7 +166,7 @@ pip_install_dir() { } case "$VENV" in - *py35_gevent*) + *py36_gevent*) # TODO(https://github.com/grpc/grpc/issues/15411) unpin this $VENV_PYTHON -m pip install gevent==1.3.b1 ;; From 1f3675005d7ebec0ea5508af3d1280a3ee3cf1e4 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Mon, 4 Nov 2019 10:47:35 -0800 Subject: [PATCH 5/5] Disable StrictRealTimeTest for gevent --- src/python/grpcio_tests/commands.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/python/grpcio_tests/commands.py b/src/python/grpcio_tests/commands.py index 301a2bea23b..98b0312b404 100644 --- a/src/python/grpcio_tests/commands.py +++ b/src/python/grpcio_tests/commands.py @@ -188,6 +188,7 @@ class TestGevent(setuptools.Command): 'unit._cython._channel_test.ChannelTest.test_negative_deadline_connectivity', # TODO(https://github.com/grpc/grpc/issues/15411) enable this test 'unit._local_credentials_test.LocalCredentialsTest', + 'testing._time_test.StrictRealTimeTest', ) BANNED_WINDOWS_TESTS = ( # TODO(https://github.com/grpc/grpc/pull/15411) enable this test