Fix test names

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2018-11-30 14:58:18 -08:00
parent ee6ec4c6e8
commit b2ad302636
1 changed files with 26 additions and 23 deletions

View File

@ -479,23 +479,26 @@ class TCPSocketStreamTest(unittest.TestCase):
built on these islands for generations past? Now shall what of Him? built on these islands for generations past? Now shall what of Him?
''' '''
def setUp(self): @classmethod
self.server = six.moves.socketserver.ThreadingTCPServer( def setup_class(cls):
('', 0), self.get_handler_class()) cls.server = six.moves.socketserver.ThreadingTCPServer(
self.thread = threading.Thread(target=self.server.serve_forever) ('', 0), cls.get_handler_class())
self.thread.setDaemon(True) cls.thread = threading.Thread(target=cls.server.serve_forever)
self.thread.start() cls.thread.setDaemon(True)
self.address = 'http://{}:{}'.format( cls.thread.start()
socket.gethostname(), self.server.server_address[1]) cls.address = 'http://{}:{}'.format(
socket.gethostname(), cls.server.server_address[1])
def tearDown(self): @classmethod
self.server.shutdown() def teardown_class(cls):
self.server.server_close() cls.server.shutdown()
self.thread.join() cls.server.server_close()
cls.thread.join()
def get_handler_class(self): @classmethod
stdout_data = self.stdout_data def get_handler_class(cls):
stderr_data = self.stderr_data stdout_data = cls.stdout_data
stderr_data = cls.stderr_data
class Handler(six.moves.BaseHTTPServer.BaseHTTPRequestHandler, object): class Handler(six.moves.BaseHTTPServer.BaseHTTPRequestHandler, object):
def do_POST(self): def do_POST(self):
@ -542,45 +545,45 @@ class TCPSocketStreamTest(unittest.TestCase):
return client._read_from_socket( return client._read_from_socket(
resp, stream=stream, tty=tty, demux=demux) resp, stream=stream, tty=tty, demux=demux)
def test_read_from_socket_1(self): def test_read_from_socket_tty(self):
res = self.request(stream=True, tty=True, demux=False) res = self.request(stream=True, tty=True, demux=False)
assert next(res) == self.stdout_data + self.stderr_data assert next(res) == self.stdout_data + self.stderr_data
with self.assertRaises(StopIteration): with self.assertRaises(StopIteration):
next(res) next(res)
def test_read_from_socket_2(self): def test_read_from_socket_tty_demux(self):
res = self.request(stream=True, tty=True, demux=True) res = self.request(stream=True, tty=True, demux=True)
assert next(res) == (self.stdout_data + self.stderr_data, None) assert next(res) == (self.stdout_data + self.stderr_data, None)
with self.assertRaises(StopIteration): with self.assertRaises(StopIteration):
next(res) next(res)
def test_read_from_socket_3(self): def test_read_from_socket_no_tty(self):
res = self.request(stream=True, tty=False, demux=False) res = self.request(stream=True, tty=False, demux=False)
assert next(res) == self.stdout_data assert next(res) == self.stdout_data
assert next(res) == self.stderr_data assert next(res) == self.stderr_data
with self.assertRaises(StopIteration): with self.assertRaises(StopIteration):
next(res) next(res)
def test_read_from_socket_4(self): def test_read_from_socket_no_tty_demux(self):
res = self.request(stream=True, tty=False, demux=True) res = self.request(stream=True, tty=False, demux=True)
assert (self.stdout_data, None) == next(res) assert (self.stdout_data, None) == next(res)
assert (None, self.stderr_data) == next(res) assert (None, self.stderr_data) == next(res)
with self.assertRaises(StopIteration): with self.assertRaises(StopIteration):
next(res) next(res)
def test_read_from_socket_5(self): def test_read_from_socket_no_stream_tty(self):
res = self.request(stream=False, tty=True, demux=False) res = self.request(stream=False, tty=True, demux=False)
assert res == self.stdout_data + self.stderr_data assert res == self.stdout_data + self.stderr_data
def test_read_from_socket_6(self): def test_read_from_socket_no_stream_tty_demux(self):
res = self.request(stream=False, tty=True, demux=True) res = self.request(stream=False, tty=True, demux=True)
assert res == (self.stdout_data + self.stderr_data, None) assert res == (self.stdout_data + self.stderr_data, None)
def test_read_from_socket_7(self): def test_read_from_socket_no_stream_no_tty(self):
res = self.request(stream=False, tty=False, demux=False) res = self.request(stream=False, tty=False, demux=False)
res == self.stdout_data + self.stderr_data res == self.stdout_data + self.stderr_data
def test_read_from_socket_8(self): def test_read_from_socket_no_stream_no_tty_demux(self):
res = self.request(stream=False, tty=False, demux=True) res = self.request(stream=False, tty=False, demux=True)
assert res == (self.stdout_data, self.stderr_data) assert res == (self.stdout_data, self.stderr_data)