Use unittests.mock instead of mock lib

Change-Id: I07400c7fd829dea86774f3f695c8a976550c6baf

optional-requirements.txt

@@ -1,9 +0,0 @@
-# Purpose of optional-requirements is simple - list requirements which cannot
-# be placed in main requirements.txt .
-#
-# Reasons:
-#  - package doesn't support the same Python versions as Rally package
-#    supports (see classifiers from setup.cfg)
-#  - package doesn't have releases
-# If these rules do not relate to your package, feel free to propose it as main
-# requirement to Rally (requirements.txt file).

test-requirements.txt

@@ -13,7 +13,6 @@ pytest-html>=1.10.0                                    # Mozilla Public License
 pytest-xdist                                           # MIT
 
 ddt                                                    # MIT
-mock                                                   # OSI Approved :: BSD License
 python-dateutil                                        # Dual License
 testtools                                              # UNKNOWN
 
@@ -24,3 +23,4 @@ testresources                                          # UNKNOWN
 
 # needed for functional job
 stestr                                                 # Apache Software License
+mock 

tests/functional/test_cli_task.py

@@ -18,9 +18,9 @@ import os
 import re
 import threading
 import time
+from unittest import mock
 
 import jsonschema
-import mock
 import testtools
 
 from rally import api

tests/functional/test_cli_verify.py

@@ -14,12 +14,13 @@
 #    under the License.
 
 import re
-import unittest
+
+import testtools
 
 from tests.functional import utils
 
 
-class VerifyTestCase(unittest.TestCase):
+class VerifyTestCase(testtools.TestCase):
 
     def test_list_plugins(self):
         rally = utils.Rally(plugin_path="tests/functional/extra")

tests/unit/cli/commands/test_db.py

@@ -13,8 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
+from unittest import mock
-import mock
 
 from rally.cli.commands import db
 from tests.unit import fakes

tests/unit/cli/commands/test_deployment.py

@@ -16,8 +16,7 @@
 import collections
 import io
 import os
-
+from unittest import mock
-import mock
 
 from rally.cli import cliutils
 from rally.cli.commands import deployment

tests/unit/cli/commands/test_env.py

@@ -16,10 +16,9 @@
 import collections
 import datetime as dt
 import json
+from unittest import mock
 import uuid
 
-import mock
-
 from rally.cli.commands import env
 from rally.env import env_mgr
 from rally import exceptions

tests/unit/cli/commands/test_plugin.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 import io
+from unittest import mock
 
 import ddt
-import mock
 
 from rally.cli import cliutils
 from rally.cli.commands import plugin as plugin_cmd

tests/unit/cli/commands/test_task.py

@@ -18,9 +18,9 @@ import io
 import json
 import os.path
 import sys
+from unittest import mock
 
 import ddt
-import mock
 
 import rally
 from rally import api

tests/unit/cli/commands/test_verify.py

@@ -15,8 +15,7 @@
 
 import io
 import tempfile
-
+from unittest import mock
-import mock
 
 from rally.cli import cliutils
 from rally.cli.commands import verify

tests/unit/cli/test_cliutils.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 import io
+from unittest import mock
 
 import ddt
-import mock
 import sqlalchemy.exc
 
 from rally.cli import cliutils

tests/unit/cli/test_envutils.py

@@ -13,10 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import io
 import os
-
+from unittest import mock
-import mock
-from six import moves
 
 from rally.cli import envutils
 from rally import exceptions
@@ -34,7 +33,7 @@ class EnvUtilsTestCase(test.TestCase):
             pass
 
         with mock.patch("sys.stdout",
-                        new_callable=moves.StringIO) as mock_stdout:
+                        new_callable=io.StringIO) as mock_stdout:
             test_function()
             self.assertEqual("Missing argument: --test_missing_arg\n",
                              mock_stdout.getvalue())

tests/unit/common/db/test_api.py

@@ -16,9 +16,7 @@
 """Tests for db.api layer."""
 
 import datetime as dt
-
+from unittest import mock
-import mock
-from six import moves
 
 from rally.common import db
 from rally import consts
@@ -122,12 +120,12 @@ class TasksTestCase(test.DBTestCase):
 
     def test_task_list(self):
         INIT = consts.TaskStatus.INIT
-        task_init = sorted(self._create_task()["uuid"] for i in moves.range(3))
+        task_init = sorted(self._create_task()["uuid"] for i in range(3))
         FINISHED = consts.TaskStatus.FINISHED
         task_finished = sorted(self._create_task(
             {"status": FINISHED,
              "env_uuid": self.env["uuid"]}
-        )["uuid"] for i in moves.range(3))
+        )["uuid"] for i in range(3))
 
         task_all = sorted(task_init + task_finished)
 

