Merge "Use unittest.mock instead of third party mock"
This commit is contained in:
commit
6487f4510c
|
@ -15,7 +15,8 @@
|
|||
# under the License.
|
||||
|
||||
import datetime
|
||||
import mock
|
||||
from unittest import mock
|
||||
|
||||
from oslo_utils import timeutils
|
||||
from oslotest import base
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
hacking>=3.0.1,<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
|
||||
|
|
Loading…
Reference in New Issue