Merge "Use unittest.mock instead of mock"

roles/validate-tempest/files/bugcheck/tests/test_bugcheck.py

@@ -16,7 +16,7 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-import mock
+from unittest import mock
 import os
 import tempfile
 import unittest

roles/validate-tempest/files/tempestmail/tests/test_tempestmail.py

@@ -17,7 +17,7 @@
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 import datetime
-import mock
+from unittest import mock
 import re
 import tempfile
 import unittest