From 5b45dcf3a097efa307e31ab7c8c50719d4d76969 Mon Sep 17 00:00:00 2001 From: Eric Harney Date: Mon, 31 Aug 2015 14:12:53 -0400 Subject: [PATCH] Don't require OpenSSL for unit tests This allows unit tests to run w/o PyOpenSSL installed. Closes-Bug: #1490668 Change-Id: I820875ca66d23327218cc5787ee357e78c812d7f --- cinder/volume/drivers/emc/emc_vmax_https.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cinder/volume/drivers/emc/emc_vmax_https.py b/cinder/volume/drivers/emc/emc_vmax_https.py index 154f48b5e..aa9584f47 100644 --- a/cinder/volume/drivers/emc/emc_vmax_https.py +++ b/cinder/volume/drivers/emc/emc_vmax_https.py @@ -21,7 +21,10 @@ import string import struct from eventlet import patcher -import OpenSSL +try: + import OpenSSL +except ImportError: + OpenSSL = None from oslo_log import log as logging import six from six.moves import http_client @@ -30,10 +33,8 @@ from six.moves import urllib from cinder.i18n import _, _LI # Handle case where we are running in a monkey patched environment -if patcher.is_monkey_patched('socket'): +if OpenSSL and patcher.is_monkey_patched('socket'): from eventlet.green.OpenSSL import SSL -else: - raise ImportError try: import pywbem -- 2.45.2