Skip to content

[GR-21590] Increase XML-RPC server shutdown timeout. #950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
graalvmbot wants to merge 1 commit into from
Closed

[GR-21590] Increase XML-RPC server shutdown timeout. #950

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions graalpython/lib-python/3/test/test_xmlrpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,7 @@ def test_decode(self):
ADDR = PORT = URL = None
# Begin: GraalPy change
SERVER_TIMEOUT = support.LOOPBACK_TIMEOUT
SERVER_SHUTDOWN_TIMEOUT = support.LOOPBACK_TIMEOUT * 2
SSL_PROBE_TIMEOUT = 1.0
# End: GraalPy Change

Expand Down Expand Up @@ -817,15 +818,15 @@ def setUp(self):

# Begin: GraalPy change
def _join_server_thread(self):
self.thread.join(SERVER_TIMEOUT)
self.thread.join(SERVER_SHUTDOWN_TIMEOUT)
self.assertFalse(self.thread.is_alive(), "XML-RPC server thread did not stop")
# End: GraalPy Change

def tearDown(self):
# wait on the server thread to terminate
# Begin: GraalPy change
# self.evt.wait()
self.assertTrue(self.evt.wait(SERVER_TIMEOUT), "XML-RPC server did not stop")
self.assertTrue(self.evt.wait(SERVER_SHUTDOWN_TIMEOUT), "XML-RPC server did not stop")
# End: GraalPy Change

# disable traceback reporting
Expand Down Expand Up @@ -1389,15 +1390,15 @@ def setUp(self):

# Begin: GraalPy change
def _join_server_thread(self):
self.thread.join(SERVER_TIMEOUT)
self.thread.join(SERVER_SHUTDOWN_TIMEOUT)
self.assertFalse(self.thread.is_alive(), "XML-RPC server thread did not stop")
# End: GraalPy Change

def tearDown(self):
# wait on the server thread to terminate
# Begin: GraalPy change
# self.evt.wait()
self.assertTrue(self.evt.wait(SERVER_TIMEOUT), "XML-RPC server did not stop")
self.assertTrue(self.evt.wait(SERVER_SHUTDOWN_TIMEOUT), "XML-RPC server did not stop")
# End: GraalPy Change
# reset flag
xmlrpc.server.SimpleXMLRPCServer._send_traceback_header = False
Expand Down
Loading