openstack
/
octavia-lib
Code Issues Proposed changes

Remove the dependency on the "mock" package 

Now that we are python3 only, we should move to using the built
in version of mock that supports all of our testing needs and
remove the dependency on the "mock" package.

This patch moves all references to "import mock" to
"from unittest import mock". It also cleans up some new line
inconsistency.

Change-Id: Ie7567134a7c0ffae525d0282773e4c90a3f2d62b
This commit is contained in:
Michael Johnson 2020-03-13 10:33:21 -07:00
parent 7d03255181
commit c565e7b289
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lower-constraints.txt
View File

@ -2,7 +2,6 @@ bandit==1.4.0
coverage==4.0 coverage==4.0
doc8==0.6.0 doc8==0.6.0
hacking==0.12.0 hacking==0.12.0
mock==2.0.0
oslo.i18n==3.15.3 oslo.i18n==3.15.3
oslo.serialization==2.28.1 oslo.serialization==2.28.1
oslo.utils==3.33.0 oslo.utils==3.33.0

3
octavia_lib/tests/unit/api/drivers/test_driver_lib.py
View File

@ -11,8 +11,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from unittest import mock
import mock
from octavia_lib.api.drivers import driver_lib from octavia_lib.api.drivers import driver_lib
from octavia_lib.api.drivers import exceptions as driver_exceptions from octavia_lib.api.drivers import exceptions as driver_exceptions

3
octavia_lib/tests/unit/base.py
View File

@ -14,8 +14,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from unittest import mock
import mock
from oslotest import base from oslotest import base

1
test-requirements.txt
View File

@ -7,7 +7,6 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
bandit>=1.1.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0
coverage>=4.0,!=4.4 # Apache-2.0 coverage>=4.0,!=4.4 # Apache-2.0
doc8>=0.6.0 # Apache-2.0 doc8>=0.6.0 # Apache-2.0
mock>=2.0.0 # BSD
pylint==1.9.2 # GPLv2 pylint==1.9.2 # GPLv2
python-subunit>=1.0.0 # Apache-2.0/BSD python-subunit>=1.0.0 # Apache-2.0/BSD
oslo.utils>=3.33.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0