tests/unit/common/db/test_migrations.py

@@ -22,11 +22,11 @@ import iso8601
 import json
 import pickle
 import pprint
+from unittest import mock
 import uuid
 
 import alembic
 import jsonschema
-import mock
 from oslo_db.sqlalchemy import test_migrations
 from oslo_db.sqlalchemy import utils as db_utils
 import sqlalchemy as sa

tests/unit/common/db/test_types.py

@@ -14,7 +14,8 @@
 
 """Tests for custom sqlalchemy types"""
 
-import mock
+from unittest import mock
+
 import sqlalchemy as sa
 
 from rally.common.db import sa_types

tests/unit/common/io/test_junit.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally.common.io import junit
 from tests.unit import test

tests/unit/common/io/test_subunit_v2.py

@@ -12,8 +12,7 @@
 #    under the License.
 
 import os
-
+from unittest import mock
-import mock
 
 from rally.common.io import subunit_v2
 from tests.unit import test

tests/unit/common/objects/test_deploy.py

@@ -16,7 +16,7 @@
 """Tests for db.deploy layer."""
 
 import datetime as dt
-import mock
+from unittest import mock
 
 from rally.common import objects
 from rally import consts

tests/unit/common/objects/test_task.py

@@ -17,9 +17,9 @@
 
 import collections
 import datetime as dt
+from unittest import mock
 
 import ddt
-import mock
 
 from rally.common import objects
 from rally import consts

tests/unit/common/objects/test_verification.py

@@ -15,8 +15,7 @@
 
 import copy
 import datetime as dt
-
+from unittest import mock
-import mock
 
 from rally.common import objects
 from rally import consts

tests/unit/common/objects/test_verifier.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally.common import objects
 from rally import exceptions

tests/unit/common/plugin/test_discover.py

@@ -13,10 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
 import uuid
 
-import mock
-
 from rally.common.plugin import discover
 from tests.unit import test
 

tests/unit/common/test_broker.py

@@ -14,8 +14,7 @@
 #    under the License.
 
 import collections
-
+from unittest import mock
-import mock
 
 from rally.common import broker
 from tests.unit import test

tests/unit/common/test_fileutils.py

@@ -14,8 +14,7 @@
 #    under the License.
 
 import os
-
+from unittest import mock
-import mock
 
 from rally.common import fileutils
 from tests.unit import test

tests/unit/common/test_logging.py

@@ -14,8 +14,7 @@
 #    under the License.
 
 import logging   # noqa
-
+from unittest import mock
-import mock
 
 from rally.common import logging as rally_logging
 from tests.unit import test
@@ -93,7 +92,7 @@ class RallyContaxtAdapterTestCase(test.TestCase):
 
         foo()
         # the number of the line which calls logging_method
-        lineno = 92
+        lineno = 91
         self.assertEqual((__file__, lineno, "logging_method()"), self.caller)
 
     @mock.patch("rally.common.logging.getLogger")
@@ -110,7 +109,7 @@ class RallyContaxtAdapterTestCase(test.TestCase):
         foo(1)
 
         # the number of the line which calls foo
-        lineno = 110
+        lineno = 109
         mock_get_logger.assert_called_once_with("%s:%s" % (__file__, lineno))
         logger = mock_get_logger.return_value
         self.assertEqual(1, logger.warning.call_count)
@@ -129,7 +128,7 @@ class RallyContaxtAdapterTestCase(test.TestCase):
         radapter.exception(Exception("!2!"))
 
         # the number of the line which calls foo
-        lineno = 129
+        lineno = 128
         mock_get_logger.assert_called_once_with("%s:%s" % (__file__, lineno))
 
         logger = mock_get_logger.return_value
@@ -146,7 +145,7 @@ class RallyContaxtAdapterTestCase(test.TestCase):
         radapter.error("foo", "bar")
 
         # the number of the line which calls foo
-        lineno = 146
+        lineno = 145
         mock_get_logger.assert_called_once_with("%s:%s" % (__file__, lineno))
 
         logger = mock_get_logger.return_value

tests/unit/common/test_opts.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally.common import opts
 from tests.unit import test

tests/unit/common/test_utils.py

@@ -19,9 +19,9 @@ import string
 import sys
 import threading
 import time
+from unittest import mock
 
 import ddt
-import mock
 import testtools
 
 from rally.common import utils

tests/unit/common/test_version.py

@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally.common import version
 from tests.unit import test

tests/unit/doc/utils.py

@@ -17,7 +17,7 @@ from docutils.parsers import rst
 from docutils import utils
 import sys
 
-import mock
+from unittest import mock
 
 
 @mock.patch.object(sys, "stderr")

