From 611111b8bd112124311370f7cccbd8a53b9901c6 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 3 Apr 2020 10:22:09 +0100
Subject: [PATCH] Use unittest.mock instead of PyPI mock

Now that py2 is gone, oslotest dropped dependency on mock and will
soon affect Ussuri CI [1], let's use unittest.mock built in py3.

This also fixes py38 jobs and proactively prevents py36 and py37
failing due to [1]. This is because we never included mock in
test-requirements and instead relied on oslotest to bring it in.

[1] https://review.opendev.org/716322

Change-Id: I0c18b13c4e1fbaa9db41da4e2039ad908c28caa6
---
 kayobe/tests/unit/cli/test_commands.py  | 2 +-
 kayobe/tests/unit/test_ansible.py       | 3 +--
 kayobe/tests/unit/test_kolla_ansible.py | 3 +--
 kayobe/tests/unit/test_utils.py         | 2 +-
 kayobe/tests/unit/test_vault.py         | 3 +--
 tools/sphinx8                           | 2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/kayobe/tests/unit/cli/test_commands.py b/kayobe/tests/unit/cli/test_commands.py
index 1242b17c..7a252050 100644
--- a/kayobe/tests/unit/cli/test_commands.py
+++ b/kayobe/tests/unit/cli/test_commands.py
@@ -13,10 +13,10 @@
 # under the License.
 
 import unittest
+from unittest import mock
 
 import cliff.app
 import cliff.commandmanager
-import mock
 
 from kayobe import ansible
 from kayobe.cli import commands
diff --git a/kayobe/tests/unit/test_ansible.py b/kayobe/tests/unit/test_ansible.py
index bb5540ca..bf60f04b 100644
--- a/kayobe/tests/unit/test_ansible.py
+++ b/kayobe/tests/unit/test_ansible.py
@@ -19,8 +19,7 @@ import shutil
 import subprocess
 import tempfile
 import unittest
-
-import mock
+from unittest import mock
 
 from kayobe import ansible
 from kayobe import exception
diff --git a/kayobe/tests/unit/test_kolla_ansible.py b/kayobe/tests/unit/test_kolla_ansible.py
index ddc71745..f9f63101 100644
--- a/kayobe/tests/unit/test_kolla_ansible.py
+++ b/kayobe/tests/unit/test_kolla_ansible.py
@@ -16,8 +16,7 @@ import argparse
 import os
 import subprocess
 import unittest
-
-import mock
+from unittest import mock
 
 from kayobe import kolla_ansible
 from kayobe import utils
diff --git a/kayobe/tests/unit/test_utils.py b/kayobe/tests/unit/test_utils.py
index 02659987..57677821 100644
--- a/kayobe/tests/unit/test_utils.py
+++ b/kayobe/tests/unit/test_utils.py
@@ -15,8 +15,8 @@
 import os
 import subprocess
 import unittest
+from unittest import mock
 
-import mock
 import yaml
 
 from kayobe import utils
diff --git a/kayobe/tests/unit/test_vault.py b/kayobe/tests/unit/test_vault.py
index d4c8fd21..a6d3fa77 100644
--- a/kayobe/tests/unit/test_vault.py
+++ b/kayobe/tests/unit/test_vault.py
@@ -15,8 +15,7 @@
 import argparse
 import os
 import unittest
-
-import mock
+from unittest import mock
 
 from kayobe import utils
 from kayobe import vault
diff --git a/tools/sphinx8 b/tools/sphinx8
index 2813fd8c..d67ed027 100755
--- a/tools/sphinx8
+++ b/tools/sphinx8
@@ -11,9 +11,9 @@ directives when any of the directives modules are imported.
 """
 
 import sys
+from unittest import mock
 
 import doc8.main
-import mock
 import sphinx.directives
 import sphinx.directives.code
 import sphinx.directives.patches
-- 
GitLab