From 2a4562edf4e91dc052fe03f636b25304680e2676 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 27 Jul 2019 12:16:24 +0200 Subject: Enable py36 unit tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It benefits from the swith to lf-virtual1. Change-Id: Ib38bf0adb09df62173894d048fb06c48b3a4b462 Signed-off-by: Cédric Ollivier (cherry picked from commit 4138ba00dd8db7fcf043a071f4c44b52e33265bc) --- .travis.yml | 2 +- functest/opnfv_tests/openstack/rally/rally.py | 99 +++++++++++----------- functest/opnfv_tests/openstack/tempest/tempest.py | 20 ++--- functest/tests/unit/openstack/rally/test_rally.py | 6 +- .../tests/unit/openstack/tempest/test_tempest.py | 8 +- tox.ini | 2 +- upper-constraints.txt | 2 + 7 files changed, 71 insertions(+), 68 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6f164eb80..9f70fc74d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ addons: before_script: - sudo apt-get -y install qemu-user-static - - sudo add-apt-repository -y ppa:jonathonf/python-3.6 + - sudo add-apt-repository -y ppa:deadsnakes/ppa - sudo apt-get update - sudo apt-get install python3.6 python3.6-dev - sudo pip install tox diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index 6ba22ba8e..a0439d142 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -40,29 +40,29 @@ class RallyBase(singlevm.VmReady2): """Base class form Rally testcases implementation.""" # pylint: disable=too-many-instance-attributes, too-many-public-methods - TESTS = ['authenticate', 'glance', 'cinder', 'gnocchi', 'heat', - 'keystone', 'neutron', 'nova', 'quotas'] + stests = ['authenticate', 'glance', 'cinder', 'gnocchi', 'heat', + 'keystone', 'neutron', 'nova', 'quotas'] - RALLY_CONF_PATH = "/etc/rally/rally.conf" - RALLY_AARCH64_PATCH_PATH = pkg_resources.resource_filename( + rally_conf_path = "/etc/rally/rally.conf" + rally_aar4_patch_path = pkg_resources.resource_filename( 'functest', 'ci/rally_aarch64_patch.conf') - RALLY_DIR = pkg_resources.resource_filename( + rally_dir = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/rally') - RALLY_SCENARIO_DIR = pkg_resources.resource_filename( + rally_scenario_dir = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/rally/scenario') - TEMPLATE_DIR = pkg_resources.resource_filename( + template_dir = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/rally/scenario/templates') - SUPPORT_DIR = pkg_resources.resource_filename( + support_dir = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/rally/scenario/support') - USERS_AMOUNT = 2 - TENANTS_AMOUNT = 3 - ITERATIONS_AMOUNT = 10 - CONCURRENCY = 4 - VOLUME_VERSION = 3 - VOLUME_SERVICE_TYPE = "volumev3" - BLACKLIST_FILE = os.path.join(RALLY_DIR, "blacklist.yaml") - TASK_DIR = os.path.join(getattr(config.CONF, 'dir_rally_data'), 'task') - TEMP_DIR = os.path.join(TASK_DIR, 'var') + users_amount = 2 + tenants_amount = 3 + iterations_amount = 10 + concurrency = 4 + volume_version = 3 + volume_service_type = "volumev3" + blacklist_file = os.path.join(rally_dir, "blacklist.yaml") + task_dir = os.path.join(getattr(config.CONF, 'dir_rally_data'), 'task') + temp_dir = os.path.join(task_dir, 'var') visibility = 'public' shared_network = True @@ -108,16 +108,16 @@ class RallyBase(singlevm.VmReady2): task_args['flavor_alt_name'] = str(self.flavor_alt.name) task_args['glance_image_location'] = str(self.filename) task_args['glance_image_format'] = str(self.image_format) - task_args['tmpl_dir'] = str(self.TEMPLATE_DIR) - task_args['sup_dir'] = str(self.SUPPORT_DIR) - task_args['users_amount'] = self.USERS_AMOUNT - task_args['tenants_amount'] = self.TENANTS_AMOUNT + task_args['tmpl_dir'] = str(self.template_dir) + task_args['sup_dir'] = str(self.support_dir) + task_args['users_amount'] = self.users_amount + task_args['tenants_amount'] = self.tenants_amount task_args['use_existing_users'] = False - task_args['iterations'] = self.ITERATIONS_AMOUNT - task_args['concurrency'] = self.CONCURRENCY + task_args['iterations'] = self.iterations_amount + task_args['concurrency'] = self.concurrency task_args['smoke'] = self.smoke - task_args['volume_version'] = self.VOLUME_VERSION - task_args['volume_service_type'] = self.VOLUME_SERVICE_TYPE + task_args['volume_version'] = self.volume_version + task_args['volume_service_type'] = self.volume_service_type task_args['block_migration'] = env.get("BLOCK_MIGRATION").lower() if self.ext_net: @@ -135,7 +135,7 @@ class RallyBase(singlevm.VmReady2): def _prepare_test_list(self, test_name): """Build the list of test cases to be executed.""" test_yaml_file_name = 'opnfv-{}.yaml'.format(test_name) - scenario_file_name = os.path.join(self.RALLY_SCENARIO_DIR, + scenario_file_name = os.path.join(self.rally_scenario_dir, test_yaml_file_name) if not os.path.exists(scenario_file_name): @@ -147,10 +147,10 @@ class RallyBase(singlevm.VmReady2): % scenario_file_name) LOGGER.debug('Scenario fetched from : %s', scenario_file_name) - test_file_name = os.path.join(self.TEMP_DIR, test_yaml_file_name) + test_file_name = os.path.join(self.temp_dir, test_yaml_file_name) - if not os.path.exists(self.TEMP_DIR): - os.makedirs(self.TEMP_DIR) + if not os.path.exists(self.temp_dir): + os.makedirs(self.temp_dir) self.apply_blacklist(scenario_file_name, test_file_name) return test_file_name @@ -178,10 +178,10 @@ class RallyBase(singlevm.VmReady2): if pod_arch and pod_arch in arch_filter: LOGGER.info("Apply aarch64 specific to rally config...") - with open(RallyBase.RALLY_AARCH64_PATCH_PATH, "r") as pfile: + with open(RallyBase.rally_aar4_patch_path, "r") as pfile: rally_patch_conf = pfile.read() - for line in fileinput.input(RallyBase.RALLY_CONF_PATH): + for line in fileinput.input(RallyBase.rally_conf_path): print(line, end=' ') if "cirros|testvm" in line: print(rally_patch_conf) @@ -282,7 +282,7 @@ class RallyBase(singlevm.VmReady2): """Exclude scenario.""" black_tests = [] try: - with open(RallyBase.BLACKLIST_FILE, 'r') as black_list_file: + with open(RallyBase.blacklist_file, 'r') as black_list_file: black_list_yaml = yaml.safe_load(black_list_file) deploy_scenario = env.get('DEPLOY_SCENARIO') @@ -326,7 +326,7 @@ class RallyBase(singlevm.VmReady2): func_list = [] try: - with open(RallyBase.BLACKLIST_FILE, 'r') as black_list_file: + with open(RallyBase.blacklist_file, 'r') as black_list_file: black_list_yaml = yaml.safe_load(black_list_file) if env.get('BLOCK_MIGRATION').lower() == 'true': @@ -439,6 +439,7 @@ class RallyBase(singlevm.VmReady2): self._save_results(test_name, task_id) def _append_summary(self, json_raw, test_name): + # pylint: disable=too-many-locals """Update statistics summary info.""" nb_tests = 0 nb_success = 0 @@ -481,29 +482,29 @@ class RallyBase(singlevm.VmReady2): """Prepare resources needed by test scenarios.""" assert self.cloud LOGGER.debug('Validating run tests...') - for test in kwargs.get('tests', self.TESTS): - if test in self.TESTS: + for test in kwargs.get('tests', self.stests): + if test in self.stests: self.tests.append(test) else: raise Exception("Test name '%s' is invalid" % test) - if not os.path.exists(self.TASK_DIR): - os.makedirs(self.TASK_DIR) + if not os.path.exists(self.task_dir): + os.makedirs(self.task_dir) - task = os.path.join(self.RALLY_DIR, 'task.yaml') + task = os.path.join(self.rally_dir, 'task.yaml') if not os.path.exists(task): LOGGER.error("Task file '%s' does not exist.", task) raise Exception("Task file '{}' does not exist.". format(task)) - self.task_file = os.path.join(self.TASK_DIR, 'task.yaml') + self.task_file = os.path.join(self.task_dir, 'task.yaml') shutil.copyfile(task, self.task_file) - task_macro = os.path.join(self.RALLY_DIR, 'macro') + task_macro = os.path.join(self.rally_dir, 'macro') if not os.path.exists(task_macro): LOGGER.error("Task macro dir '%s' does not exist.", task_macro) raise Exception("Task macro dir '{}' does not exist.". format(task_macro)) - macro_dir = os.path.join(self.TASK_DIR, 'macro') + macro_dir = os.path.join(self.task_dir, 'macro') if os.path.exists(macro_dir): shutil.rmtree(macro_dir) shutil.copytree(task_macro, macro_dir) @@ -709,7 +710,7 @@ class RallySanity(RallyBase): kwargs["case_name"] = "rally_sanity" super(RallySanity, self).__init__(**kwargs) self.smoke = True - self.scenario_dir = os.path.join(self.RALLY_SCENARIO_DIR, 'sanity') + self.scenario_dir = os.path.join(self.rally_scenario_dir, 'sanity') class RallyFull(RallyBase): @@ -721,26 +722,26 @@ class RallyFull(RallyBase): kwargs["case_name"] = "rally_full" super(RallyFull, self).__init__(**kwargs) self.smoke = False - self.scenario_dir = os.path.join(self.RALLY_SCENARIO_DIR, 'full') + self.scenario_dir = os.path.join(self.rally_scenario_dir, 'full') class RallyJobs(RallyBase): """Rally OpenStack CI testcase implementation.""" - TESTS = ["neutron"] + stests = ["neutron"] def __init__(self, **kwargs): """Initialize RallyJobs object.""" if "case_name" not in kwargs: kwargs["case_name"] = "rally_jobs" super(RallyJobs, self).__init__(**kwargs) - self.task_file = os.path.join(self.RALLY_DIR, 'rally_jobs.yaml') + self.task_file = os.path.join(self.rally_dir, 'rally_jobs.yaml') self.task_yaml = None def prepare_run(self, **kwargs): """Create resources needed by test scenarios.""" super(RallyJobs, self).prepare_run(**kwargs) - with open(os.path.join(self.RALLY_DIR, + with open(os.path.join(self.rally_dir, 'rally_jobs.yaml'), 'r') as task_file: self.task_yaml = yaml.safe_load(task_file) @@ -818,9 +819,9 @@ class RallyJobs(RallyBase): raise Exception("The scenario '%s' does not exist." % task) LOGGER.debug('Scenario fetched from : %s', task) - if not os.path.exists(self.TEMP_DIR): - os.makedirs(self.TEMP_DIR) - task_file_name = os.path.join(self.TEMP_DIR, task_name) + if not os.path.exists(self.temp_dir): + os.makedirs(self.temp_dir) + task_file_name = os.path.join(self.temp_dir, task_name) self.apply_blacklist(task, task_file_name) self.run_cmd = (["rally", "task", "start", "--task", task_file_name]) return True diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index fb0c15512..be86cee86 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -41,13 +41,13 @@ class TempestCommon(singlevm.VmReady2): visibility = 'public' filename_alt = '/home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img' shared_network = True - TEMPEST_CONF_YAML = pkg_resources.resource_filename( + tempest_conf_yaml = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml') - TEMPEST_CUSTOM = pkg_resources.resource_filename( + tempest_custom = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/tempest/custom_tests/test_list.txt') - TEMPEST_BLACKLIST = pkg_resources.resource_filename( + tempest_blacklist = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml') @@ -224,7 +224,7 @@ class TempestCommon(singlevm.VmReady2): @staticmethod def update_tempest_conf_file(conf_file, rconfig): """Update defined paramters into tempest config file""" - with open(TempestCommon.TEMPEST_CONF_YAML) as yfile: + with open(TempestCommon.tempest_conf_yaml) as yfile: conf_yaml = yaml.safe_load(yfile) if conf_yaml: sections = rconfig.sections() @@ -244,8 +244,8 @@ class TempestCommon(singlevm.VmReady2): compute_cnt=1, image_alt_id=None, flavor_alt_id=None, admin_role_name='admin', cidr='192.168.120.0/24', domain_id='default'): - # pylint: disable=too-many-branches,too-many-arguments, - # too-many-statements + # pylint: disable=too-many-branches,too-many-arguments + # pylint: disable=too-many-statements,too-many-locals """ Add/update needed parameters into tempest.conf file """ @@ -335,12 +335,12 @@ class TempestCommon(singlevm.VmReady2): LOGGER.debug("Generating test case list...") self.backup_tempest_config(self.conf_file, '/etc') if kwargs.get('mode') == 'custom': - if os.path.isfile(self.TEMPEST_CUSTOM): + if os.path.isfile(self.tempest_custom): shutil.copyfile( - self.TEMPEST_CUSTOM, self.list) + self.tempest_custom, self.list) else: raise Exception("Tempest test list file %s NOT found." - % self.TEMPEST_CUSTOM) + % self.tempest_custom) else: testr_mode = kwargs.get( 'mode', r'^tempest\.(api|scenario).*\[.*\bsmoke\b.*\]$') @@ -363,7 +363,7 @@ class TempestCommon(singlevm.VmReady2): deploy_scenario = env.get('DEPLOY_SCENARIO') if bool(deploy_scenario): # if DEPLOY_SCENARIO is set we read the file - black_list_file = open(self.TEMPEST_BLACKLIST) + black_list_file = open(self.tempest_blacklist) black_list_yaml = yaml.safe_load(black_list_file) black_list_file.close() for item in black_list_yaml: diff --git a/functest/tests/unit/openstack/rally/test_rally.py b/functest/tests/unit/openstack/rally/test_rally.py index 13b63cd86..226d4e69a 100644 --- a/functest/tests/unit/openstack/rally/test_rally.py +++ b/functest/tests/unit/openstack/rally/test_rally.py @@ -96,7 +96,7 @@ class OSRallyTesting(unittest.TestCase): mock_path_exists.side_effect = self.check_temp_dir yaml_file = 'opnfv-{}.yaml'.format('test_file_name') - ret_val = os.path.join(self.rally_base.TEMP_DIR, yaml_file) + ret_val = os.path.join(self.rally_base.temp_dir, yaml_file) self.assertEqual(self.rally_base._prepare_test_list('test_file_name'), ret_val) mock_path_exists.assert_called() @@ -280,7 +280,7 @@ class OSRallyTesting(unittest.TestCase): mock_summary.assert_called() def test_prepare_run_testname_invalid(self): - self.rally_base.TESTS = ['test1', 'test2'] + self.rally_base.stests = ['test1', 'test2'] with self.assertRaises(Exception): self.rally_base.prepare_run(tests=['test']) @@ -290,7 +290,7 @@ class OSRallyTesting(unittest.TestCase): @mock.patch('functest.opnfv_tests.openstack.rally.rally.shutil.rmtree') def test_prepare_run_flavor_alt_creation_failed(self, *args): # pylint: disable=unused-argument - self.rally_base.TESTS = ['test1', 'test2'] + self.rally_base.stests = ['test1', 'test2'] with mock.patch.object(self.rally_base.cloud, 'list_hypervisors') as mock_list_hyperv, \ mock.patch.object(self.rally_base, 'create_flavor_alt', diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py index a500a37e1..87438ae7c 100644 --- a/functest/tests/unit/openstack/tempest/test_tempest.py +++ b/functest/tests/unit/openstack/tempest/test_tempest.py @@ -57,7 +57,7 @@ class OSTempestTesting(unittest.TestCase): msg = "Tempest test list file %s NOT found." self.tempestcommon.generate_test_list() self.assertTrue( - (msg % self.tempestcommon.TEMPEST_CUSTOM) in context.exception) + (msg % self.tempestcommon.tempest_custom) in context.exception) @mock.patch('subprocess.check_output') @mock.patch('os.remove') @@ -123,7 +123,7 @@ class OSTempestTesting(unittest.TestCase): mock.mock_open()) as mock_open, \ mock.patch.object(self.tempestcommon, 'read_file', return_value=['test1', 'test2']): - self.tempestcommon.TEMPEST_BLACKLIST = Exception + self.tempestcommon.tempest_blacklist = Exception os.environ['DEPLOY_SCENARIO'] = 'deploy_scenario' self.tempestcommon.apply_tempest_blacklist() obj = mock_open() @@ -163,9 +163,9 @@ class OSTempestTesting(unittest.TestCase): return_value=[r'\} tempest\.']), \ mock.patch('functest.opnfv_tests.openstack.tempest.tempest.' 'subprocess.Popen'): - self.tempestcommon.TEMPEST_LIST = 'test_tempest_list' + self.tempestcommon.tempest_list = 'test_tempest_list' cmd = ["rally", "verify", "start", "--load-list", - self.tempestcommon.TEMPEST_LIST] + self.tempestcommon.tempest_list] with self.assertRaises(Exception): self.tempestcommon.run_verifier_tests() mock_logger_info. \ diff --git a/tox.ini b/tox.ini index e81414b22..d7b4465b5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,bandit,py27,perm,cover +envlist = docs,pep8,pylint,yamllint,ansiblelint,bashate,bandit,py27,py36,cover [testenv] usedevelop = True diff --git a/upper-constraints.txt b/upper-constraints.txt index 636c842f4..de66a3156 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -22,3 +22,5 @@ neutron===13.0.2 os-faults===0.1.18 bandit===1.1.0 ruamel.yaml.jinja2==0.2.2 +pylint===1.9.5;python_version=='2.7' +pylint===2.3.1;python_version=='3.6' -- cgit 1.2.3-korg