From 2fe47c29c977b45e0d16a92d1c80290e18834ca4 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Sat, 18 Apr 2020 11:54:45 -0500 Subject: [PATCH] Use unittest.mock instead of third party mock Now that we no longer support py27, we can use the standard library unittest.mock module instead of the third party mock lib. Change-Id: I8ac5e339700316b07b7c548f24ffc8dd83110df3 Signed-off-by: Sean McGinnis --- .../tests/unit/publisher/test_monasca_data_filter.py | 3 ++- .../ceilometer/tests/unit/publisher/test_monasca_publisher.py | 3 ++- ceilosca/ceilometer/tests/unit/test_monascaclient.py | 2 +- test-requirements.txt | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ceilosca/ceilometer/tests/unit/publisher/test_monasca_data_filter.py b/ceilosca/ceilometer/tests/unit/publisher/test_monasca_data_filter.py index 8e6dfca..915652f 100644 --- a/ceilosca/ceilometer/tests/unit/publisher/test_monasca_data_filter.py +++ b/ceilosca/ceilometer/tests/unit/publisher/test_monasca_data_filter.py @@ -15,7 +15,8 @@ # under the License. import datetime -import mock +from unittest import mock + from oslo_utils import timeutils from oslotest import base diff --git a/ceilosca/ceilometer/tests/unit/publisher/test_monasca_publisher.py b/ceilosca/ceilometer/tests/unit/publisher/test_monasca_publisher.py index 937c7ef..06e52a4 100755 --- a/ceilosca/ceilometer/tests/unit/publisher/test_monasca_publisher.py +++ b/ceilosca/ceilometer/tests/unit/publisher/test_monasca_publisher.py @@ -17,10 +17,11 @@ """ import datetime +from unittest import mock + import fixtures import time -import mock from oslotest import base from ceilometer import monasca_client as mon_client diff --git a/ceilosca/ceilometer/tests/unit/test_monascaclient.py b/ceilosca/ceilometer/tests/unit/test_monascaclient.py index 413376a..0e4ef56 100644 --- a/ceilosca/ceilometer/tests/unit/test_monascaclient.py +++ b/ceilosca/ceilometer/tests/unit/test_monascaclient.py @@ -12,7 +12,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from oslo_utils import netutils from oslotest import base diff --git a/test-requirements.txt b/test-requirements.txt index aa4abde..752dbfb 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,6 +1,5 @@ hacking>=3.0,<3.1.0 # Apache-2.0 git+https://github.com/openstack/ceilometer.git@master#egg=ceilometer -mock>=1.2 # BSD testscenarios>=0.4 # Apache-2.0/BSD testtools>=1.4.0 # MIT oslotest>=2.15.0 # Apache-2.0