Merge "Use unittest.mock instead of mock"
This commit is contained in:
commit
7aa1c0e4d0
|
@ -1,5 +1,5 @@
|
||||||
import sys
|
import sys
|
||||||
import mock
|
from unittest import mock
|
||||||
|
|
||||||
charmhelpers = None
|
charmhelpers = None
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
import itertools
|
import itertools
|
||||||
import mock
|
from unittest import mock
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
import charmhelpers.core.unitdata as unitdata
|
import charmhelpers.core.unitdata as unitdata
|
||||||
|
|
|
@ -6,5 +6,4 @@ flake8>=2.2.4
|
||||||
stestr
|
stestr
|
||||||
paramiko<2.0
|
paramiko<2.0
|
||||||
charms.reactive
|
charms.reactive
|
||||||
mock>=1.2
|
|
||||||
coverage>=3.6
|
coverage>=3.6
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import mock
|
from unittest import mock
|
||||||
import os
|
import os
|
||||||
|
|
||||||
# mock out some charmhelpers libraries as they have apt install side effects
|
# mock out some charmhelpers libraries as they have apt install side effects
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import base64
|
import base64
|
||||||
import mock
|
from unittest import mock
|
||||||
|
|
||||||
import unit_tests.utils as utils
|
import unit_tests.utils as utils
|
||||||
from unit_tests.charms_openstack.charm.utils import (
|
from unit_tests.charms_openstack.charm.utils import (
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import collections
|
import collections
|
||||||
import mock
|
from unittest import mock
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
import charms_openstack.charm.core as chm_core
|
import charms_openstack.charm.core as chm_core
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import collections
|
import collections
|
||||||
import mock
|
from unittest import mock
|
||||||
|
|
||||||
import charms_openstack.charm.core as chm_core
|
import charms_openstack.charm.core as chm_core
|
||||||
import charms_openstack.charm.defaults as chm
|
import charms_openstack.charm.defaults as chm
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import mock
|
from unittest import mock
|
||||||
|
|
||||||
import unit_tests.utils
|
import unit_tests.utils
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
# sys.modules['charmhelpers.contrib.network.ip'] = mock.MagicMock()
|
# sys.modules['charmhelpers.contrib.network.ip'] = mock.MagicMock()
|
||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
import mock
|
from unittest import mock
|
||||||
|
|
||||||
import charms_openstack.adapters as c_adapters
|
import charms_openstack.adapters as c_adapters
|
||||||
import charms_openstack.plugins.adapters as pl_adapters
|
import charms_openstack.plugins.adapters as pl_adapters
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import mock
|
from unittest import mock
|
||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
import copy
|
import copy
|
||||||
import unittest
|
import unittest
|
||||||
import mock
|
from unittest import mock
|
||||||
|
|
||||||
import charms.reactive as reactive
|
import charms.reactive as reactive
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
import os
|
import os
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
import mock
|
from unittest import mock
|
||||||
|
|
||||||
import charms_openstack.bus as bus
|
import charms_openstack.bus as bus
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
# mock out some charmhelpers libraries as they have apt install side effects
|
# mock out some charmhelpers libraries as they have apt install side effects
|
||||||
# sys.modules['charmhelpers.contrib.openstack.utils'] = mock.MagicMock()
|
# sys.modules['charmhelpers.contrib.openstack.utils'] = mock.MagicMock()
|
||||||
# sys.modules['charmhelpers.contrib.network.ip'] = mock.MagicMock()
|
# sys.modules['charmhelpers.contrib.network.ip'] = mock.MagicMock()
|
||||||
import mock
|
from unittest import mock
|
||||||
|
|
||||||
import charms_openstack.devices.pci as pci
|
import charms_openstack.devices.pci as pci
|
||||||
import unit_tests.pci_responses as pci_responses
|
import unit_tests.pci_responses as pci_responses
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
import contextlib
|
import contextlib
|
||||||
import io
|
import io
|
||||||
import mock
|
from unittest import mock
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue