re-enable unit._exit_test.ExitTest

pull/17466/head
Eric Gribkoff 6 years ago
parent 311ee1eda1
commit e1c78993be
  1. 8
      src/python/grpcio_tests/commands.py
  2. 15
      src/python/grpcio_tests/tests/unit/_exit_test.py

@ -133,6 +133,14 @@ class TestGevent(setuptools.Command):
# TODO(https://github.com/grpc/grpc/issues/15411) unpin gevent version # TODO(https://github.com/grpc/grpc/issues/15411) unpin gevent version
# This test will stuck while running higher version of gevent # This test will stuck while running higher version of gevent
'unit._auth_context_test.AuthContextTest.testSessionResumption', 'unit._auth_context_test.AuthContextTest.testSessionResumption',
# TODO(https://github.com/grpc/grpc/issues/15411) enable these tests
'unit._exit_test.ExitTest.test_in_flight_unary_unary_call',
'unit._exit_test.ExitTest.test_in_flight_unary_stream_call',
'unit._exit_test.ExitTest.test_in_flight_stream_unary_call',
'unit._exit_test.ExitTest.test_in_flight_stream_stream_call',
'unit._exit_test.ExitTest.test_in_flight_partial_unary_stream_call',
'unit._exit_test.ExitTest.test_in_flight_partial_stream_unary_call',
'unit._exit_test.ExitTest.test_in_flight_partial_stream_stream_call',
# TODO(https://github.com/grpc/grpc/issues/17330) enable these three tests # TODO(https://github.com/grpc/grpc/issues/17330) enable these three tests
'channelz._channelz_servicer_test.ChannelzServicerTest.test_many_subchannels', 'channelz._channelz_servicer_test.ChannelzServicerTest.test_many_subchannels',
'channelz._channelz_servicer_test.ChannelzServicerTest.test_many_subchannels_and_sockets', 'channelz._channelz_servicer_test.ChannelzServicerTest.test_many_subchannels_and_sockets',

@ -71,7 +71,6 @@ def wait(process):
process.wait() process.wait()
@unittest.skip('https://github.com/grpc/grpc/issues/7311')
class ExitTest(unittest.TestCase): class ExitTest(unittest.TestCase):
def test_unstarted_server(self): def test_unstarted_server(self):
@ -130,6 +129,8 @@ class ExitTest(unittest.TestCase):
stderr=sys.stderr) stderr=sys.stderr)
interrupt_and_wait(process) interrupt_and_wait(process)
@unittest.skipIf(os.name == 'nt',
'os.kill does not have required permission on Windows')
def test_in_flight_unary_unary_call(self): def test_in_flight_unary_unary_call(self):
process = subprocess.Popen( process = subprocess.Popen(
BASE_COMMAND + [_exit_scenarios.IN_FLIGHT_UNARY_UNARY_CALL], BASE_COMMAND + [_exit_scenarios.IN_FLIGHT_UNARY_UNARY_CALL],
@ -138,6 +139,8 @@ class ExitTest(unittest.TestCase):
interrupt_and_wait(process) interrupt_and_wait(process)
@unittest.skipIf(six.PY2, 'https://github.com/grpc/grpc/issues/6999') @unittest.skipIf(six.PY2, 'https://github.com/grpc/grpc/issues/6999')
@unittest.skipIf(os.name == 'nt',
'os.kill does not have required permission on Windows')
def test_in_flight_unary_stream_call(self): def test_in_flight_unary_stream_call(self):
process = subprocess.Popen( process = subprocess.Popen(
BASE_COMMAND + [_exit_scenarios.IN_FLIGHT_UNARY_STREAM_CALL], BASE_COMMAND + [_exit_scenarios.IN_FLIGHT_UNARY_STREAM_CALL],
@ -145,6 +148,8 @@ class ExitTest(unittest.TestCase):
stderr=sys.stderr) stderr=sys.stderr)
interrupt_and_wait(process) interrupt_and_wait(process)
@unittest.skipIf(os.name == 'nt',
'os.kill does not have required permission on Windows')
def test_in_flight_stream_unary_call(self): def test_in_flight_stream_unary_call(self):
process = subprocess.Popen( process = subprocess.Popen(
BASE_COMMAND + [_exit_scenarios.IN_FLIGHT_STREAM_UNARY_CALL], BASE_COMMAND + [_exit_scenarios.IN_FLIGHT_STREAM_UNARY_CALL],
@ -153,6 +158,8 @@ class ExitTest(unittest.TestCase):
interrupt_and_wait(process) interrupt_and_wait(process)
@unittest.skipIf(six.PY2, 'https://github.com/grpc/grpc/issues/6999') @unittest.skipIf(six.PY2, 'https://github.com/grpc/grpc/issues/6999')
@unittest.skipIf(os.name == 'nt',
'os.kill does not have required permission on Windows')
def test_in_flight_stream_stream_call(self): def test_in_flight_stream_stream_call(self):
process = subprocess.Popen( process = subprocess.Popen(
BASE_COMMAND + [_exit_scenarios.IN_FLIGHT_STREAM_STREAM_CALL], BASE_COMMAND + [_exit_scenarios.IN_FLIGHT_STREAM_STREAM_CALL],
@ -161,6 +168,8 @@ class ExitTest(unittest.TestCase):
interrupt_and_wait(process) interrupt_and_wait(process)
@unittest.skipIf(six.PY2, 'https://github.com/grpc/grpc/issues/6999') @unittest.skipIf(six.PY2, 'https://github.com/grpc/grpc/issues/6999')
@unittest.skipIf(os.name == 'nt',
'os.kill does not have required permission on Windows')
def test_in_flight_partial_unary_stream_call(self): def test_in_flight_partial_unary_stream_call(self):
process = subprocess.Popen( process = subprocess.Popen(
BASE_COMMAND + BASE_COMMAND +
@ -169,6 +178,8 @@ class ExitTest(unittest.TestCase):
stderr=sys.stderr) stderr=sys.stderr)
interrupt_and_wait(process) interrupt_and_wait(process)
@unittest.skipIf(os.name == 'nt',
'os.kill does not have required permission on Windows')
def test_in_flight_partial_stream_unary_call(self): def test_in_flight_partial_stream_unary_call(self):
process = subprocess.Popen( process = subprocess.Popen(
BASE_COMMAND + BASE_COMMAND +
@ -178,6 +189,8 @@ class ExitTest(unittest.TestCase):
interrupt_and_wait(process) interrupt_and_wait(process)
@unittest.skipIf(six.PY2, 'https://github.com/grpc/grpc/issues/6999') @unittest.skipIf(six.PY2, 'https://github.com/grpc/grpc/issues/6999')
@unittest.skipIf(os.name == 'nt',
'os.kill does not have required permission on Windows')
def test_in_flight_partial_stream_stream_call(self): def test_in_flight_partial_stream_stream_call(self):
process = subprocess.Popen( process = subprocess.Popen(
BASE_COMMAND + BASE_COMMAND +

Loading…
Cancel
Save