tests/unit/env/test_env_mgr.py

@@ -15,8 +15,7 @@
 import copy
 import datetime as dt
 import os
-
+from unittest import mock
-import mock
 
 from rally.env import env_mgr
 from rally.env import platform

tests/unit/fakes.py

@@ -15,8 +15,7 @@
 
 import itertools
 import multiprocessing
-
+from unittest import mock
-import mock
 
 from rally import api
 from rally.common import utils as rally_utils

tests/unit/plugins/common/contexts/test_dummy.py

@@ -12,7 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
 from rally import exceptions
 from rally.plugins.common.contexts import dummy
 from tests.unit import test

tests/unit/plugins/common/exporters/elastic/test_client.py

@@ -13,8 +13,7 @@
 #    under the License.
 
 import copy
-
+from unittest import mock
-import mock
 
 from rally import exceptions
 from rally.plugins.common.exporters.elastic import client

tests/unit/plugins/common/exporters/elastic/test_exporter.py

@@ -13,10 +13,10 @@
 #    under the License.
 
 import copy
+import json
+from unittest import mock
 
 import ddt
-import json
-import mock
 
 from rally import exceptions
 from rally.plugins.common.exporters.elastic import exporter as elastic

tests/unit/plugins/common/exporters/test_html.py

@@ -13,8 +13,7 @@
 #    under the License.
 
 import os
-
+from unittest import mock
-import mock
 
 from rally.plugins.common.exporters import html
 from tests.unit import test

tests/unit/plugins/common/exporters/test_json_exporter.py

@@ -14,8 +14,7 @@
 
 import collections
 import datetime as dt
-
+from unittest import mock
-import mock
 
 from rally.common import version as rally_version
 from rally.plugins.common.exporters import json_exporter

tests/unit/plugins/common/exporters/test_junit.py

@@ -14,8 +14,7 @@
 
 import datetime as dt
 import os
-
+from unittest import mock
-import mock
 
 from rally.plugins.common.exporters import junit
 from tests.unit import test

tests/unit/plugins/common/exporters/test_trends.py

@@ -13,8 +13,7 @@
 #    under the License.
 
 import os
-
+from unittest import mock
-import mock
 
 from rally.plugins.common.exporters import trends
 from tests.unit import test

tests/unit/plugins/common/hook/test_sys_call.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 import subprocess
+from unittest import mock
 
 import ddt
-import mock
 
 from rally import consts
 from rally.plugins.common.hook import sys_call

tests/unit/plugins/common/hook/triggers/test_event.py

@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import ddt
-import mock
 
 from rally.plugins.common.hook.triggers import event
 from rally.task import hook

tests/unit/plugins/common/hook/triggers/test_periodic.py

@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import ddt
-import mock
 
 from rally.plugins.common.hook.triggers import periodic
 from rally.task import hook

tests/unit/plugins/common/runners/test_constant.py

@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import ddt
-import mock
 
 from rally.plugins.common.runners import constant
 from rally.task import runner

tests/unit/plugins/common/runners/test_rps.py

@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import ddt
-import mock
 
 from rally.plugins.common.runners import rps
 from rally.task import runner

tests/unit/plugins/common/runners/test_serial.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally.plugins.common.runners import serial
 from tests.unit import fakes

tests/unit/plugins/common/scenarios/dummy/test_dummy.py

@@ -10,9 +10,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
 
 import ddt
-import mock
 
 from rally.plugins.common.scenarios.dummy import dummy
 from tests.unit import test

tests/unit/plugins/common/scenarios/requests/test_http_requests.py

@@ -10,8 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
+from unittest import mock
-import mock
 
 from rally.plugins.common.scenarios.requests import http_requests
 from tests.unit import test

tests/unit/plugins/common/scenarios/requests/test_utils.py

@@ -10,8 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
+from unittest import mock
-import mock
 
 from rally.plugins.common.scenarios.requests import utils
 from tests.unit import test

tests/unit/plugins/common/test_types.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally import exceptions
 from rally.plugins.common import types

tests/unit/plugins/common/test_validators.py

@@ -12,11 +12,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import ddt
-import mock
 import os
 import shutil
 import tempfile
+from unittest import mock
+
+import ddt
 
 import rally
 from rally.common.plugin import plugin

tests/unit/plugins/common/verification/test_reporters.py

@@ -15,9 +15,9 @@
 import collections
 import datetime as dt
 import os
+from unittest import mock
 
 import ddt
-import mock
 
 from rally.common import utils
 from rally.plugins.common.verification import reporters

tests/unit/plugins/common/verification/test_testr.py

@@ -13,8 +13,7 @@
 
 import os
 import subprocess
-
+from unittest import mock
-import mock
 
 from rally import exceptions
 from rally.plugins.common.verification import testr

