Merge "Use unittest.mock instead of mock"
This commit is contained in:
commit
485d41dd38
@ -1,5 +1,4 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- python35-charm-jobs
|
|
||||||
- openstack-python3-ussuri-jobs
|
- openstack-python3-ussuri-jobs
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
@ -28,11 +28,6 @@ oslo.utils<=3.41.0;python_version<'3.6'
|
|||||||
requests>=2.18.4
|
requests>=2.18.4
|
||||||
charms.reactive
|
charms.reactive
|
||||||
|
|
||||||
# Newer mock seems to have some syntax which is newer than python3.5 (e.g.
|
|
||||||
# f'{something}'
|
|
||||||
mock>=1.2,<4.0.0; python_version < '3.6'
|
|
||||||
mock>=1.2; python_version >= '3.6'
|
|
||||||
|
|
||||||
nose>=1.3.7
|
nose>=1.3.7
|
||||||
coverage>=3.6
|
coverage>=3.6
|
||||||
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
|
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# unit tests
|
# unit tests
|
||||||
|
|
||||||
import mock
|
from unittest import mock
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
sys.path.append('src')
|
sys.path.append('src')
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import mock
|
from unittest import mock
|
||||||
from unittest.mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
import lib.charm.vault as vault
|
import lib.charm.vault as vault
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import mock
|
from unittest import mock
|
||||||
from unittest.mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
import hvac
|
import hvac
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import mock
|
from unittest import mock
|
||||||
from unittest.mock import patch, call
|
from unittest.mock import patch, call
|
||||||
|
|
||||||
import charms.reactive
|
import charms.reactive
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import mock
|
from unittest import mock
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user