From 9af50fe7f553f4299c5499bf570c73c2ba9cbc4f Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Tue, 9 Feb 2021 18:41:09 -0800
Subject: [PATCH] Import 'mock' module from 'unittest' library (#1415)

As of Python 3, `mock` is part of `unittest` in the Python standard library. Since sonic-utilities is now Python 3-only, we should import it this way everywhere.
---
 tests/config_dpb_test.py   | 2 +-
 tests/config_mgmt_test.py  | 9 ++++-----
 tests/reboot_cause_test.py | 4 +++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/config_dpb_test.py b/tests/config_dpb_test.py
index 4977c9ffd1..dedcc0641d 100644
--- a/tests/config_dpb_test.py
+++ b/tests/config_dpb_test.py
@@ -1,8 +1,8 @@
 import json
 import os
 from imp import load_source
+from unittest import mock
 
-import mock
 import pytest
 from click.testing import CliRunner
 from utilities_common.db import Db
diff --git a/tests/config_mgmt_test.py b/tests/config_mgmt_test.py
index b1c794faf1..adeca71d4e 100644
--- a/tests/config_mgmt_test.py
+++ b/tests/config_mgmt_test.py
@@ -1,14 +1,13 @@
 import imp
 import os
 import sys
+from unittest import mock, TestCase
 
 # import file under test i.e. config_mgmt.py
 imp.load_source('config_mgmt', \
     os.path.join(os.path.dirname(__file__), '..', 'config', 'config_mgmt.py'))
 import config_mgmt
 
-from unittest import TestCase
-from mock import MagicMock, call
 from json import dump
 from copy import deepcopy
 
@@ -108,8 +107,8 @@ def config_mgmt_dpb(self, curConfig):
         self.writeJson(curConfig, config_mgmt.CONFIG_DB_JSON_FILE)
         cmdpb = config_mgmt.ConfigMgmtDPB(source=config_mgmt.CONFIG_DB_JSON_FILE)
         # mock funcs
-        cmdpb.writeConfigDB = MagicMock(return_value=True)
-        cmdpb._verifyAsicDB = MagicMock(return_value=True)
+        cmdpb.writeConfigDB = mock.MagicMock(return_value=True)
+        cmdpb._verifyAsicDB = mock.MagicMock(return_value=True)
         from .mock_tables import dbconnector
         return cmdpb
 
@@ -218,7 +217,7 @@ def checkResult(self, cmdpb, delConfig, addConfig):
         Return:
             void
         '''
-        calls = [call(delConfig), call(addConfig)]
+        calls = [mock.call(delConfig), mock.call(addConfig)]
         assert cmdpb.writeConfigDB.call_count == 2
         cmdpb.writeConfigDB.assert_has_calls(calls, any_order=False)
         return
diff --git a/tests/reboot_cause_test.py b/tests/reboot_cause_test.py
index 327e60a140..f3372c3eb1 100644
--- a/tests/reboot_cause_test.py
+++ b/tests/reboot_cause_test.py
@@ -1,8 +1,10 @@
 import os
 import sys
 import textwrap
-import mock
+from unittest import mock
+
 from click.testing import CliRunner
+
 from .mock_tables import dbconnector
 
 test_path = os.path.dirname(os.path.abspath(__file__))