@@ -197,7 +197,7 @@ def setUp(self):
197
197
self .serv = socket .socket (socket .AF_INET , socket .SOCK_DGRAM , socket .IPPROTO_UDPLITE )
198
198
self .port = socket_helper .bind_port (self .serv )
199
199
200
- class ThreadSafeCleanupTestCase ( unittest . TestCase ) :
200
+ class ThreadSafeCleanupTestCase :
201
201
"""Subclass of unittest.TestCase with thread-safe cleanup methods.
202
202
203
203
This subclass protects the addCleanup() and doCleanups() methods
@@ -4411,7 +4411,7 @@ class RecvmsgIntoSCMRightsStreamTest(RecvmsgIntoMixin, SCMRightsTest,
4411
4411
# threads alive during the test so that the OS cannot deliver the
4412
4412
# signal to the wrong one.
4413
4413
4414
- class InterruptedTimeoutBase ( unittest . TestCase ) :
4414
+ class InterruptedTimeoutBase :
4415
4415
# Base class for interrupted send/receive tests. Installs an
4416
4416
# empty handler for SIGALRM and removes it on teardown, along with
4417
4417
# any scheduled alarms.
@@ -6591,83 +6591,10 @@ def close_fds(fds):
6591
6591
self .assertEqual (data , str (index ).encode ())
6592
6592
6593
6593
6594
- def test_main ():
6595
- tests = [GeneralModuleTests , BasicTCPTest , TCPCloserTest , TCPTimeoutTest ,
6596
- TestExceptions , BufferIOTest , BasicTCPTest2 , BasicUDPTest ,
6597
- UDPTimeoutTest , CreateServerTest , CreateServerFunctionalTest ,
6598
- SendRecvFdsTests ]
6599
-
6600
- tests .extend ([
6601
- NonBlockingTCPTests ,
6602
- FileObjectClassTestCase ,
6603
- UnbufferedFileObjectClassTestCase ,
6604
- LineBufferedFileObjectClassTestCase ,
6605
- SmallBufferedFileObjectClassTestCase ,
6606
- UnicodeReadFileObjectClassTestCase ,
6607
- UnicodeWriteFileObjectClassTestCase ,
6608
- UnicodeReadWriteFileObjectClassTestCase ,
6609
- NetworkConnectionNoServer ,
6610
- NetworkConnectionAttributesTest ,
6611
- NetworkConnectionBehaviourTest ,
6612
- ContextManagersTest ,
6613
- InheritanceTest ,
6614
- NonblockConstantTest
6615
- ])
6616
- tests .append (BasicSocketPairTest )
6617
- tests .append (TestUnixDomain )
6618
- tests .append (TestLinuxAbstractNamespace )
6619
- tests .extend ([TIPCTest , TIPCThreadableTest ])
6620
- tests .extend ([BasicCANTest , CANTest ])
6621
- tests .extend ([BasicRDSTest , RDSTest ])
6622
- tests .append (LinuxKernelCryptoAPI )
6623
- tests .append (BasicQIPCRTRTest )
6624
- tests .extend ([
6625
- BasicVSOCKTest ,
6626
- ThreadedVSOCKSocketStreamTest ,
6627
- ])
6628
- tests .append (BasicBluetoothTest )
6629
- tests .extend ([
6630
- CmsgMacroTests ,
6631
- SendmsgUDPTest ,
6632
- RecvmsgUDPTest ,
6633
- RecvmsgIntoUDPTest ,
6634
- SendmsgUDP6Test ,
6635
- RecvmsgUDP6Test ,
6636
- RecvmsgRFC3542AncillaryUDP6Test ,
6637
- RecvmsgIntoRFC3542AncillaryUDP6Test ,
6638
- RecvmsgIntoUDP6Test ,
6639
- SendmsgUDPLITETest ,
6640
- RecvmsgUDPLITETest ,
6641
- RecvmsgIntoUDPLITETest ,
6642
- SendmsgUDPLITE6Test ,
6643
- RecvmsgUDPLITE6Test ,
6644
- RecvmsgRFC3542AncillaryUDPLITE6Test ,
6645
- RecvmsgIntoRFC3542AncillaryUDPLITE6Test ,
6646
- RecvmsgIntoUDPLITE6Test ,
6647
- SendmsgTCPTest ,
6648
- RecvmsgTCPTest ,
6649
- RecvmsgIntoTCPTest ,
6650
- SendmsgSCTPStreamTest ,
6651
- RecvmsgSCTPStreamTest ,
6652
- RecvmsgIntoSCTPStreamTest ,
6653
- SendmsgUnixStreamTest ,
6654
- RecvmsgUnixStreamTest ,
6655
- RecvmsgIntoUnixStreamTest ,
6656
- RecvmsgSCMRightsStreamTest ,
6657
- RecvmsgIntoSCMRightsStreamTest ,
6658
- # These are slow when setitimer() is not available
6659
- InterruptedRecvTimeoutTest ,
6660
- InterruptedSendTimeoutTest ,
6661
- TestSocketSharing ,
6662
- SendfileUsingSendTest ,
6663
- SendfileUsingSendfileTest ,
6664
- ])
6665
- tests .append (TestMSWindowsTCPFlags )
6666
-
6594
+ def setUpModule ():
6667
6595
thread_info = support .threading_setup ()
6668
- support .run_unittest (* tests )
6669
- support .threading_cleanup (* thread_info )
6596
+ unittest .addModuleCleanup (support .threading_cleanup , * thread_info )
6670
6597
6671
6598
6672
6599
if __name__ == "__main__" :
6673
- test_main ()
6600
+ unittest . main ()
0 commit comments