From fea104bc505baf2a648d37f7da9ab48d1a5212a0 Mon Sep 17 00:00:00 2001 From: David Reid Date: Fri, 13 Jun 2014 11:18:02 -0700 Subject: Portable usage of subprocess w/ python3 and python2.6 fixes. --- tests/hazmat/backends/test_openssl.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index 2d953597..75369efc 100644 --- a/tests/hazmat/backends/test_openssl.py +++ b/tests/hazmat/backends/test_openssl.py @@ -216,7 +216,7 @@ class TestOpenSSLRandomEngine(object): name = backend._lib.ENGINE_get_name(current_default) assert name == backend._lib.Cryptography_osrandom_engine_name - def test_osrandom_engine_is_default(self): + def test_osrandom_engine_is_default(self, tmpdir): engine_printer = textwrap.dedent( """ import sys @@ -224,21 +224,24 @@ class TestOpenSSLRandomEngine(object): e = backend._lib.ENGINE_get_default_RAND() name = backend._lib.ENGINE_get_name(e) - sys.stdout.write(backend._ffi.string(name)) + sys.stdout.write(backend._ffi.string(name).decode('ascii')) res = backend._lib.ENGINE_free(e) assert res == 1 """ ) + engine_name = tmpdir.join('engine_name') - engine_name = subprocess.check_output( - [sys.executable, "-c", engine_printer] - ) + with engine_name.open('w') as out: + subprocess.check_call( + [sys.executable, "-c", engine_printer], + stdout=out + ) osrandom_engine_name = backend._ffi.string( backend._lib.Cryptography_osrandom_engine_name ) - assert engine_name == osrandom_engine_name + assert engine_name.read().encode('ascii') == osrandom_engine_name def test_osrandom_sanity_check(self): # This test serves as a check against catastrophic failure. -- cgit v1.2.3