@@ -479,23 +479,26 @@ class TCPSocketStreamTest(unittest.TestCase):
479
479
built on these islands for generations past? Now shall what of Him?
480
480
'''
481
481
482
- def setUp (self ):
483
- self .server = six .moves .socketserver .ThreadingTCPServer (
484
- ('' , 0 ), self .get_handler_class ())
485
- self .thread = threading .Thread (target = self .server .serve_forever )
486
- self .thread .setDaemon (True )
487
- self .thread .start ()
488
- self .address = 'http://{}:{}' .format (
489
- socket .gethostname (), self .server .server_address [1 ])
490
-
491
- def tearDown (self ):
492
- self .server .shutdown ()
493
- self .server .server_close ()
494
- self .thread .join ()
495
-
496
- def get_handler_class (self ):
497
- stdout_data = self .stdout_data
498
- stderr_data = self .stderr_data
482
+ @classmethod
483
+ def setup_class (cls ):
484
+ cls .server = six .moves .socketserver .ThreadingTCPServer (
485
+ ('' , 0 ), cls .get_handler_class ())
486
+ cls .thread = threading .Thread (target = cls .server .serve_forever )
487
+ cls .thread .setDaemon (True )
488
+ cls .thread .start ()
489
+ cls .address = 'http://{}:{}' .format (
490
+ socket .gethostname (), cls .server .server_address [1 ])
491
+
492
+ @classmethod
493
+ def teardown_class (cls ):
494
+ cls .server .shutdown ()
495
+ cls .server .server_close ()
496
+ cls .thread .join ()
497
+
498
+ @classmethod
499
+ def get_handler_class (cls ):
500
+ stdout_data = cls .stdout_data
501
+ stderr_data = cls .stderr_data
499
502
500
503
class Handler (six .moves .BaseHTTPServer .BaseHTTPRequestHandler , object ):
501
504
def do_POST (self ):
@@ -542,45 +545,45 @@ def request(self, stream=None, tty=None, demux=None):
542
545
return client ._read_from_socket (
543
546
resp , stream = stream , tty = tty , demux = demux )
544
547
545
- def test_read_from_socket_1 (self ):
548
+ def test_read_from_socket_tty (self ):
546
549
res = self .request (stream = True , tty = True , demux = False )
547
550
assert next (res ) == self .stdout_data + self .stderr_data
548
551
with self .assertRaises (StopIteration ):
549
552
next (res )
550
553
551
- def test_read_from_socket_2 (self ):
554
+ def test_read_from_socket_tty_demux (self ):
552
555
res = self .request (stream = True , tty = True , demux = True )
553
556
assert next (res ) == (self .stdout_data + self .stderr_data , None )
554
557
with self .assertRaises (StopIteration ):
555
558
next (res )
556
559
557
- def test_read_from_socket_3 (self ):
560
+ def test_read_from_socket_no_tty (self ):
558
561
res = self .request (stream = True , tty = False , demux = False )
559
562
assert next (res ) == self .stdout_data
560
563
assert next (res ) == self .stderr_data
561
564
with self .assertRaises (StopIteration ):
562
565
next (res )
563
566
564
- def test_read_from_socket_4 (self ):
567
+ def test_read_from_socket_no_tty_demux (self ):
565
568
res = self .request (stream = True , tty = False , demux = True )
566
569
assert (self .stdout_data , None ) == next (res )
567
570
assert (None , self .stderr_data ) == next (res )
568
571
with self .assertRaises (StopIteration ):
569
572
next (res )
570
573
571
- def test_read_from_socket_5 (self ):
574
+ def test_read_from_socket_no_stream_tty (self ):
572
575
res = self .request (stream = False , tty = True , demux = False )
573
576
assert res == self .stdout_data + self .stderr_data
574
577
575
- def test_read_from_socket_6 (self ):
578
+ def test_read_from_socket_no_stream_tty_demux (self ):
576
579
res = self .request (stream = False , tty = True , demux = True )
577
580
assert res == (self .stdout_data + self .stderr_data , None )
578
581
579
- def test_read_from_socket_7 (self ):
582
+ def test_read_from_socket_no_stream_no_tty (self ):
580
583
res = self .request (stream = False , tty = False , demux = False )
581
584
res == self .stdout_data + self .stderr_data
582
585
583
- def test_read_from_socket_8 (self ):
586
+ def test_read_from_socket_no_stream_no_tty_demux (self ):
584
587
res = self .request (stream = False , tty = False , demux = True )
585
588
assert res == (self .stdout_data , self .stderr_data )
586
589
0 commit comments