From 86ac4f82ce7b01d2d841e633f99ff6599df54d06 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Thu, 21 Sep 2017 20:20:32 -0700 Subject: [PATCH] Check for SSL function directly Instead of looking at Python major and micro versions, check for the required ssl.create_default_context function directly. Change-Id: I6ef528a79d8ff6ff649e8f66f2d11d418e87d9d7 --- tempest_horizon/tests/scenario/test_dashboard_basic_ops.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tempest_horizon/tests/scenario/test_dashboard_basic_ops.py b/tempest_horizon/tests/scenario/test_dashboard_basic_ops.py index a7cd4dd..cd4af56 100644 --- a/tempest_horizon/tests/scenario/test_dashboard_basic_ops.py +++ b/tempest_horizon/tests/scenario/test_dashboard_basic_ops.py @@ -21,7 +21,6 @@ from tempest.lib import decorators from tempest import test import ssl -import sys CONF = config.CONF @@ -132,8 +131,7 @@ class TestDashboardBasicOps(test.BaseTestCase): return self.opener def _ssl_default_context_supported(self): - return ((sys.version_info[0] == 2 and sys.version_info[2] >= 9) or - (sys.version_info[0] == 3)) + return (hasattr(ssl, 'create_default_context')) @decorators.idempotent_id('4f8851b1-0e69-482b-b63b-84c6e76f6c80') def test_basic_scenario(self):