Skip to content

Commit

Permalink
Tidy naming in SSL tests
Browse files Browse the repository at this point in the history
  • Loading branch information
declension committed Feb 28, 2019
1 parent 5ada7f3 commit e7a3e3e
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions tests/transport/test_ssl.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ class FailingSocket(socket):

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.closed = False
self.was_closed = False

def sendall(self, data, flags=None):
log.info("Failing send")
raise SocketError()

def close(self):
super().close()
self.closed = True
self.was_closed = True


class TestSslWrap(TestCase):
class TestSslTransport(TestCase):

def _working_transport(self, server):
return SslSocketTransport('', port=server.port,
Expand All @@ -58,12 +58,14 @@ def test_with_real_server(self):

def test_stop_real_server(self):
with ServerResource() as server:
sslw = self._working_transport(server)
sslw.start()
assert not sslw._ssl_sock._closed, "Shouldn't have closed socket"
sslw.stop()
assert not sslw.is_connected
assert sslw._ssl_sock._closed, "Should have closed socket"
t = self._working_transport(server)
t.start()
assert not t._ssl_sock._closed, "Shouldn't have closed socket"
log.info("Started transport")
t.stop()
assert not t.is_connected
assert t._ssl_sock._closed, "Should have closed socket"
log.info("Finished test")

def test_with_real_server_no_wait(self):
with ServerResource() as server:
Expand All @@ -89,7 +91,7 @@ def test_failing_socket_raises_eventually(self):
with pytest.raises(TransportError) as e:
transport.communicate('HELLO??')
assert "Too many Squeezebox failures" in str(e)
assert transport._ssl_sock.closed
assert transport._ssl_sock.was_closed

def test_no_ca(self):
with ServerResource() as server:
Expand Down

0 comments on commit e7a3e3e

Please sign in to comment.