From 38ecd5db7c929d2f4703243275b6e3f4f6f2051c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 5 Jan 2022 19:55:43 +0900 Subject: [PATCH] Remove remaining reference to the six library This is follow-up of d86b063547002c4a18e66693ccf2f747a9c71017 and removes remaining reference to the six library in unit tests. Change-Id: Ifd35da5b25e78bbc774a5a3caa40981d82a0820a --- tripleo_common/tests/image/test_base.py | 8 ++++---- tripleo_common/tests/utils/test_config.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tripleo_common/tests/image/test_base.py b/tripleo_common/tests/image/test_base.py index 32440e47b..2bfcc435d 100644 --- a/tripleo_common/tests/image/test_base.py +++ b/tripleo_common/tests/image/test_base.py @@ -35,7 +35,7 @@ class TestBaseImageManager(testbase.TestCase): mock_open_context = mock.mock_open() mock_open_context().read.return_value = "YAML" - with mock.patch('six.moves.builtins.open', mock_open_context): + with mock.patch('builtins.open', mock_open_context): base_manager = BaseImageManager(['yamlfile']) disk_images = base_manager.load_config_files('disk_images') @@ -82,7 +82,7 @@ class TestBaseImageManager(testbase.TestCase): mock_open_context = mock.mock_open() mock_open_context().read.return_value = "YAML" - with mock.patch('six.moves.builtins.open', mock_open_context): + with mock.patch('builtins.open', mock_open_context): base_manager = BaseImageManager(['yamlfile1', 'yamlfile2']) disk_images = base_manager.load_config_files('disk_images') @@ -119,7 +119,7 @@ class TestBaseImageManager(testbase.TestCase): mock_open_context = mock.mock_open() mock_open_context().read.return_value = "YAML" - with mock.patch('six.moves.builtins.open', mock_open_context): + with mock.patch('builtins.open', mock_open_context): base_manager = BaseImageManager(['yamlfile']) self.assertRaises(ImageSpecificationException, base_manager.load_config_files, 'disk_images') @@ -151,7 +151,7 @@ class TestBaseImageManager(testbase.TestCase): mock_open_context = mock.mock_open() mock_open_context().read.return_value = "YAML" - with mock.patch('six.moves.builtins.open', mock_open_context): + with mock.patch('builtins.open', mock_open_context): base_manager = BaseImageManager(['yamlfile1'], images=['not-overcloud']) disk_images = base_manager.load_config_files('disk_images') diff --git a/tripleo_common/tests/utils/test_config.py b/tripleo_common/tests/utils/test_config.py index a8707ebf3..ecdefd548 100644 --- a/tripleo_common/tests/utils/test_config.py +++ b/tripleo_common/tests/utils/test_config.py @@ -129,7 +129,7 @@ class TestConfig(base.TestCase): @patch.object(ooo_config.git, 'Repo') @mock.patch('os.mkdir') - @mock.patch('six.moves.builtins.open') + @mock.patch('builtins.open') @patch.object(ooo_config.shutil, 'rmtree') def test_overcloud_config_wrong_config_type(self, mock_rmtree, mock_open, mock_mkdir,