diff --git a/setup.cfg b/setup.cfg index 21bd91c2..baa183af 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,6 +15,7 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python + Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 diff --git a/validations_libs/ansible.py b/validations_libs/ansible.py index 660cf25c..09c65c86 100644 --- a/validations_libs/ansible.py +++ b/validations_libs/ansible.py @@ -18,13 +18,12 @@ import logging import pkg_resources import pwd import os -import six import sys import tempfile import threading import yaml -from six.moves import configparser +import configparser from validations_libs import constants from validations_libs import utils @@ -64,7 +63,7 @@ class Ansible: def _inventory(self, inventory, ansible_artifact_path): """Handle inventory for Ansible""" if inventory: - if isinstance(inventory, six.string_types): + if isinstance(inventory, str): # check is file path if os.path.exists(inventory): return os.path.abspath(inventory) @@ -289,7 +288,7 @@ class Ansible: :type env: `dict`. """ for key, value in env.items(): - env[key] = six.text_type(value) + env[key] = str(value) else: return env diff --git a/validations_libs/tests/cli/test_common.py b/validations_libs/tests/cli/test_common.py index 1197a8b0..6785a1d9 100644 --- a/validations_libs/tests/cli/test_common.py +++ b/validations_libs/tests/cli/test_common.py @@ -39,7 +39,7 @@ class TestCommon(TestCase): data = common.read_cli_data_file('skiplist-example.yaml') self.assertEqual(data, example_data) - @mock.patch('six.moves.builtins.open', side_effect=IOError) + @mock.patch('builtins.open', side_effect=IOError) def test_read_cli_data_file_ioerror(self, mock_open): self.assertRaises(RuntimeError, common.read_cli_data_file, 'foo') diff --git a/validations_libs/tests/cli/test_run.py b/validations_libs/tests/cli/test_run.py index 8ce386e3..7ba0d107 100644 --- a/validations_libs/tests/cli/test_run.py +++ b/validations_libs/tests/cli/test_run.py @@ -157,7 +157,7 @@ class TestRun(BaseCommand): @mock.patch('validations_libs.constants.VALIDATIONS_LOG_BASEDIR') @mock.patch('yaml.safe_load', return_value={'key': 'value'}) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('getpass.getuser', return_value='doe') @mock.patch('validations_libs.validation_actions.ValidationActions.' @@ -533,7 +533,7 @@ class TestRun(BaseCommand): @mock.patch('validations_libs.constants.VALIDATIONS_LOG_BASEDIR') @mock.patch('yaml.safe_load', return_value={'key': 'value'}) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('getpass.getuser', return_value='doe') @mock.patch('validations_libs.validation_actions.ValidationActions.' @@ -573,7 +573,7 @@ class TestRun(BaseCommand): @mock.patch('validations_libs.constants.VALIDATIONS_LOG_BASEDIR') @mock.patch('yaml.safe_load', return_value=[{'key': 'value'}]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('getpass.getuser', return_value='doe') @mock.patch('validations_libs.validation_actions.ValidationActions.' diff --git a/validations_libs/tests/cli/test_show.py b/validations_libs/tests/cli/test_show.py index af62ab02..1c909269 100644 --- a/validations_libs/tests/cli/test_show.py +++ b/validations_libs/tests/cli/test_show.py @@ -48,7 +48,7 @@ class TestShowGroup(BaseCommand): @mock.patch('validations_libs.cli.show.ValidationActions', autospec=True) @mock.patch('yaml.safe_load', return_value=fakes.GROUP) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_show_validations_group_info(self, mock_open, mock_yaml, mock_actions): method_calls = [ @@ -69,7 +69,7 @@ class TestShowParameter(BaseCommand): super(TestShowParameter, self).setUp() self.cmd = show.ShowParameter(self.app, None) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('validations_libs.validation_actions.ValidationActions.' 'show_validations_parameters', autospec=True) def test_show_validations_parameters_by_group(self, mock_show, mock_open): @@ -87,7 +87,7 @@ class TestShowParameter(BaseCommand): self.assertRaises(Exception, self.check_parser, self.cmd, arglist, verifylist) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('validations_libs.validation_actions.ValidationActions.' 'show_validations_parameters', autospec=True) def test_show_validations_parameters_by_validations(self, mock_show, mock_open): diff --git a/validations_libs/tests/test_ansible.py b/validations_libs/tests/test_ansible.py index 38b32707..df44e149 100644 --- a/validations_libs/tests/test_ansible.py +++ b/validations_libs/tests/test_ansible.py @@ -236,7 +236,7 @@ class TestAnsible(TestCase): self.assertEqual(extra_vars, self.run._get_extra_vars(extra_vars)) @mock.patch('yaml.safe_load', return_value={'fizz': 'buzz'}) - @mock.patch('six.moves.builtins.open', spec=open) + @mock.patch('builtins.open', spec=open) @mock.patch('os.path.exists', return_value=True) @mock.patch('os.path.isfile', return_value=True) def test_get_extra_vars_path(self, mock_isfile, @@ -250,7 +250,7 @@ class TestAnsible(TestCase): mock_open.assert_called_once_with('/foo/bar') - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', return_value=True) @mock.patch('os.makedirs') @mock.patch.object( @@ -272,7 +272,7 @@ class TestAnsible(TestCase): self.assertEqual((_playbook, _rc, _status), ('existing.yaml', 1, 'failed')) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', return_value=True) @mock.patch('os.makedirs') @mock.patch.object(Runner, 'run', @@ -291,7 +291,7 @@ class TestAnsible(TestCase): self.assertEqual((_playbook, _rc, _status), ('existing.yaml', 0, 'successful')) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', return_value=True) @mock.patch('os.makedirs') @mock.patch.object(Runner, 'run', @@ -319,7 +319,7 @@ class TestAnsible(TestCase): return_value=fakes.fake_ansible_runner_run_return(rc=0)) @mock.patch('ansible_runner.utils.dump_artifact', autospec=True, return_value="/foo/inventory.yaml") - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('ansible_runner.runner_config.RunnerConfig') def test_run_success_local(self, mock_config, mock_open, mock_dump_artifact, mock_run, @@ -340,7 +340,7 @@ class TestAnsible(TestCase): return_value=fakes.fake_ansible_runner_run_return(rc=0)) @mock.patch('ansible_runner.utils.dump_artifact', autospec=True, return_value="/foo/inventory.yaml") - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('ansible_runner.runner_config.RunnerConfig') def test_run_success_run_async(self, mock_config, mock_open, mock_dump_artifact, mock_run, @@ -356,7 +356,7 @@ class TestAnsible(TestCase): self.assertEqual((_playbook, _rc, _status), ('existing.yaml', None, 'unstarted')) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', return_value=True) @mock.patch('os.makedirs') @mock.patch.object(Runner, 'run', @@ -408,7 +408,7 @@ class TestAnsible(TestCase): return_value=fakes.fake_ansible_runner_run_return(rc=0)) @mock.patch('ansible_runner.utils.dump_artifact', autospec=True, return_value="/foo/inventory.yaml") - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('ansible_runner.runner_config.RunnerConfig') def test_run_success_with_config(self, mock_config, mock_open, mock_dump_artifact, mock_run, @@ -437,7 +437,7 @@ class TestAnsible(TestCase): return_value=fakes.fake_ansible_runner_run_return(rc=0)) @mock.patch('ansible_runner.utils.dump_artifact', autospec=True, return_value="/foo/inventory.yaml") - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('ansible_runner.runner_config.RunnerConfig') def test_run_success_with_empty_config(self, mock_config, mock_open, mock_dump_artifact, mock_run, @@ -463,7 +463,7 @@ class TestAnsible(TestCase): return_value=fakes.fake_ansible_runner_run_return(rc=0)) @mock.patch('ansible_runner.utils.dump_artifact', autospec=True, return_value="/foo/inventory.yaml") - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('ansible_runner.runner_config.RunnerConfig') def test_run_success_with_ansible_config(self, mock_config, mock_open, mock_dump_artifact, mock_run, @@ -482,7 +482,7 @@ class TestAnsible(TestCase): ('existing.yaml', 0, 'successful')) mock_open.assert_called_with('/tmp/ansible.cfg', 'w') - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', return_value=True) @mock.patch.object( Runner, @@ -540,7 +540,7 @@ class TestAnsible(TestCase): mock_config.assert_called_once_with(**opt) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', return_value=True) @mock.patch.object( Runner, @@ -601,7 +601,7 @@ class TestAnsible(TestCase): mock_config.assert_called_once_with(**opt) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', return_value=True) @mock.patch.object( Runner, @@ -664,7 +664,7 @@ class TestAnsible(TestCase): mock_config.assert_called_once_with(**opt) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', return_value=True) @mock.patch.object( Runner, @@ -715,7 +715,7 @@ class TestAnsible(TestCase): #Specific form of Ansible.env_var neccessiates convoluted arg unpacking. mock_env_var.assert_called_once_with(*args.values(), validation_cfg_file=None) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', return_value=True) @mock.patch.object( Runner, @@ -765,7 +765,7 @@ class TestAnsible(TestCase): #Specific form of Ansible.env_var neccessiates convoluted arg unpacking. mock_env_var.assert_called_once_with(*args.values(), validation_cfg_file=None) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', return_value=True) @mock.patch.object( Runner, @@ -816,7 +816,7 @@ class TestAnsible(TestCase): #Specific form of Ansible.env_var neccessiates convoluted arg unpacking. mock_env_var.assert_called_once_with(*args.values(), validation_cfg_file=None) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', return_value=True) @mock.patch.object( Runner, @@ -866,7 +866,7 @@ class TestAnsible(TestCase): self.assertTrue('/tmp/artifact/path' in mock_config.call_args[1]['fact_cache']) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', return_value=True) @mock.patch.object( Runner, @@ -919,7 +919,7 @@ class TestAnsible(TestCase): constants, 'VALIDATION_ANSIBLE_ARTIFACT_PATH', new='foo/bar') - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', return_value=True) @mock.patch.object( Runner, @@ -967,7 +967,7 @@ class TestAnsible(TestCase): self.assertTrue(constants.VALIDATION_ANSIBLE_ARTIFACT_PATH in mock_config.call_args[1]['fact_cache']) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', return_value=True) @mock.patch.object( Runner, @@ -1030,7 +1030,7 @@ class TestAnsible(TestCase): mock_encode_envvars.call_args[1]['env'].items(), env.items()) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', return_value=True) @mock.patch.object( Runner, diff --git a/validations_libs/tests/test_group.py b/validations_libs/tests/test_group.py index 36456fc0..628ce545 100644 --- a/validations_libs/tests/test_group.py +++ b/validations_libs/tests/test_group.py @@ -29,14 +29,14 @@ class TestGroup(TestCase): super(TestGroup, self).setUp() @mock.patch('yaml.safe_load', return_value=fakes.GROUP) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_data(self, mock_open, mock_yaml): grp = Group('/tmp/foo') data = grp.get_data self.assertEqual(data, fakes.GROUP) @mock.patch('yaml.safe_load', return_value=fakes.GROUP) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_formated_group(self, mock_open, mock_yaml): grp = Group('/tmp/foo') ret = [('no-op', 'noop-foo'), ('post', 'post-foo'), ('pre', 'pre-foo')] @@ -44,14 +44,14 @@ class TestGroup(TestCase): self.assertEqual(data, ret) @mock.patch('yaml.safe_load', return_value=fakes.GROUP) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_groups_keys_list(self, mock_open, mock_yaml): grp = Group('/tmp/foo') ret = ['no-op', 'post', 'pre'] data = grp.get_groups_keys_list self.assertEqual(data, ret) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_group_file_not_found(self, mock_open): mock_open.side_effect = IOError() self.assertRaises( diff --git a/validations_libs/tests/test_utils.py b/validations_libs/tests/test_utils.py index 9dc24524..c28e64cb 100644 --- a/validations_libs/tests/test_utils.py +++ b/validations_libs/tests/test_utils.py @@ -43,7 +43,7 @@ class TestUtils(TestCase): @mock.patch('validations_libs.validation.Validation._get_content', return_value=fakes.FAKE_PLAYBOOK[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', return_value=True) def test_get_validations_data(self, mock_exists, mock_open, mock_data): output = {'Name': 'Advanced Format 512e Support', @@ -58,7 +58,7 @@ class TestUtils(TestCase): @mock.patch('validations_libs.validation.Validation._get_content', return_value=fakes.FAKE_PLAYBOOK[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', side_effect=(False, True)) def test_get_community_validations_data(self, mock_exists, mock_open, mock_data): """ @@ -79,7 +79,7 @@ class TestUtils(TestCase): @mock.patch('validations_libs.validation.Validation._get_content', return_value=fakes.FAKE_PLAYBOOK[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', side_effect=(False, True)) def test_get_community_disabled_validations_data(self, mock_exists, mock_open, mock_data): """ @@ -101,7 +101,7 @@ class TestUtils(TestCase): validation) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('glob.glob') def test_parse_all_validations_on_disk(self, mock_glob, mock_open, mock_load): @@ -111,7 +111,7 @@ class TestUtils(TestCase): self.assertEqual(result, [fakes.FAKE_METADATA]) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('glob.glob') def test_parse_community_validations_on_disk( self, mock_glob, mock_open, mock_load): @@ -121,7 +121,7 @@ class TestUtils(TestCase): self.assertEqual(result, [fakes.FAKE_METADATA]) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('glob.glob') def test_parse_all_community_disabled_validations_on_disk( self, mock_glob, mock_open, mock_load): @@ -180,7 +180,7 @@ class TestUtils(TestCase): products='foo1,foo2') @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('glob.glob') def test_parse_all_validations_on_disk_by_group(self, mock_glob, mock_open, @@ -192,7 +192,7 @@ class TestUtils(TestCase): self.assertEqual(result, [fakes.FAKE_METADATA]) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('glob.glob') def test_parse_all_validations_on_disk_by_category(self, mock_glob, mock_open, @@ -209,7 +209,7 @@ class TestUtils(TestCase): path=['/foo/playbook']) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('glob.glob') def test_parse_all_validations_on_disk_by_product(self, mock_glob, mock_open, @@ -222,7 +222,7 @@ class TestUtils(TestCase): @mock.patch('os.path.isfile') @mock.patch('glob.glob') @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_validations_playbook_by_id(self, mock_open, mock_load, mock_glob, mock_isfile): mock_glob.side_effect = (['/foo/playbook/foo.yaml'], []) @@ -234,7 +234,7 @@ class TestUtils(TestCase): @mock.patch('os.path.isfile') @mock.patch('glob.glob') @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_community_playbook_by_id(self, mock_open, mock_load, mock_glob, mock_isfile): mock_glob.side_effect = ( @@ -251,7 +251,7 @@ class TestUtils(TestCase): @mock.patch('os.path.isfile') @mock.patch('glob.glob') @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_community_disabled_playbook_by_id( self, mock_open, mock_load, mock_glob, mock_isfile): mock_glob.side_effect = ( @@ -269,7 +269,7 @@ class TestUtils(TestCase): @mock.patch('os.path.isfile') @mock.patch('glob.glob') @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_community_playbook_by_id_not_found( self, mock_open, mock_load, mock_glob, mock_isfile): mock_glob.side_effect = ( @@ -284,7 +284,7 @@ class TestUtils(TestCase): @mock.patch('os.path.isfile') @mock.patch('glob.glob') @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_validations_playbook_by_id_group(self, mock_open, mock_load, mock_glob, mock_isfile): mock_glob.side_effect = (['/foo/playbook/foo.yaml'], []) @@ -296,7 +296,7 @@ class TestUtils(TestCase): @mock.patch('os.path.isfile') @mock.patch('os.listdir') @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_validations_playbook_group_not_exist(self, mock_open, mock_load, mock_listdir, @@ -310,7 +310,7 @@ class TestUtils(TestCase): @mock.patch('os.path.isfile') @mock.patch('glob.glob') @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_validations_playbook_by_category(self, mock_open, mock_load, mock_glob, mock_isfile): mock_glob.side_effect = (['/foo/playbook/foo.yaml'], []) @@ -322,7 +322,7 @@ class TestUtils(TestCase): @mock.patch('os.path.isfile') @mock.patch('glob.glob') @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_validations_playbook_by_product(self, mock_open, mock_load, mock_glob, mock_isfile): mock_glob.side_effect = (['/foo/playbook/foo.yaml'], []) @@ -332,14 +332,14 @@ class TestUtils(TestCase): self.assertEqual(result, ['/foo/playbook/foo.yaml']) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_validation_parameters(self, mock_open, mock_load): result = utils.get_validation_parameters('/foo/playbook/foo.yaml') self.assertEqual(result, {}) @mock.patch('yaml.safe_load', return_value=fakes.GROUP) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_read_validation_groups_file(self, mock_open, mock_load): result = utils.read_validation_groups_file('/foo/groups.yaml') @@ -348,7 +348,7 @@ class TestUtils(TestCase): 'pre': [{'description': 'pre-foo'}]}) @mock.patch('yaml.safe_load', return_value=fakes.GROUP) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_validation_group_name_list(self, mock_open, mock_load): result = utils.get_validation_group_name_list('/foo/groups.yaml') @@ -374,7 +374,7 @@ class TestUtils(TestCase): groups='group1,group2') @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK2) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_validations_parameters_no_group(self, mock_open, mock_load): result = utils.get_validations_parameters(['/foo/playbook/foo.yaml'], @@ -383,7 +383,7 @@ class TestUtils(TestCase): self.assertEqual(result, output) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK2) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_validations_parameters_no_val(self, mock_open, mock_load): result = utils.get_validations_parameters(['/foo/playbook/foo.yaml'], @@ -392,7 +392,7 @@ class TestUtils(TestCase): self.assertEqual(result, output) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_validations_parameters_nothing(self, mock_open, mock_load): result = utils.get_validations_parameters(['/foo/playbook/foo.yaml'], diff --git a/validations_libs/tests/test_validation.py b/validations_libs/tests/test_validation.py index 3702b8aa..80164394 100644 --- a/validations_libs/tests/test_validation.py +++ b/validations_libs/tests/test_validation.py @@ -29,21 +29,21 @@ class TestValidation(TestCase): super(TestValidation, self).setUp() @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_data(self, mock_open, mock_yaml): val = Validation('/tmp/foo') data = val.get_data self.assertEqual(data, fakes.FAKE_PLAYBOOK[0]) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_metadata(self, mock_open, mock_yaml): val = Validation('/tmp/foo') data = val.get_metadata self.assertEqual(data, fakes.FAKE_METADATA) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_WRONG_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_metadata_wrong_playbook(self, mock_open, mock_yaml): with self.assertRaises(NameError) as exc_mgr: Validation('/tmp/foo').get_metadata @@ -51,21 +51,21 @@ class TestValidation(TestCase): str(exc_mgr.exception)) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK2) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_vars(self, mock_open, mock_yaml): val = Validation('/tmp/foo') data = val.get_vars self.assertEqual(data, fakes.FAKE_VARS) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_vars_no_vars(self, mock_open, mock_yaml): val = Validation('/tmp/foo') data = val.get_vars self.assertEqual(data, {}) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_WRONG_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_vars_no_metadata(self, mock_open, mock_yaml): with self.assertRaises(NameError) as exc_mgr: Validation('/tmp/foo').get_vars @@ -73,7 +73,7 @@ class TestValidation(TestCase): str(exc_mgr.exception)) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_id(self, mock_open, mock_yaml): val = Validation('/tmp/foo') id = val.id @@ -82,14 +82,14 @@ class TestValidation(TestCase): self.assertEqual(get_id, 'foo') @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_groups(self, mock_open, mock_yaml): val = Validation('/tmp/foo') groups = val.groups self.assertEqual(groups, ['prep', 'pre-deployment']) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_WRONG_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_groups_with_no_metadata(self, mock_open, mock_yaml): with self.assertRaises(NameError) as exc_mgr: Validation('/tmp/foo').groups @@ -97,21 +97,21 @@ class TestValidation(TestCase): str(exc_mgr.exception)) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK3) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_groups_with_no_existing_groups(self, mock_open, mock_yaml): val = Validation('/tmp/foo') groups = val.groups self.assertEqual(groups, []) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_categories(self, mock_open, mock_yaml): val = Validation('/tmp/foo') categories = val.categories self.assertEqual(categories, ['os', 'storage']) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_WRONG_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_categories_with_no_metadata(self, mock_open, mock_yaml): with self.assertRaises(NameError) as exc_mgr: Validation('/tmp/foo').categories @@ -119,21 +119,21 @@ class TestValidation(TestCase): str(exc_mgr.exception)) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK3) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_categories_with_no_existing_categories(self, mock_open, mock_yaml): val = Validation('/tmp/foo') categories = val.categories self.assertEqual(categories, []) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_products(self, mock_open, mock_yaml): val = Validation('/tmp/foo') products = val.products self.assertEqual(products, ['product1']) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_WRONG_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_products_with_no_metadata(self, mock_open, mock_yaml): with self.assertRaises(NameError) as exc_mgr: Validation('/tmp/foo').products @@ -141,35 +141,35 @@ class TestValidation(TestCase): str(exc_mgr.exception)) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK3) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_products_with_no_existing_products(self, mock_open, mock_yaml): val = Validation('/tmp/foo') products = val.products self.assertEqual(products, []) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_ordered_dict(self, mock_open, mock_yaml): val = Validation('/tmp/foo') data = val.get_ordered_dict self.assertEqual(data, fakes.FAKE_PLAYBOOK[0]) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_formated_data(self, mock_open, mock_yaml): val = Validation('/tmp/foo') data = val.get_formated_data self.assertEqual(data, fakes.FORMATED_DATA) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_WRONG_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_formated_data_no_metadata(self, mock_open, mock_yaml): with self.assertRaises(NameError) as exc_mgr: Validation('/tmp/foo').get_formated_data self.assertEqual('No metadata found in validation foo', str(exc_mgr.exception)) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_validation_not_found(self, mock_open): mock_open.side_effect = IOError() self.assertRaises( diff --git a/validations_libs/tests/test_validation_actions.py b/validations_libs/tests/test_validation_actions.py index 7003fcf6..951a0b3d 100644 --- a/validations_libs/tests/test_validation_actions.py +++ b/validations_libs/tests/test_validation_actions.py @@ -397,7 +397,7 @@ class TestValidationActions(TestCase): @mock.patch('validations_libs.validation_logs.ValidationLogs.' 'get_logfile_content_by_validation', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @mock.patch('os.path.exists', return_value=True) def test_validation_show(self, mock_exists, mock_open, mock_parse_validation, mock_data, mock_log): @@ -427,7 +427,7 @@ class TestValidationActions(TestCase): @mock.patch('validations_libs.utils.parse_all_validations_on_disk', return_value=fakes.VALIDATIONS_LIST) @mock.patch('yaml.safe_load', return_value=fakes.GROUP) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_group_information(self, mock_open, mock_yaml, mock_data): v_actions = ValidationActions() col, values = v_actions.group_information() @@ -437,28 +437,28 @@ class TestValidationActions(TestCase): ('post', 'post-foo', 2), ('pre', 'pre-foo', 1)]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_show_validations_parameters_wrong_validations_type(self, mock_open): v_actions = ValidationActions() self.assertRaises(TypeError, v_actions.show_validations_parameters, validations='foo') - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_show_validations_parameters_wrong_groups_type(self, mock_open): v_actions = ValidationActions() self.assertRaises(TypeError, v_actions.show_validations_parameters, groups=('foo')) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_show_validations_parameters_wrong_categories_type(self, mock_open): v_actions = ValidationActions() self.assertRaises(TypeError, v_actions.show_validations_parameters, categories={'foo': 'bar'}) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_show_validations_parameters_wrong_products_type(self, mock_open): v_actions = ValidationActions() self.assertRaises(TypeError, @@ -469,7 +469,7 @@ class TestValidationActions(TestCase): return_value=['/foo/playbook/foo.yaml']) @mock.patch('validations_libs.utils.get_validations_parameters') @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_show_validations_parameters(self, mock_open, mock_load, mock_get_param, mock_get_play): mock_get_param.return_value = {'foo': @@ -478,7 +478,7 @@ class TestValidationActions(TestCase): result = v_actions.show_validations_parameters(validations=['foo']) self.assertEqual(result, mock_get_param.return_value) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_show_validations_parameters_non_supported_format(self, mock_open): v_actions = ValidationActions() self.assertRaises(ValidationShowException, @@ -490,7 +490,7 @@ class TestValidationActions(TestCase): return_value=['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']) @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_show_history_str(self, mock_open, mock_load, mock_get_log): v_actions = ValidationActions() col, values = v_actions.show_history('512e') @@ -507,7 +507,7 @@ class TestValidationActions(TestCase): return_value=['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']) @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_show_history_list(self, mock_open, mock_load, mock_get_log): v_actions = ValidationActions() col, values = v_actions.show_history(['512e']) @@ -524,7 +524,7 @@ class TestValidationActions(TestCase): return_value=['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']) @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_show_history_all(self, mock_open, mock_load, mock_get_log): v_actions = ValidationActions() col, values = v_actions.show_history() @@ -544,7 +544,7 @@ class TestValidationActions(TestCase): '/tmp/123_bar_2020-03-05T13:17:22.447857Z.json']) @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_show_history_most_recent(self, mock_open, mock_load, mock_get_log, mock_stat): @@ -582,7 +582,7 @@ class TestValidationActions(TestCase): return_value=['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json']) @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_status(self, mock_open, mock_load, mock_get_log): v_actions = ValidationActions() col, values = v_actions.get_status('foo') diff --git a/validations_libs/tests/test_validation_log.py b/validations_libs/tests/test_validation_log.py index 4600c7c5..3df15fc8 100644 --- a/validations_libs/tests/test_validation_log.py +++ b/validations_libs/tests/test_validation_log.py @@ -29,7 +29,7 @@ class TestValidationLog(TestCase): super(TestValidationLog, self).setUp() @mock.patch('json.load') - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_validation_log_file(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -38,7 +38,7 @@ class TestValidationLog(TestCase): self.assertEqual(val.datetime, '2020-03-30T13:17:22.447857Z') @mock.patch('json.load') - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_validation_uuid_wo_validation_id(self, mock_open, mock_json): with self.assertRaises(Exception) as exc_mgr: ValidationLog(uuid='123') @@ -47,7 +47,7 @@ class TestValidationLog(TestCase): str(exc_mgr.exception)) @mock.patch('json.load') - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_validation_validation_id_wo_uuid(self, mock_open, mock_json): with self.assertRaises(Exception) as exc_mgr: ValidationLog(validation_id='foo') @@ -56,7 +56,7 @@ class TestValidationLog(TestCase): str(exc_mgr.exception)) @mock.patch('json.load') - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_validation_underscore_validation_id(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_bar_2020-03-30T13:17:22.447857Z.json') @@ -65,7 +65,7 @@ class TestValidationLog(TestCase): self.assertEqual(val.datetime, '2020-03-30T13:17:22.447857Z') @mock.patch('json.load') - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_validation_wrong_log_file(self, mock_open, mock_json): msg = ('Wrong log file format, it should be formed ' 'such as {uuid}_{validation-id}_{timestamp}') @@ -77,7 +77,7 @@ class TestValidationLog(TestCase): @mock.patch('glob.glob') @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_log_path(self, mock_open, mock_yaml, mock_glob): mock_glob.return_value = \ ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] @@ -88,7 +88,7 @@ class TestValidationLog(TestCase): @mock.patch('glob.glob') @mock.patch('json.load') - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_logfile_infos(self, mock_open, mock_json, mock_glob): mock_glob.return_value = \ ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] @@ -99,7 +99,7 @@ class TestValidationLog(TestCase): @mock.patch('glob.glob') @mock.patch('json.load') - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_logfile_datetime(self, mock_open, mock_json, mock_glob): mock_glob.return_value = \ ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] @@ -108,7 +108,7 @@ class TestValidationLog(TestCase): self.assertEqual(datetime, '2020-03-30T13:17:22.447857Z') @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_logfile_content(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -117,7 +117,7 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_uuid(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -127,7 +127,7 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_validation_id(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -137,7 +137,7 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_status(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -146,7 +146,7 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.FAILED_VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_status_failed(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -155,7 +155,7 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.BAD_VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_status_unreachable(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -164,7 +164,7 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_host_group(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -173,7 +173,7 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_hosts_status(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -182,7 +182,7 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.FAILED_VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_hosts_status_failed(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -191,7 +191,7 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.BAD_VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_hosts_status_unreachable(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -200,7 +200,7 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_unreachable_hosts(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -209,7 +209,7 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.BAD_VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_unreachable_hosts_bad_data(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -218,7 +218,7 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_duration(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -227,7 +227,7 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.BAD_VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_duration_bad_data(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -236,7 +236,7 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_start_time(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -245,14 +245,14 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.BAD_VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_start_time_bad_data(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') start_time = val.get_start_time self.assertEqual(start_time, '') - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_log_not_found(self, mock_open): mock_open.side_effect = IOError() self.assertRaises( @@ -269,7 +269,7 @@ class TestValidationLog(TestCase): ) @mock.patch('json.load') - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_log_bad_json(self, mock_open, mock_json): mock_json.side_effect = ValueError() self.assertRaises( @@ -280,7 +280,7 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_is_valid_format(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -288,7 +288,7 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_plays(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') @@ -299,7 +299,7 @@ class TestValidationLog(TestCase): @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_tasks_data(self, mock_open, mock_json): val = ValidationLog( logfile='/tmp/123_foo_2020-03-30T13:17:22.447857Z.json') diff --git a/validations_libs/tests/test_validation_logs.py b/validations_libs/tests/test_validation_logs.py index 29ed3245..bef280d7 100644 --- a/validations_libs/tests/test_validation_logs.py +++ b/validations_libs/tests/test_validation_logs.py @@ -29,13 +29,13 @@ class TestValidationLogs(TestCase): super(TestValidationLogs, self).setUp() @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_validation_log_file(self, mock_open, mock_json): vlogs = ValidationLogs('/tmp/foo') content = vlogs._get_content('/tmp/foo/bar.json') self.assertEqual(content, fakes.VALIDATIONS_LOGS_CONTENTS_LIST) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_log_not_found(self, mock_open): mock_open.side_effect = IOError() vlogs = ValidationLogs() @@ -47,7 +47,7 @@ class TestValidationLogs(TestCase): @mock.patch('glob.glob') @mock.patch('json.load') - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_logfile_by_validation(self, mock_open, mock_json, mock_glob): mock_glob.return_value = \ ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] @@ -59,7 +59,7 @@ class TestValidationLogs(TestCase): @mock.patch('glob.glob') @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_logfile_content_by_validation(self, mock_open, mock_json, mock_glob): mock_glob.return_value = \ @@ -70,7 +70,7 @@ class TestValidationLogs(TestCase): @mock.patch('glob.glob') @mock.patch('json.load') - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_logfile_by_uuid(self, mock_open, mock_json, mock_glob): mock_glob.return_value = \ ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] @@ -82,7 +82,7 @@ class TestValidationLogs(TestCase): @mock.patch('glob.glob') @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_logfile_content_by_uuid(self, mock_open, mock_json, mock_glob): mock_glob.return_value = \ @@ -93,7 +93,7 @@ class TestValidationLogs(TestCase): @mock.patch('glob.glob') @mock.patch('json.load') - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_logfile_by_uuid_validation_id(self, mock_open, mock_json, mock_glob): mock_glob.return_value = \ @@ -106,7 +106,7 @@ class TestValidationLogs(TestCase): @mock.patch('glob.glob') @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_logfile_content_by_uuid_validation_id(self, mock_open, mock_json, mock_glob): @@ -120,7 +120,7 @@ class TestValidationLogs(TestCase): @mock.patch('os.listdir') @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_all_logfiles(self, mock_open, mock_json, mock_listdir, mock_isfile): mock_listdir.return_value = \ @@ -135,7 +135,7 @@ class TestValidationLogs(TestCase): @mock.patch('os.listdir') @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_all_logfiles_yaml(self, mock_open, mock_json, mock_listdir, mock_isfile): mock_listdir.return_value = \ @@ -151,7 +151,7 @@ class TestValidationLogs(TestCase): @mock.patch('os.listdir') @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_all_logfiles_bad_name(self, mock_open, mock_json, mock_listdir, mock_isfile): mock_listdir.return_value = \ @@ -167,7 +167,7 @@ class TestValidationLogs(TestCase): @mock.patch('os.listdir') @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_all_logfiles_content(self, mock_open, mock_json, mock_listdir, mock_isfile): mock_listdir.return_value = \ @@ -179,7 +179,7 @@ class TestValidationLogs(TestCase): @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_validations_stats(self, mock_open, mock_json): vlogs = ValidationLogs('/tmp/foo') content = vlogs.get_validations_stats( @@ -190,7 +190,7 @@ class TestValidationLogs(TestCase): 'get_logfile_by_uuid_validation_id') @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_results(self, mock_open, mock_json, mock_get_validation): mock_get_validation.return_value = \ ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] @@ -237,7 +237,7 @@ class TestValidationLogs(TestCase): 'get_logfile_by_uuid_validation_id') @mock.patch('json.load', return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0]) - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') def test_get_results_list(self, mock_open, mock_json, mock_get_validation): mock_get_validation.return_value = \ ['/tmp/123_foo_2020-03-30T13:17:22.447857Z.json'] diff --git a/validations_libs/utils.py b/validations_libs/utils.py index 9596dc83..7cbaf894 100644 --- a/validations_libs/utils.py +++ b/validations_libs/utils.py @@ -19,7 +19,6 @@ import glob import logging import os import site -import six import subprocess import uuid @@ -197,7 +196,7 @@ def parse_all_validations_on_disk(path, 'id': 'check-cpu', 'name': 'Verify if the server fits the CPU core requirements'}] """ - if not isinstance(path, six.string_types): + if not isinstance(path, str): raise TypeError("The 'path' argument must be a String") if not groups: @@ -289,7 +288,7 @@ def get_validations_playbook(path, ['/usr/share/ansible/validation-playbooks/512e.yaml', '/usr/share/ansible/validation-playbooks/check-cpu.yaml',] """ - if not isinstance(path, six.string_types): + if not isinstance(path, str): raise TypeError("The 'path' argument must be a String") if not validation_id: @@ -414,7 +413,7 @@ def get_validations_data( 'Name': 'Verify the server fits the something requirements', 'Parameters': {'param1': 24}} """ - if not isinstance(validation, six.string_types): + if not isinstance(validation, str): raise TypeError("The 'validation' argument must be a String") data = {}