Use unittest.mock instead of mock
The mock third party library was needed for mock support in py2 runtimes. Since we now only support py36 and later, we can use the standard lib unittest.mock module instead. Change-Id: Id257b597368aff252ce7120b9dbc02f21a41e629
This commit is contained in:
parent
7686d4b584
commit
4f135d9e97
@ -3,7 +3,6 @@
|
|||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
coverage>=3.6
|
coverage>=3.6
|
||||||
nose
|
nose
|
||||||
mock>=1.2
|
|
||||||
flake8>=2.2.4
|
flake8>=2.2.4
|
||||||
stestr
|
stestr
|
||||||
requests==2.6.0
|
requests==2.6.0
|
||||||
|
@ -15,11 +15,11 @@
|
|||||||
import json
|
import json
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
import charms_ceph.broker
|
import charms_ceph.broker
|
||||||
|
|
||||||
from mock import call
|
from unittest.mock import call
|
||||||
|
|
||||||
|
|
||||||
class CephBrokerTestCase(unittest.TestCase):
|
class CephBrokerTestCase(unittest.TestCase):
|
||||||
|
@ -16,7 +16,7 @@ import unittest
|
|||||||
|
|
||||||
import charms_ceph.crush_utils
|
import charms_ceph.crush_utils
|
||||||
|
|
||||||
from mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
|
||||||
CRUSHMAP1 = """# begin crush map
|
CRUSHMAP1 = """# begin crush map
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
import charms_ceph.utils
|
import charms_ceph.utils
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
import charms_ceph.utils
|
import charms_ceph.utils
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ import sys
|
|||||||
import time
|
import time
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from mock import patch, call, MagicMock
|
from unittest.mock import patch, call, MagicMock
|
||||||
|
|
||||||
import charms_ceph.utils
|
import charms_ceph.utils
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ import time
|
|||||||
import subprocess
|
import subprocess
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from mock import patch, call, mock_open
|
from unittest.mock import patch, call, mock_open
|
||||||
|
|
||||||
import charms_ceph.utils
|
import charms_ceph.utils
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ import collections
|
|||||||
import subprocess
|
import subprocess
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from mock import (
|
from unittest.mock import (
|
||||||
call,
|
call,
|
||||||
mock_open,
|
mock_open,
|
||||||
MagicMock,
|
MagicMock,
|
||||||
|
Loading…
Reference in New Issue
Block a user