tests/unit/task/processing/test_charts.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 import collections
+from unittest import mock
 
 import ddt
-import mock
 
 from rally.common.plugin import plugin
 from rally.task.processing import charts

tests/unit/task/processing/test_plot.py

@@ -15,9 +15,9 @@
 
 import collections
 import json
+from unittest import mock
 
 import ddt
-import mock
 
 from rally.task.processing import plot
 from tests.unit import test

tests/unit/task/test_atomic.py

@@ -14,8 +14,7 @@
 #    under the License.
 
 import collections
-
+from unittest import mock
-import mock
 
 from rally.task import atomic
 from tests.unit import test

tests/unit/task/test_context.py

@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import ddt
-import mock
 
 from rally import exceptions
 from rally.task import context

tests/unit/task/test_engine.py

@@ -17,8 +17,7 @@
 
 import collections
 import threading
-
+from unittest import mock
-import mock
 
 from rally.common import objects
 from rally import consts

tests/unit/task/test_exporter.py

@@ -12,8 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import jsonschema
-import mock
 
 from rally.task import exporter
 from tests.unit import test

tests/unit/task/test_hook.py

@@ -15,8 +15,9 @@
 
 """Tests for HookExecutor and Hook classes."""
 
+from unittest import mock
+
 import ddt
-import mock
 
 from rally import consts
 from rally.task import hook

tests/unit/task/test_runner.py

@@ -15,9 +15,9 @@
 
 import collections
 import multiprocessing
+from unittest import mock
 
 import ddt
-import mock
 
 from rally.plugins.common.runners import serial
 from rally.task import runner

tests/unit/task/test_scenario.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally import exceptions
 from rally.task import context

tests/unit/task/test_services.py

@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally import exceptions
 from rally.task import service

tests/unit/task/test_sla.py

@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import ddt
-import mock
 
 from rally.common.plugin import plugin
 from rally.task import sla

tests/unit/task/test_task_cfg.py

@@ -13,8 +13,7 @@
 #    under the License.
 
 import collections
-
+from unittest import mock
-import mock
 
 from rally import exceptions
 from rally.task import task_cfg

tests/unit/task/test_types.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally.common.plugin import plugin
 from rally.task import scenario

tests/unit/task/test_utils.py

@@ -15,11 +15,11 @@
 
 import collections
 import datetime as dt
+from unittest import mock
 import uuid
 
 import ddt
 from jsonschema import exceptions as schema_exceptions
-import mock
 
 from rally import exceptions
 from rally.task import utils

tests/unit/test.py

@@ -16,9 +16,9 @@
 import fixtures
 from fixtures._fixtures.tempdir import TempDir
 import os
+from unittest import mock
 import uuid
 
-import mock
 import testtools
 
 from rally.common import cfg

tests/unit/test_api.py

@@ -17,9 +17,9 @@
 
 import copy
 import os
+from unittest import mock
 
 import ddt
-import mock
 
 from rally import api
 from rally.common import cfg

tests/unit/test_exceptions.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally import exceptions
 from tests.unit import test

tests/unit/test_pytest_launcher.py

@@ -13,8 +13,7 @@
 #    under the License.
 
 import os
-
+from unittest import mock
-import mock
 
 from tests.ci import pytest_launcher
 from tests.unit import test

tests/unit/test_test_mock.py

@@ -12,8 +12,7 @@
 
 import ast
 import sys
-
+from unittest import mock
-import mock
 
 from tests.unit import test
 from tests.unit import test_mock

tests/unit/utils/test_encodeutils.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally.utils import encodeutils
 from tests.unit import test

tests/unit/utils/test_sshutils.py

@@ -16,9 +16,9 @@
 import io
 import os
 import socket
+from unittest import mock
 
 import ddt
-import mock
 import paramiko
 
 from rally import exceptions

tests/unit/utils/test_strutils.py

@@ -12,10 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
 import uuid
 
 import ddt
-import mock
 
 from rally.utils import strutils
 from tests.unit import test

tests/unit/verification/test_context.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally.verification import context
 from tests.unit import test

tests/unit/verification/test_manager.py

@@ -12,8 +12,7 @@
 
 import os
 import sys
-
+from unittest import mock
-import mock
 
 from rally import exceptions
 from rally.verification import manager

tests/unit/verification/test_reporter.py

@@ -12,8 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import jsonschema
-import mock
 
 from rally.verification import reporter
 from tests.unit import test

tests/unit/verification/test_utils.py

@@ -14,8 +14,7 @@
 
 import configparser
 import subprocess
-
+from unittest import mock
-import mock
 
 from rally.verification import utils
 from tests.unit import test