Drop support in py2
Change-Id: I199ccdbf6684c1bc979428898a7d9094a7267f9d
This commit is contained in:
parent
cc3455b732
commit
792bf80f8c
|
@ -12,8 +12,6 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import six
|
|
||||||
|
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
from oslo_serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
from tempest.lib import decorators
|
from tempest.lib import decorators
|
||||||
|
@ -45,8 +43,7 @@ class ActionExecutionTestsV2(base.TestCase):
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception(
|
LOG.exception(
|
||||||
'Exception raised when deleting '
|
'Exception raised when deleting '
|
||||||
'action_executions %s, error message: %s.',
|
'action_executions %s, error message: %s.', action_ex, e
|
||||||
action_ex, six.text_type(e)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
self.client.action_executions = []
|
self.client.action_executions = []
|
||||||
|
|
|
@ -16,8 +16,8 @@ import base64
|
||||||
from keystoneclient import service_catalog as ks_service_catalog
|
from keystoneclient import service_catalog as ks_service_catalog
|
||||||
from oslo_serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
from oslo_utils import uuidutils
|
from oslo_utils import uuidutils
|
||||||
from six.moves.urllib.parse import urlparse
|
|
||||||
from tempest.lib import decorators
|
from tempest.lib import decorators
|
||||||
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
from mistral_tempest_tests.tests import base
|
from mistral_tempest_tests.tests import base
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
from os import path
|
from os import path
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
import paramiko
|
import paramiko
|
||||||
import six
|
|
||||||
|
|
||||||
KEY_PATH = path.expanduser("~/.ssh/")
|
KEY_PATH = path.expanduser("~/.ssh/")
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
@ -47,7 +46,7 @@ def _to_paramiko_private_key(private_key_filename, password=None):
|
||||||
|
|
||||||
|
|
||||||
def _connect(host, username, password=None, pkey=None, proxy=None):
|
def _connect(host, username, password=None, pkey=None, proxy=None):
|
||||||
if isinstance(pkey, six.string_types):
|
if isinstance(pkey, str):
|
||||||
pkey = _to_paramiko_private_key(pkey, password)
|
pkey = _to_paramiko_private_key(pkey, password)
|
||||||
|
|
||||||
LOG.debug('Creating SSH connection to %s', host)
|
LOG.debug('Creating SSH connection to %s', host)
|
||||||
|
|
|
@ -9,7 +9,6 @@ oslo.utils>=3.33.0 # Apache-2.0
|
||||||
oslo.log>=3.36.0 # Apache-2.0
|
oslo.log>=3.36.0 # Apache-2.0
|
||||||
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
|
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
|
||||||
paramiko>=2.0.0 # LGPLv2.1+
|
paramiko>=2.0.0 # LGPLv2.1+
|
||||||
six>=1.10.0 # MIT
|
|
||||||
mock>=2.0.0 # BSD
|
mock>=2.0.0 # BSD
|
||||||
tempest>=17.1.0 # Apache-2.0
|
tempest>=17.1.0 # Apache-2.0
|
||||||
python-keystoneclient>=3.8.0 # Apache-2.0
|
python-keystoneclient>=3.8.0 # Apache-2.0
|
||||||
|
|
Loading…
Reference in New Issue