Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

Fixed thread termination in servers.tests.LiveServerPort on Python 3.10.9+, 3.11.1+, and 3.12+.

Browse Source 
Class cleanups registered in TestCase subclasses are no longer called
as TestCase.doClassCleanups() only cleans up the particular class, see

c2102136be
This commit is contained in:
Mariusz Felisiak 2023-01-12 06:04:10 +01:00 committed by GitHub
parent 4593bc5da1
commit d02a9f0cee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/servers/tests.py
View File

@ -377,12 +377,15 @@ class LiveServerPort(LiveServerBase):
return return
# Unexpected error. # Unexpected error.
raise raise
self.assertNotEqual( try:
self.live_server_url, self.assertNotEqual(
TestCase.live_server_url, self.live_server_url,
f"Acquired duplicate server addresses for server threads: " TestCase.live_server_url,
f"{self.live_server_url}", f"Acquired duplicate server addresses for server threads: "
) f"{self.live_server_url}",
)
finally:
TestCase.doClassCleanups()
def test_specified_port_bind(self): def test_specified_port_bind(self):
"""LiveServerTestCase.port customizes the server's port.""" """LiveServerTestCase.port customizes the server's port."""
@ -393,12 +396,15 @@ class LiveServerPort(LiveServerBase):
TestCase.port = s.getsockname()[1] TestCase.port = s.getsockname()[1]
s.close() s.close()
TestCase._start_server_thread() TestCase._start_server_thread()
self.assertEqual( try:
TestCase.port, self.assertEqual(
TestCase.server_thread.port, TestCase.port,
f"Did not use specified port for LiveServerTestCase thread: " TestCase.server_thread.port,
f"{TestCase.port}", f"Did not use specified port for LiveServerTestCase thread: "
) f"{TestCase.port}",
)
finally:
TestCase.doClassCleanups()
class LiveServerThreadedTests(LiveServerBase): class LiveServerThreadedTests(LiveServerBase):