Skip to content

Commit b2ad302

Browse files
committed
Fix test names
Signed-off-by: Joffrey F <[email protected]>
1 parent ee6ec4c commit b2ad302

File tree

1 file changed

+28
-25
lines changed

1 file changed

+28
-25
lines changed

tests/unit/api_test.py

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -479,23 +479,26 @@ class TCPSocketStreamTest(unittest.TestCase):
479479
built on these islands for generations past? Now shall what of Him?
480480
'''
481481

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
499502

500503
class Handler(six.moves.BaseHTTPServer.BaseHTTPRequestHandler, object):
501504
def do_POST(self):
@@ -542,45 +545,45 @@ def request(self, stream=None, tty=None, demux=None):
542545
return client._read_from_socket(
543546
resp, stream=stream, tty=tty, demux=demux)
544547

545-
def test_read_from_socket_1(self):
548+
def test_read_from_socket_tty(self):
546549
res = self.request(stream=True, tty=True, demux=False)
547550
assert next(res) == self.stdout_data + self.stderr_data
548551
with self.assertRaises(StopIteration):
549552
next(res)
550553

551-
def test_read_from_socket_2(self):
554+
def test_read_from_socket_tty_demux(self):
552555
res = self.request(stream=True, tty=True, demux=True)
553556
assert next(res) == (self.stdout_data + self.stderr_data, None)
554557
with self.assertRaises(StopIteration):
555558
next(res)
556559

557-
def test_read_from_socket_3(self):
560+
def test_read_from_socket_no_tty(self):
558561
res = self.request(stream=True, tty=False, demux=False)
559562
assert next(res) == self.stdout_data
560563
assert next(res) == self.stderr_data
561564
with self.assertRaises(StopIteration):
562565
next(res)
563566

564-
def test_read_from_socket_4(self):
567+
def test_read_from_socket_no_tty_demux(self):
565568
res = self.request(stream=True, tty=False, demux=True)
566569
assert (self.stdout_data, None) == next(res)
567570
assert (None, self.stderr_data) == next(res)
568571
with self.assertRaises(StopIteration):
569572
next(res)
570573

571-
def test_read_from_socket_5(self):
574+
def test_read_from_socket_no_stream_tty(self):
572575
res = self.request(stream=False, tty=True, demux=False)
573576
assert res == self.stdout_data + self.stderr_data
574577

575-
def test_read_from_socket_6(self):
578+
def test_read_from_socket_no_stream_tty_demux(self):
576579
res = self.request(stream=False, tty=True, demux=True)
577580
assert res == (self.stdout_data + self.stderr_data, None)
578581

579-
def test_read_from_socket_7(self):
582+
def test_read_from_socket_no_stream_no_tty(self):
580583
res = self.request(stream=False, tty=False, demux=False)
581584
res == self.stdout_data + self.stderr_data
582585

583-
def test_read_from_socket_8(self):
586+
def test_read_from_socket_no_stream_no_tty_demux(self):
584587
res = self.request(stream=False, tty=False, demux=True)
585588
assert res == (self.stdout_data, self.stderr_data)
586589

0 commit comments

Comments
 (0)