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

[4.0.x] Fixed thread termination in servers.tests.LiveServerPort on Python < 3.10.9.

Browse Source 
TestCase.doClassCleanups() cannot be called on Python < 3.10.9 because
setUpClass()/tearDownClass() are called multiple times in
LiveServerTestCase tests (refs #27079).
This commit is contained in:
Mariusz Felisiak 2023-02-02 13:09:15 +01:00
parent d065944353
commit 534895f1ac
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/servers/tests.py
View File

@ -4,6 +4,7 @@ Tests for django.core.servers.
import errno
import os
import socket
import sys
import threading
from http.client import HTTPConnection
from urllib.error import HTTPError
@ -364,7 +365,11 @@ class LiveServerPort(LiveServerBase):
% self.live_server_url,
)
finally:
TestCase.doClassCleanups()
# Class cleanups registered in TestCase subclasses are no longer
# called as TestCase.doClassCleanups() only cleans up the
# particular class in Python 3.10.9+.
if sys.version_info >= (3, 10, 9):
TestCase.doClassCleanups()
TestCase.tearDownClass()
def test_specified_port_bind(self):
@ -384,7 +389,11 @@ class LiveServerPort(LiveServerBase):
% TestCase.port,
)
finally:
TestCase.doClassCleanups()
# Class cleanups registered in TestCase subclasses are no longer
# called as TestCase.doClassCleanups() only cleans up the
# particular class in Python 3.10.9+.
if sys.version_info >= (3, 10, 9):
TestCase.doClassCleanups()
TestCase.tearDownClass()