From 302e7ef6acd37845e1eb7a7643012d8ffa6a3250 Mon Sep 17 00:00:00 2001 From: Linda Wang Date: Tue, 29 Aug 2017 03:34:37 +0000 Subject: Fix pylint errors in test_refstack_client Change-Id: Ia53ac75c913f351412180b9b71a56b4c5fbbe4a5 Signed-off-by: Linda Wang --- .../refstack_client/test_refstack_client.py | 51 ++++++++++------------ 1 file changed, 24 insertions(+), 27 deletions(-) (limited to 'functest/tests') diff --git a/functest/tests/unit/openstack/refstack_client/test_refstack_client.py b/functest/tests/unit/openstack/refstack_client/test_refstack_client.py index ca0974832..61e950a6b 100644 --- a/functest/tests/unit/openstack/refstack_client/test_refstack_client.py +++ b/functest/tests/unit/openstack/refstack_client/test_refstack_client.py @@ -1,11 +1,14 @@ #!/usr/bin/env python + # Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. -# matthew.lijun@huawei.com wangwulin@huawei.com +# # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 +# pylint: disable=missing-docstring + import logging import mock import pkg_resources @@ -18,8 +21,13 @@ from functest.utils.constants import CONST from snaps.openstack.os_credentials import OSCreds +__author__ = ("Matthew Li ," + "Linda Wang ") + class OSRefstackClientTesting(unittest.TestCase): + """The class testing RefstackClient """ + # pylint: disable=missing-docstring, too-many-public-methods _config = pkg_resources.resource_filename( 'functest', @@ -32,13 +40,20 @@ class OSRefstackClientTesting(unittest.TestCase): 'testlist': self._testlist} CONST.__setattr__('OS_AUTH_URL', 'https://ip:5000/v3') CONST.__setattr__('OS_INSECURE', 'true') + self.case_name = 'refstack_defcore' + self.result = 0 self.os_creds = OSCreds( username='user', password='pass', auth_url='http://foo.com:5000/v3', project_name='bar') + self.details = {"tests": 3, + "failures": 1, + "success": ['tempest.api.compute [18.464988s]'], + "errors": ['tempest.api.volume [0.230334s]'], + "skipped": ['tempest.api.network [1.265828s]']} @mock.patch('functest.opnfv_tests.openstack.refstack_client.tempest_conf.' 'TempestConf', return_value=mock.Mock()) - def _create_client(self, mock_conf): + def _create_client(self, *args): with mock.patch('snaps.openstack.tests.openstack_tests.' 'get_credentials', return_value=self.os_creds): return RefstackClient() @@ -49,11 +64,11 @@ class OSRefstackClientTesting(unittest.TestCase): testlist = 'testlist' client = self._create_client() with mock.patch('functest.opnfv_tests.openstack.refstack_client.' - 'refstack_client.ft_utils.execute_command') as m: + 'refstack_client.ft_utils.execute_command') as m_cmd: cmd = ("refstack-client test {0} -c {1} -v --test-list {2}" .format(insecure, config, testlist)) client.run_defcore(config, testlist) - m.assert_any_call(cmd) + m_cmd.assert_any_call(cmd) def test_run_defcore(self): CONST.__setattr__('OS_AUTH_URL', 'http://ip:5000/v3') @@ -62,25 +77,22 @@ class OSRefstackClientTesting(unittest.TestCase): testlist = 'testlist' client = self._create_client() with mock.patch('functest.opnfv_tests.openstack.refstack_client.' - 'refstack_client.ft_utils.execute_command') as m: + 'refstack_client.ft_utils.execute_command') as m_cmd: cmd = ("refstack-client test {0} -c {1} -v --test-list {2}" .format(insecure, config, testlist)) client.run_defcore(config, testlist) - m.assert_any_call(cmd) + m_cmd.assert_any_call(cmd) @mock.patch('functest.opnfv_tests.openstack.refstack_client.' 'refstack_client.LOGGER.info') @mock.patch('__builtin__.open', side_effect=Exception) - def test_parse_refstack_result_missing_log_file(self, mock_open, - mock_logger_info): - self.case_name = 'refstack_defcore' - self.result = 0 + def test_parse_refstack_result_fail(self, *args): self._create_client().parse_refstack_result() - mock_logger_info.assert_called_once_with( + args[1].assert_called_once_with( "Testcase %s success_rate is %s%%", self.case_name, self.result) - def test_parse_refstack_result_default(self): + def test_parse_refstack_result_ok(self): log_file = (''' {0} tempest.api.compute [18.464988s] ... ok {0} tempest.api.volume [0.230334s] ... FAILED @@ -90,11 +102,6 @@ class OSRefstackClientTesting(unittest.TestCase): - Skipped: 1 - Failed: 1 ''') - self.details = {"tests": 3, - "failures": 1, - "success": ['tempest.api.compute [18.464988s]'], - "errors": ['tempest.api.volume [0.230334s]'], - "skipped": ['tempest.api.network [1.265828s]']} client = self._create_client() with mock.patch('__builtin__.open', mock.mock_open(read_data=log_file)): @@ -108,16 +115,6 @@ class OSRefstackClientTesting(unittest.TestCase): del kwargs[key] return kwargs - def _test_main(self, status, *args): - kwargs = self._get_main_kwargs() - client = self._create_client() - self.assertEqual(client.main(**kwargs), status) - if len(args) > 0: - args[0].assert_called_once_with( - RefstackClient.result_dir) - if len(args) > 1: - args - def _test_main_missing_keyword(self, key): kwargs = self._get_main_kwargs(key) client = self._create_client() -- cgit 1.2.3-korg