diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-03-17 19:55:11 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-03-17 19:55:11 -0400 |
| commit | 8ff9e3d282d25bd012a37aeb0913855bce39a111 (patch) | |
| tree | 21dff3a13c5c08a05d78b9c0121452f6d7bca422 | |
| parent | b98d56999b10296fc5ba8b783ca427450cf5e0b4 (diff) | |
| download | pyopenssl-8ff9e3d282d25bd012a37aeb0913855bce39a111.tar.gz | |
swap ERR_remove_thread_state for ERR_clear_error
ERR_remove_thread_state with a NULL arg clears for the current thread,
which is the same behavior as ERR_clear_error. In OpenSSL 1.1.0
ERR_remove_thread_state no longer takes an argument at all so we might
as well just switch this test
| -rw-r--r-- | tests/util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/util.py b/tests/util.py index 5b53dc2..56d7154 100644 --- a/tests/util.py +++ b/tests/util.py @@ -49,7 +49,7 @@ class TestCase(TestCase): # Clean up some long-lived allocations so they won't be reported as # memory leaks. lib.CRYPTO_cleanup_all_ex_data() - lib.ERR_remove_thread_state(ffi.NULL) + lib.ERR_clear_error() after = set(memdbg.heap) if not after - before: @@ -64,7 +64,7 @@ class TestCase(TestCase): # Clean up some long-lived allocations so they won't be reported as # memory leaks. lib.CRYPTO_cleanup_all_ex_data() - lib.ERR_remove_thread_state(ffi.NULL) + lib.ERR_clear_error() after = set(memdbg.heap) |