diff options
| author | Hynek Schlawack <hs@ox.cx> | 2015-10-16 19:56:26 +0200 |
|---|---|---|
| committer | Hynek Schlawack <hs@ox.cx> | 2015-10-16 19:56:26 +0200 |
| commit | b0274ce00641e4283b2f858db71f441ec9fc0082 (patch) | |
| tree | c396093b79c27456bd4a8f3d9707d57eb498087d /OpenSSL | |
| parent | 5ab405600ed3aa1045926be60a58dc899d16fcd6 (diff) | |
| download | pyopenssl-b0274ce00641e4283b2f858db71f441ec9fc0082.tar.gz | |
Fix test failure on 1.0.2d
Diffstat (limited to 'OpenSSL')
| -rw-r--r-- | OpenSSL/test/test_ssl.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSSL/test/test_ssl.py b/OpenSSL/test/test_ssl.py index 39e878f..265aa78 100644 --- a/OpenSSL/test/test_ssl.py +++ b/OpenSSL/test/test_ssl.py @@ -2017,7 +2017,6 @@ class ConnectionTests(TestCase, _LoopbackMixin): # XXX sock_shutdown # XXX master_key -> TypeError # XXX server_random -> TypeError - # XXX state_string # XXX connect -> TypeError # XXX connect_ex -> TypeError # XXX set_connect_state -> TypeError @@ -2335,10 +2334,10 @@ class ConnectionTests(TestCase, _LoopbackMixin): def test_state_string(self): """ - :py:obj:`Connection.state_string` verbosely describes the current - state of the :py:obj:`Connection`. + :meth:`Connection.state_string` verbosely describes the current + state of the :class:`Connection`. """ - (server, client) = socket_pair() + server, client = socket_pair() server = self._loopbackServerFactory(server) client = self._loopbackClientFactory(client) @@ -2364,8 +2363,10 @@ class ConnectionTests(TestCase, _LoopbackMixin): except WantReadError: pass - self.assertEqual('SSLv3 read client certificate A', - server.state_string().decode()) + assert server.state_string().decode() in ( + "SSLv3 read client certificate A", + "SSLv3 read client key exchange A", # 1.0.2d+ + ) self.assertEqual('SSLv3 read server session ticket A', client.state_string().decode()) |
