From 435484df1b03cf53f80b8279e290abd95779e1b3 Mon Sep 17 00:00:00 2001
From: vanou <ishii.vanou@fujitsu.com>
Date: Mon, 10 Jan 2022 09:39:45 +0900
Subject: [PATCH] Use standard library unittest.mock instead of mock

Use unittest.mock instead of mock.
Because mock became part of standard library
and available as unittest.mock since Python 3.6

Change-Id: Ibfe27316c20fa2c8935b559fed7885a6e194d314
---
 scciclient/tests/irmc/test_elcm.py        | 3 ++-
 scciclient/tests/irmc/test_ipmi.py        | 3 ++-
 scciclient/tests/irmc/test_scci.py        | 2 +-
 scciclient/tests/irmc/test_snmp.py        | 2 +-
 scciclient/tests/irmc/viom/test_client.py | 3 ++-
 scciclient/tests/irmc/viom/test_elcm.py   | 2 +-
 test-requirements.txt                     | 1 -
 7 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/scciclient/tests/irmc/test_elcm.py b/scciclient/tests/irmc/test_elcm.py
index 7f8f7c0..9f52f50 100644
--- a/scciclient/tests/irmc/test_elcm.py
+++ b/scciclient/tests/irmc/test_elcm.py
@@ -16,7 +16,8 @@
 Test class for iRMC eLCM functionality.
 """
 
-import mock
+from unittest import mock
+
 from oslo_utils import encodeutils
 import requests
 from requests_mock.contrib import fixture as rm_fixture
diff --git a/scciclient/tests/irmc/test_ipmi.py b/scciclient/tests/irmc/test_ipmi.py
index c2035de..18d9eb8 100644
--- a/scciclient/tests/irmc/test_ipmi.py
+++ b/scciclient/tests/irmc/test_ipmi.py
@@ -15,7 +15,8 @@
 Test class for IPMI Module.
 """
 
-import mock
+from unittest import mock
+
 from pyghmi import exceptions as ipmi_exception
 from pyghmi.ipmi import command as ipmi_command
 import testtools
diff --git a/scciclient/tests/irmc/test_scci.py b/scciclient/tests/irmc/test_scci.py
index 1eeb35e..7c30233 100644
--- a/scciclient/tests/irmc/test_scci.py
+++ b/scciclient/tests/irmc/test_scci.py
@@ -17,10 +17,10 @@ Test class for iRMC Power Driver
 
 import os
 import time
+from unittest import mock
 import xml.etree.ElementTree as ET
 
 import defusedxml.ElementTree as dET
-import mock
 from requests_mock.contrib import fixture as rm_fixture
 import six
 import six.moves.builtins as __builtin__
diff --git a/scciclient/tests/irmc/test_snmp.py b/scciclient/tests/irmc/test_snmp.py
index b837292..f792ca7 100644
--- a/scciclient/tests/irmc/test_snmp.py
+++ b/scciclient/tests/irmc/test_snmp.py
@@ -15,8 +15,8 @@
 Test class for snmp module.
 """
 
+from unittest import mock
 
-import mock
 from pysnmp.entity.rfc3413.oneliner import cmdgen
 from pysnmp import error as snmp_error
 import testtools
diff --git a/scciclient/tests/irmc/viom/test_client.py b/scciclient/tests/irmc/viom/test_client.py
index fb2c9a0..31b613c 100644
--- a/scciclient/tests/irmc/viom/test_client.py
+++ b/scciclient/tests/irmc/viom/test_client.py
@@ -12,7 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 import testtools
 
 from scciclient.irmc import scci
diff --git a/scciclient/tests/irmc/viom/test_elcm.py b/scciclient/tests/irmc/viom/test_elcm.py
index ea697f4..753a7d5 100644
--- a/scciclient/tests/irmc/viom/test_elcm.py
+++ b/scciclient/tests/irmc/viom/test_elcm.py
@@ -17,8 +17,8 @@ Test class for iRMC eLCM functionality.
 """
 
 import time
+from unittest import mock
 
-import mock
 import testtools
 
 from scciclient.irmc import elcm
diff --git a/test-requirements.txt b/test-requirements.txt
index 025fe44..31e1203 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,7 +4,6 @@
 
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
-mock>=2.0.0 # BSD
 python-subunit>=1.0.0 # Apache-2.0/BSD
 oslotest>=3.2.0,<4;python_version<'3.6'  # Apache-2.0
 oslotest>=3.2.0;python_version>='3.6'  # Apache-2.0