@@ -199,7 +199,7 @@ def setUp(self):
199199 self .serv = socket .socket (socket .AF_INET , socket .SOCK_DGRAM , socket .IPPROTO_UDPLITE )
200200 self .port = socket_helper .bind_port (self .serv )
201201
202- class ThreadSafeCleanupTestCase ( unittest . TestCase ) :
202+ class ThreadSafeCleanupTestCase :
203203 """Subclass of unittest.TestCase with thread-safe cleanup methods.
204204
205205 This subclass protects the addCleanup() and doCleanups() methods
@@ -4452,7 +4452,7 @@ class RecvmsgIntoSCMRightsStreamTest(RecvmsgIntoMixin, SCMRightsTest,
44524452# threads alive during the test so that the OS cannot deliver the
44534453# signal to the wrong one.
44544454
4455- class InterruptedTimeoutBase ( unittest . TestCase ) :
4455+ class InterruptedTimeoutBase :
44564456 # Base class for interrupted send/receive tests. Installs an
44574457 # empty handler for SIGALRM and removes it on teardown, along with
44584458 # any scheduled alarms.
@@ -6639,84 +6639,10 @@ def close_fds(fds):
66396639 self .assertEqual (data , str (index ).encode ())
66406640
66416641
6642- def test_main ():
6643- tests = [GeneralModuleTests , BasicTCPTest , TCPCloserTest , TCPTimeoutTest ,
6644- TestExceptions , BufferIOTest , BasicTCPTest2 , BasicUDPTest ,
6645- UDPTimeoutTest , CreateServerTest , CreateServerFunctionalTest ,
6646- SendRecvFdsTests ]
6647-
6648- tests .extend ([
6649- NonBlockingTCPTests ,
6650- FileObjectClassTestCase ,
6651- UnbufferedFileObjectClassTestCase ,
6652- LineBufferedFileObjectClassTestCase ,
6653- SmallBufferedFileObjectClassTestCase ,
6654- UnicodeReadFileObjectClassTestCase ,
6655- UnicodeWriteFileObjectClassTestCase ,
6656- UnicodeReadWriteFileObjectClassTestCase ,
6657- NetworkConnectionNoServer ,
6658- NetworkConnectionAttributesTest ,
6659- NetworkConnectionBehaviourTest ,
6660- ContextManagersTest ,
6661- InheritanceTest ,
6662- NonblockConstantTest
6663- ])
6664- tests .append (BasicSocketPairTest )
6665- tests .append (TestUnixDomain )
6666- tests .append (TestLinuxAbstractNamespace )
6667- tests .extend ([TIPCTest , TIPCThreadableTest ])
6668- tests .extend ([BasicCANTest , CANTest ])
6669- tests .extend ([BasicRDSTest , RDSTest ])
6670- tests .append (LinuxKernelCryptoAPI )
6671- tests .append (BasicQIPCRTRTest )
6672- tests .extend ([
6673- BasicVSOCKTest ,
6674- ThreadedVSOCKSocketStreamTest ,
6675- ])
6676- tests .append (BasicBluetoothTest )
6677- tests .extend ([
6678- CmsgMacroTests ,
6679- SendmsgUDPTest ,
6680- RecvmsgUDPTest ,
6681- RecvmsgIntoUDPTest ,
6682- SendmsgUDP6Test ,
6683- RecvmsgUDP6Test ,
6684- RecvmsgRFC3542AncillaryUDP6Test ,
6685- RecvmsgIntoRFC3542AncillaryUDP6Test ,
6686- RecvmsgIntoUDP6Test ,
6687- SendmsgUDPLITETest ,
6688- RecvmsgUDPLITETest ,
6689- RecvmsgIntoUDPLITETest ,
6690- SendmsgUDPLITE6Test ,
6691- RecvmsgUDPLITE6Test ,
6692- RecvmsgRFC3542AncillaryUDPLITE6Test ,
6693- RecvmsgIntoRFC3542AncillaryUDPLITE6Test ,
6694- RecvmsgIntoUDPLITE6Test ,
6695- SendmsgTCPTest ,
6696- RecvmsgTCPTest ,
6697- RecvmsgIntoTCPTest ,
6698- SendmsgSCTPStreamTest ,
6699- RecvmsgSCTPStreamTest ,
6700- RecvmsgIntoSCTPStreamTest ,
6701- SendmsgUnixStreamTest ,
6702- RecvmsgUnixStreamTest ,
6703- RecvmsgIntoUnixStreamTest ,
6704- RecvmsgSCMRightsStreamTest ,
6705- RecvmsgIntoSCMRightsStreamTest ,
6706- # These are slow when setitimer() is not available
6707- InterruptedRecvTimeoutTest ,
6708- InterruptedSendTimeoutTest ,
6709- TestSocketSharing ,
6710- SendfileUsingSendTest ,
6711- SendfileUsingSendfileTest ,
6712- ])
6713- tests .append (TestMSWindowsTCPFlags )
6714- tests .append (TestMacOSTCPFlags )
6715-
6642+ def setUpModule ():
67166643 thread_info = threading_helper .threading_setup ()
6717- support .run_unittest (* tests )
6718- threading_helper .threading_cleanup (* thread_info )
6644+ unittest .addModuleCleanup (threading_helper .threading_cleanup , * thread_info )
67196645
67206646
67216647if __name__ == "__main__" :
6722- test_main ()
6648+ unittest . main ()
0 commit comments