Merge pull request #7625 from thunderboltsid/python-test-fix

Fix the ThreadPoolExecutor: max_workers can't be 0 in _channel_connectivity_test and _channel_ready_future_test
pull/7677/head
kpayson64 8 years ago committed by GitHub
commit 220d14e020
  1. 10
      src/python/grpcio_tests/tests/unit/_channel_connectivity_test.py
  2. 6
      src/python/grpcio_tests/tests/unit/_channel_ready_future_test.py
  3. 48
      src/python/grpcio_tests/tests/unit/_thread_pool.py

@ -32,12 +32,12 @@
import threading import threading
import time import time
import unittest import unittest
from concurrent import futures
import grpc import grpc
from grpc import _channel from grpc import _channel
from grpc import _server from grpc import _server
from tests.unit.framework.common import test_constants from tests.unit.framework.common import test_constants
from tests.unit import _thread_pool
def _ready_in_connectivities(connectivities): def _ready_in_connectivities(connectivities):
@ -104,7 +104,8 @@ class ChannelConnectivityTest(unittest.TestCase):
grpc.ChannelConnectivity.READY, fifth_connectivities) grpc.ChannelConnectivity.READY, fifth_connectivities)
def test_immediately_connectable_channel_connectivity(self): def test_immediately_connectable_channel_connectivity(self):
server = _server.Server(futures.ThreadPoolExecutor(max_workers=0), ()) thread_pool = _thread_pool.RecordingThreadPool(max_workers=None)
server = _server.Server(thread_pool, ())
port = server.add_insecure_port('[::]:0') port = server.add_insecure_port('[::]:0')
server.start() server.start()
first_callback = _Callback() first_callback = _Callback()
@ -141,9 +142,11 @@ class ChannelConnectivityTest(unittest.TestCase):
fourth_connectivities) fourth_connectivities)
self.assertNotIn( self.assertNotIn(
grpc.ChannelConnectivity.SHUTDOWN, fourth_connectivities) grpc.ChannelConnectivity.SHUTDOWN, fourth_connectivities)
self.assertFalse(thread_pool.was_used())
def test_reachable_then_unreachable_channel_connectivity(self): def test_reachable_then_unreachable_channel_connectivity(self):
server = _server.Server(futures.ThreadPoolExecutor(max_workers=0), ()) thread_pool = _thread_pool.RecordingThreadPool(max_workers=None)
server = _server.Server(thread_pool, ())
port = server.add_insecure_port('[::]:0') port = server.add_insecure_port('[::]:0')
server.start() server.start()
callback = _Callback() callback = _Callback()
@ -155,6 +158,7 @@ class ChannelConnectivityTest(unittest.TestCase):
server.stop(None) server.stop(None)
callback.block_until_connectivities_satisfy(_last_connectivity_is_not_ready) callback.block_until_connectivities_satisfy(_last_connectivity_is_not_ready)
channel.unsubscribe(callback.update) channel.unsubscribe(callback.update)
self.assertFalse(thread_pool.was_used())
if __name__ == '__main__': if __name__ == '__main__':

@ -31,12 +31,12 @@
import threading import threading
import unittest import unittest
from concurrent import futures
import grpc import grpc
from grpc import _channel from grpc import _channel
from grpc import _server from grpc import _server
from tests.unit.framework.common import test_constants from tests.unit.framework.common import test_constants
from tests.unit import _thread_pool
class _Callback(object): class _Callback(object):
@ -78,7 +78,8 @@ class ChannelReadyFutureTest(unittest.TestCase):
self.assertFalse(ready_future.running()) self.assertFalse(ready_future.running())
def test_immediately_connectable_channel_connectivity(self): def test_immediately_connectable_channel_connectivity(self):
server = _server.Server(futures.ThreadPoolExecutor(max_workers=0), ()) thread_pool = _thread_pool.RecordingThreadPool(max_workers=None)
server = _server.Server(thread_pool, ())
port = server.add_insecure_port('[::]:0') port = server.add_insecure_port('[::]:0')
server.start() server.start()
channel = grpc.insecure_channel('localhost:{}'.format(port)) channel = grpc.insecure_channel('localhost:{}'.format(port))
@ -97,6 +98,7 @@ class ChannelReadyFutureTest(unittest.TestCase):
self.assertFalse(ready_future.cancelled()) self.assertFalse(ready_future.cancelled())
self.assertTrue(ready_future.done()) self.assertTrue(ready_future.done())
self.assertFalse(ready_future.running()) self.assertFalse(ready_future.running())
self.assertFalse(thread_pool.was_used())
if __name__ == '__main__': if __name__ == '__main__':

@ -0,0 +1,48 @@
# Copyright 2016, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import threading
from concurrent import futures
class RecordingThreadPool(futures.Executor):
"""A thread pool that records if used."""
def __init__(self, max_workers):
self._tp_executor = futures.ThreadPoolExecutor(max_workers=max_workers)
self._lock = threading.Lock()
self._was_used = False
def submit(self, fn, *args, **kwargs):
with self._lock:
self._was_used = True
self._tp_executor.submit(fn, *args, **kwargs)
def was_used(self):
with self._lock:
return self._was_used
Loading…
Cancel
Save