aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-10-24 21:00:19 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-10-24 21:00:19 -0400
commitc6af93903be97612314cbd9a8d8e3264059419df (patch)
tree13c1ae21ac0def7b474406591de72b0a0c8e6927 /tests/hazmat
parentb7ee910c2070a3e5d8d64ac17ceaa5793f114dc1 (diff)
parentd2146ec71afd482073b7b0117184a8689b408b83 (diff)
downloadcryptography-c6af93903be97612314cbd9a8d8e3264059419df.tar.gz
cryptography-c6af93903be97612314cbd9a8d8e3264059419df.tar.bz2
cryptography-c6af93903be97612314cbd9a8d8e3264059419df.zip
Merge pull request #2293 from reaperhulk/idempotent-engine-add
idempotent engine add
Diffstat (limited to 'tests/hazmat')
-rw-r--r--tests/hazmat/bindings/test_openssl.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/hazmat/bindings/test_openssl.py b/tests/hazmat/bindings/test_openssl.py
index 20171fa7..76a9218b 100644
--- a/tests/hazmat/bindings/test_openssl.py
+++ b/tests/hazmat/bindings/test_openssl.py
@@ -89,8 +89,8 @@ class TestOpenSSL(object):
def test_add_engine_more_than_once(self):
b = Binding()
- with pytest.raises(RuntimeError):
- b._register_osrandom_engine()
+ b._register_osrandom_engine()
+ assert b.lib.ERR_get_error() == 0
def test_ssl_ctx_options(self):
# Test that we're properly handling 32-bit unsigned on all platforms.