diff options
| author | Riccardo Pittau <elfosardo@gmail.com> | 2019-11-29 10:16:28 +0100 |
|---|---|---|
| committer | Riccardo Pittau <elfosardo@gmail.com> | 2019-12-23 09:38:25 +0100 |
| commit | 78c121a5d7b6efc84d541ea4de98aa910255884e (patch) | |
| tree | f60d0b75107c58f14ed99f81ef9c6831ecb2feea /ironic/tests/unit/drivers/modules/ilo/test_boot.py | |
| parent | 67f5a6bf5c8922a56d70daae023a004e672a88db (diff) | |
| download | ironic-78c121a5d7b6efc84d541ea4de98aa910255884e.tar.gz | |
Stop using six library
Since we've dropped support for Python 2.7, it's time to look at
the bright future that Python 3.x will bring and stop forcing
compatibility with older versions.
This patch removes the six library from requirements, not
looking back.
Change-Id: Ib546f16965475c32b2f8caabd560e2c7d382ac5a
Diffstat (limited to 'ironic/tests/unit/drivers/modules/ilo/test_boot.py')
| -rw-r--r-- | ironic/tests/unit/drivers/modules/ilo/test_boot.py | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/ironic/tests/unit/drivers/modules/ilo/test_boot.py b/ironic/tests/unit/drivers/modules/ilo/test_boot.py index 384f5f43f..8ff57b09a 100644 --- a/ironic/tests/unit/drivers/modules/ilo/test_boot.py +++ b/ironic/tests/unit/drivers/modules/ilo/test_boot.py @@ -15,12 +15,12 @@ """Test class for boot methods used by iLO modules.""" +import io import tempfile from ironic_lib import utils as ironic_utils import mock from oslo_config import cfg -import six from ironic.common import boot_devices from ironic.common import exception @@ -43,10 +43,6 @@ from ironic.drivers import utils as driver_utils from ironic.tests.unit.drivers.modules.ilo import test_common -if six.PY3: - import io - file = io.BytesIO - CONF = cfg.CONF @@ -183,9 +179,9 @@ class IloBootPrivateMethodsTestCase(test_common.BaseIloTest): CONF.pxe.pxe_append_params = 'kernel-params' swift_obj_mock = swift_api_mock.return_value - fileobj_mock = mock.MagicMock(spec=file) + fileobj_mock = mock.MagicMock(spec=io.BytesIO) fileobj_mock.name = 'tmpfile' - mock_file_handle = mock.MagicMock(spec=file) + mock_file_handle = mock.MagicMock(spec=io.BytesIO) mock_file_handle.__enter__.return_value = fileobj_mock tempfile_mock.return_value = mock_file_handle @@ -241,9 +237,9 @@ class IloBootPrivateMethodsTestCase(test_common.BaseIloTest): CONF.deploy.http_root = "/httpboot" CONF.pxe.pxe_append_params = 'kernel-params' - fileobj_mock = mock.MagicMock(spec=file) + fileobj_mock = mock.MagicMock(spec=io.BytesIO) fileobj_mock.name = 'tmpfile' - mock_file_handle = mock.MagicMock(spec=file) + mock_file_handle = mock.MagicMock(spec=io.BytesIO) mock_file_handle.__enter__.return_value = fileobj_mock tempfile_mock.return_value = mock_file_handle @@ -307,9 +303,9 @@ class IloBootPrivateMethodsTestCase(test_common.BaseIloTest): CONF.deploy.http_root = "/httpboot" CONF.pxe.pxe_append_params = 'kernel-params' - fileobj_mock = mock.MagicMock(spec=file) + fileobj_mock = mock.MagicMock(spec=io.BytesIO) fileobj_mock.name = 'tmpfile' - mock_file_handle = mock.MagicMock(spec=file) + mock_file_handle = mock.MagicMock(spec=io.BytesIO) mock_file_handle.__enter__.return_value = fileobj_mock tempfile_mock.return_value = mock_file_handle |