Merge "Use unittest.mock instead of mock"
This commit is contained in:
commit
337de39d71
@ -13,7 +13,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
from saharaclient.api import cluster_templates
|
||||
from saharaclient.api import clusters
|
||||
from saharaclient.api import data_sources
|
||||
|
@ -18,7 +18,7 @@ import sys
|
||||
|
||||
from jsonschema import exceptions
|
||||
import pkg_resources as pkg
|
||||
import mock
|
||||
from unittest import mock
|
||||
import testtools
|
||||
|
||||
from sahara_tests import version
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
import os
|
||||
|
||||
import mock
|
||||
from unittest import mock
|
||||
import testtools
|
||||
|
||||
from sahara_tests.scenario import utils
|
||||
|
@ -8,5 +8,4 @@ bandit!=1.6.0
|
||||
bashate>=0.2 # Apache-2.0
|
||||
coverage>=3.6 # Apache-2.0
|
||||
doc8 # Apache-2.0
|
||||
mock>=1.2 # BSD
|
||||
pylint==1.4.5 # GNU GPL v2
|
||||
|
Loading…
Reference in New Issue
Block a user