summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2018-03-21 14:49:42 +0100
committerAlex Gaynor <alex.gaynor@gmail.com>2018-03-21 09:49:42 -0400
commit1ae7cb68cd285fe822c84d8e3198aff9716cf4e8 (patch)
tree8b280f24b25c1f1d2b9e0478655d3fddbaf1468e /tests
parent993c4e4afc4274019bdb835b64191afeed6c13b7 (diff)
downloadpyopenssl-git-1ae7cb68cd285fe822c84d8e3198aff9716cf4e8.tar.gz
Raise minimum cryptography version to 2.2.1, drop python 2.6 (#742)
Diffstat (limited to 'tests')
-rw-r--r--tests/test_ssl.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
index 03dd935..1d6bb9f 100644
--- a/tests/test_ssl.py
+++ b/tests/test_ssl.py
@@ -11,7 +11,7 @@ import uuid
from gc import collect, get_referrers
from errno import ECONNREFUSED, EINPROGRESS, EWOULDBLOCK, EPIPE, ESHUTDOWN
-from sys import platform, getfilesystemencoding, version_info
+from sys import platform, getfilesystemencoding
from socket import MSG_PEEK, SHUT_RDWR, error, socket
from os import makedirs
from os.path import join
@@ -99,10 +99,6 @@ V7H54LmltOT/hEh6QWsJqb6BQgH65bswvV/XkYGja8/T0GzvbaVzAgEC
skip_if_py3 = pytest.mark.skipif(PY3, reason="Python 2 only")
-skip_if_py26 = pytest.mark.skipif(
- version_info[0:2] == (2, 6),
- reason="Python 2.7 and later only"
-)
def join_bytes_or_unicode(prefix, suffix):
@@ -2867,7 +2863,6 @@ class TestConnectionSend(object):
assert count == 2
assert client.recv(2) == b'xy'
- @skip_if_py26
def test_short_memoryview(self):
"""
When passed a memoryview onto a small number of bytes,
@@ -3004,7 +2999,6 @@ class TestConnectionRecvInto(object):
assert client.recv_into(output_buffer, flags=MSG_PEEK) == 2
assert output_buffer == bytearray(b'xy\x00\x00\x00')
- @skip_if_py26
def test_memoryview_no_length(self):
"""
`Connection.recv_into` can be passed a `memoryview` instance and data
@@ -3012,7 +3006,6 @@ class TestConnectionRecvInto(object):
"""
self._no_length_test(_make_memoryview)
- @skip_if_py26
def test_memoryview_respects_length(self):
"""
When called with a `memoryview` instance, `Connection.recv_into`
@@ -3021,7 +3014,6 @@ class TestConnectionRecvInto(object):
"""
self._respects_length_test(_make_memoryview)
- @skip_if_py26
def test_memoryview_doesnt_overfill(self):
"""
When called with a `memoryview` instance, `Connection.recv_into`
@@ -3030,7 +3022,6 @@ class TestConnectionRecvInto(object):
"""
self._doesnt_overfill_test(_make_memoryview)
- @skip_if_py26
def test_memoryview_really_doesnt_overfill(self):
"""
When called with a `memoryview` instance and an `nbytes` value that is
@@ -3078,7 +3069,6 @@ class TestConnectionSendall(object):
) == str(w[-1].message))
assert client.recv(1) == b"x"
- @skip_if_py26
def test_short_memoryview(self):
"""
When passed a memoryview onto a small number of bytes,