diff options
Diffstat (limited to 'saharaclient/tests')
6 files changed, 13 insertions, 13 deletions
diff --git a/saharaclient/tests/unit/osc/v1/test_job_binaries.py b/saharaclient/tests/unit/osc/v1/test_job_binaries.py index 96da3c3..cf643aa 100644 --- a/saharaclient/tests/unit/osc/v1/test_job_binaries.py +++ b/saharaclient/tests/unit/osc/v1/test_job_binaries.py @@ -84,7 +84,7 @@ class TestCreateJobBinary(TestJobBinaries): def test_job_binary_create_internal(self): m_open = mock.mock_open() - with mock.patch('six.moves.builtins.open', m_open, create=True): + with mock.patch('builtins.open', m_open, create=True): arglist = ['--name', 'job-binary', '--data', 'filepath'] verifylist = [('name', 'job-binary'), ('data', 'filepath')] @@ -310,7 +310,7 @@ class TestDownloadJobBinary(TestJobBinaries): def test_download_job_binary_default_file(self): m_open = mock.mock_open() - with mock.patch('six.moves.builtins.open', m_open, create=True): + with mock.patch('builtins.open', m_open, create=True): arglist = ['job-binary'] verifylist = [('job_binary', 'job-binary')] @@ -327,7 +327,7 @@ class TestDownloadJobBinary(TestJobBinaries): def test_download_job_binary_specified_file(self): m_open = mock.mock_open() - with mock.patch('six.moves.builtins.open', m_open, create=True): + with mock.patch('builtins.open', m_open, create=True): arglist = ['job-binary', '--file', 'test'] verifylist = [('job_binary', 'job-binary'), ('file', 'test')] diff --git a/saharaclient/tests/unit/osc/v1/test_job_types.py b/saharaclient/tests/unit/osc/v1/test_job_types.py index 8d1a319..80eed6a 100644 --- a/saharaclient/tests/unit/osc/v1/test_job_types.py +++ b/saharaclient/tests/unit/osc/v1/test_job_types.py @@ -105,7 +105,7 @@ class TestGetJobTypeConfigs(TestJobTypes): @mock.patch('oslo_serialization.jsonutils.dump') def test_get_job_type_configs_default_file(self, p_dump): m_open = mock.mock_open() - with mock.patch('six.moves.builtins.open', m_open, create=True): + with mock.patch('builtins.open', m_open, create=True): arglist = ['Pig'] verifylist = [('job_type', 'Pig')] @@ -127,7 +127,7 @@ class TestGetJobTypeConfigs(TestJobTypes): @mock.patch('oslo_serialization.jsonutils.dump') def test_get_job_type_configs_specified_file(self, p_dump): m_open = mock.mock_open() - with mock.patch('six.moves.builtins.open', m_open): + with mock.patch('builtins.open', m_open): arglist = ['Pig', '--file', 'testfile'] verifylist = [('job_type', 'Pig'), ('file', 'testfile')] diff --git a/saharaclient/tests/unit/osc/v1/test_plugins.py b/saharaclient/tests/unit/osc/v1/test_plugins.py index 75c49b1..a39f93b 100644 --- a/saharaclient/tests/unit/osc/v1/test_plugins.py +++ b/saharaclient/tests/unit/osc/v1/test_plugins.py @@ -156,7 +156,7 @@ class TestGetPluginConfigs(TestPlugins): @mock.patch('oslo_serialization.jsonutils.dump') def test_get_plugin_configs_default_file(self, p_dump): m_open = mock.mock_open() - with mock.patch('six.moves.builtins.open', m_open, create=True): + with mock.patch('builtins.open', m_open, create=True): arglist = ['fake', '0.1'] verifylist = [('plugin', 'fake'), ('plugin_version', '0.1')] @@ -178,7 +178,7 @@ class TestGetPluginConfigs(TestPlugins): @mock.patch('oslo_serialization.jsonutils.dump') def test_get_plugin_configs_specified_file(self, p_dump): m_open = mock.mock_open() - with mock.patch('six.moves.builtins.open', m_open): + with mock.patch('builtins.open', m_open): arglist = ['fake', '0.1', '--file', 'testfile'] verifylist = [('plugin', 'fake'), ('plugin_version', '0.1'), ('file', 'testfile')] diff --git a/saharaclient/tests/unit/osc/v2/test_job_binaries.py b/saharaclient/tests/unit/osc/v2/test_job_binaries.py index 93d889a..c86c3ca 100644 --- a/saharaclient/tests/unit/osc/v2/test_job_binaries.py +++ b/saharaclient/tests/unit/osc/v2/test_job_binaries.py @@ -293,7 +293,7 @@ class TestDownloadJobBinary(TestJobBinaries): def test_download_job_binary_default_file(self): m_open = mock.mock_open() - with mock.patch('six.moves.builtins.open', m_open, create=True): + with mock.patch('builtins.open', m_open, create=True): arglist = ['job-binary'] verifylist = [('job_binary', 'job-binary')] @@ -310,7 +310,7 @@ class TestDownloadJobBinary(TestJobBinaries): def test_download_job_binary_specified_file(self): m_open = mock.mock_open() - with mock.patch('six.moves.builtins.open', m_open, create=True): + with mock.patch('builtins.open', m_open, create=True): arglist = ['job-binary', '--file', 'test'] verifylist = [('job_binary', 'job-binary'), ('file', 'test')] diff --git a/saharaclient/tests/unit/osc/v2/test_job_types.py b/saharaclient/tests/unit/osc/v2/test_job_types.py index 477f147..c6ea129 100644 --- a/saharaclient/tests/unit/osc/v2/test_job_types.py +++ b/saharaclient/tests/unit/osc/v2/test_job_types.py @@ -106,7 +106,7 @@ class TestGetJobTypeConfigs(TestJobTypes): @mock.patch('oslo_serialization.jsonutils.dump') def test_get_job_type_configs_default_file(self, p_dump): m_open = mock.mock_open() - with mock.patch('six.moves.builtins.open', m_open, create=True): + with mock.patch('builtins.open', m_open, create=True): arglist = ['Pig'] verifylist = [('job_type', 'Pig')] @@ -128,7 +128,7 @@ class TestGetJobTypeConfigs(TestJobTypes): @mock.patch('oslo_serialization.jsonutils.dump') def test_get_job_type_configs_specified_file(self, p_dump): m_open = mock.mock_open() - with mock.patch('six.moves.builtins.open', m_open): + with mock.patch('builtins.open', m_open): arglist = ['Pig', '--file', 'testfile'] verifylist = [('job_type', 'Pig'), ('file', 'testfile')] diff --git a/saharaclient/tests/unit/osc/v2/test_plugins.py b/saharaclient/tests/unit/osc/v2/test_plugins.py index ae72e83..3800fcb 100644 --- a/saharaclient/tests/unit/osc/v2/test_plugins.py +++ b/saharaclient/tests/unit/osc/v2/test_plugins.py @@ -156,7 +156,7 @@ class TestGetPluginConfigs(TestPlugins): @mock.patch('oslo_serialization.jsonutils.dump') def test_get_plugin_configs_default_file(self, p_dump): m_open = mock.mock_open() - with mock.patch('six.moves.builtins.open', m_open, create=True): + with mock.patch('builtins.open', m_open, create=True): arglist = ['fake', '0.1'] verifylist = [('plugin', 'fake'), ('plugin_version', '0.1')] @@ -178,7 +178,7 @@ class TestGetPluginConfigs(TestPlugins): @mock.patch('oslo_serialization.jsonutils.dump') def test_get_plugin_configs_specified_file(self, p_dump): m_open = mock.mock_open() - with mock.patch('six.moves.builtins.open', m_open): + with mock.patch('builtins.open', m_open): arglist = ['fake', '0.1', '--file', 'testfile'] verifylist = [('plugin', 'fake'), ('plugin_version', '0.1'), ('file', 'testfile')] |