Merge "Use unittest.mock instead of mock"
This commit is contained in:
commit
b09b100a6a
|
@ -19,8 +19,8 @@ Tests for `os_performance_tools.collect`
|
||||||
|
|
||||||
import io
|
import io
|
||||||
import json
|
import json
|
||||||
import mock
|
|
||||||
import tempfile
|
import tempfile
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
from os_performance_tools import collect
|
from os_performance_tools import collect
|
||||||
from os_performance_tools.tests import base
|
from os_performance_tools.tests import base
|
||||||
|
|
|
@ -18,8 +18,8 @@ Tests for `os_performance_tools.counters2statsd`
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import json
|
import json
|
||||||
import mock
|
|
||||||
import time
|
import time
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
from os_performance_tools import counters2statsd
|
from os_performance_tools import counters2statsd
|
||||||
from os_performance_tools.tests import base
|
from os_performance_tools.tests import base
|
||||||
|
|
|
@ -17,7 +17,7 @@ test_collectors
|
||||||
Tests for `os_performance_tools.collectors`
|
Tests for `os_performance_tools.collectors`
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import mock
|
from unittest import mock
|
||||||
|
|
||||||
from os_performance_tools.collectors import mysql
|
from os_performance_tools.collectors import mysql
|
||||||
from os_performance_tools.tests import base
|
from os_performance_tools.tests import base
|
||||||
|
|
|
@ -18,7 +18,7 @@ Tests for `os_performance_tools.collectors`
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import json
|
import json
|
||||||
import mock
|
from unittest import mock
|
||||||
|
|
||||||
from os_performance_tools.collectors import queues
|
from os_performance_tools.collectors import queues
|
||||||
from os_performance_tools.tests import base
|
from os_performance_tools.tests import base
|
||||||
|
|
|
@ -10,4 +10,3 @@ python-subunit>=0.0.18
|
||||||
oslotest>=1.10.0 # Apache-2.0
|
oslotest>=1.10.0 # Apache-2.0
|
||||||
testrepository>=0.0.18
|
testrepository>=0.0.18
|
||||||
testscenarios>=0.4
|
testscenarios>=0.4
|
||||||
mock>=1.2
|
|
||||||
|
|
Loading…
Reference in New Issue