x/deb-python-tempest-lib
Code Issues Proposed changes

Remove versionutils use in cli framework

Browse Source 
The oslo-incubator version utils module requires oslo log to be pulled
in. This causes conflicts with tempest's use of oslo.log, so for the
time being this commit removes the uses of versionutils from the
library.
This commit is contained in:
Matthew Treinish 2014-08-28 23:15:43 -04:00
parent b6596013d9
commit 0e74d2575c
2 changed files with 0 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tempest_lib/cli/base.py
View File

@ -13,18 +13,14 @@
# License for the specific language governing permissions and limitations
# under the License.
import functools
import logging
import os
import shlex
import subprocess
import testtools
from tempest_lib import base
import tempest_lib.cli.output_parser
from tempest_lib import exceptions
from tempest_lib.openstack.common import versionutils
LOG = logging.getLogger(__name__)
@ -51,44 +47,6 @@ def execute(cmd, action, flags='', params='', fail_ok=False,
return result
def check_client_version(client, version):
"""Checks if the client's version is compatible with the given version
@param client: The client to check.
@param version: The version to compare against.
@return: True if the client version is compatible with the given version
parameter, False otherwise.
"""
current_version = execute(client, '', params='--version',
merge_stderr=True)
if not current_version.strip():
raise exceptions.TempestException('"%s --version" output was empty' %
client)
return versionutils.is_compatible(version, current_version,
same_major=False)
def min_client_version(*args, **kwargs):
"""A decorator to skip tests if the client used isn't of the right version.
@param client: The client command to run. For python-novaclient, this is
'nova', for python-cinderclient this is 'cinder', etc.
@param version: The minimum version required to run the CLI test.
"""
def decorator(func):
@functools.wraps(func)
def wrapper(*func_args, **func_kwargs):
if not check_client_version(kwargs['client'], kwargs['version']):
msg = "requires %s client version >= %s" % (kwargs['client'],
kwargs['version'])
raise testtools.TestCase.skipException(msg)
return func(*func_args, **func_kwargs)
return wrapper
return decorator
class CLIClientBase(object):
def __init__(self, username='', password='', tenant_name='', uri='',
cli_dir='', *args, **kwargs):

58
tempest_lib/tests/cli/test_cli.py
View File

@ -1,58 +0,0 @@
# Copyright 2014 IBM Corp.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import mock
import testtools
from tempest_lib.cli import base as cli
from tempest_lib import exceptions
from tempest_lib.tests import base
class TestMinClientVersion(base.TestCase):
"""Tests for the min_client_version decorator."""
def _test_min_version(self, required, installed, expect_skip):
@cli.min_client_version(client='nova', version=required)
def fake(self, expect_skip):
if expect_skip:
# If we got here, the decorator didn't raise a skipException as
# expected so we need to fail.
self.fail('Should not have gotten past the decorator.')
with mock.patch.object(cli, 'execute',
return_value=installed) as mock_cmd:
if expect_skip:
self.assertRaises(testtools.TestCase.skipException, fake,
self, expect_skip)
else:
fake(self, expect_skip)
mock_cmd.assert_called_once_with('nova', '', params='--version',
merge_stderr=True)
def test_min_client_version(self):
# required, installed, expect_skip
cases = (('2.17.0', '2.17.0', False),
('2.17.0', '2.18.0', False),
('2.18.0', '2.17.0', True))
for case in cases:
self._test_min_version(*case)
@mock.patch.object(cli, 'execute', return_value=' ')
def test_check_client_version_empty_output(self, mock_execute):
# Tests that an exception is raised if the command output is empty.
self.assertRaises(exceptions.TempestException,
cli.check_client_version, 'nova', '2.18.0')