aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-01-14 20:52:32 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2015-01-14 20:52:32 -0500
commitd359c2f48c8231c325b3a1046bf14e585cebf514 (patch)
treec4b946ccd9150392ede063e32c90e01ecaf4e771
parent539dda8cadc5c011f50ed49f81cd89abbe32bb0d (diff)
parent8e6e24558b460cdadb12a24a2939eb1163ffdaf8 (diff)
downloadcryptography-d359c2f48c8231c325b3a1046bf14e585cebf514.tar.gz
cryptography-d359c2f48c8231c325b3a1046bf14e585cebf514.tar.bz2
cryptography-d359c2f48c8231c325b3a1046bf14e585cebf514.zip
Merge pull request #1626 from reaperhulk/fix-1624
monkeypatch PYCA_WINDOWS_LINK_TYPE in the tests to fix #1624
-rw-r--r--tests/hazmat/bindings/test_openssl.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/hazmat/bindings/test_openssl.py b/tests/hazmat/bindings/test_openssl.py
index 8f89232b..8cc81cdc 100644
--- a/tests/hazmat/bindings/test_openssl.py
+++ b/tests/hazmat/bindings/test_openssl.py
@@ -134,8 +134,9 @@ class TestOpenSSL(object):
assert resp == expected_options
assert b.lib.SSL_get_mode(ssl) == expected_options
- def test_libraries(self):
+ def test_libraries(self, monkeypatch):
assert _get_libraries("darwin") == ["ssl", "crypto"]
+ monkeypatch.setenv('PYCA_WINDOWS_LINK_TYPE', 'static')
assert "ssleay32mt" in _get_libraries("win32")
def test_windows_static_dynamic_libraries(self):