Reviewed: https://review.opendev.org/677378 Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=eca5608fe35728b12fc4d817f4a7e0a783219047 Submitter: Zuul Branch: stable/queens
commit eca5608fe35728b12fc4d817f4a7e0a783219047 Author: Takashi NATSUME <email address hidden> Date: Thu Aug 15 10:00:38 2019 +0900
Fix 'has_calls' method calls in unit tests
The 'has_calls' method does not exist in assertion methods of mock. Replace the 'has_calls' method with an 'assert_has_calls' method or an 'assert_called_once_with' method. Add an 'assertEqual' check before an 'assert_has_calls' method.
Conflicts: nova/tests/unit/virt/ironic/test_driver.py
NOTE(takashin): The conflict is due to not having the following change in stable/queens.
I87f085589bb663c519650f307f25d087c88bbdb1
Change-Id: I4b606fce473d064b9bb00213696c075cea020aaf Closes-Bug: #1840200 (cherry picked from commit ad482e53fbb956288e73692f6bff5f74d862fe5d) (cherry picked from commit fa59033c40745febc26399e668ceb9911f8ec45d) (cherry picked from commit 8e7e54f60b0374d6439a4cedc098c5a3c97b79d9)
Reviewed: https:/ /review. opendev. org/677378 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=eca5608fe35 728b12fc4d817f4 a7e0a783219047
Committed: https:/
Submitter: Zuul
Branch: stable/queens
commit eca5608fe35728b 12fc4d817f4a7e0 a783219047
Author: Takashi NATSUME <email address hidden>
Date: Thu Aug 15 10:00:38 2019 +0900
Fix 'has_calls' method calls in unit tests
The 'has_calls' method does not exist in assertion methods of mock. called_ once_with' method.
Replace the 'has_calls' method with an 'assert_has_calls' method or
an 'assert_
Add an 'assertEqual' check before an 'assert_has_calls' method.
Conflicts:
nova/tests/ unit/virt/ ironic/ test_driver. py
NOTE(takashin): The conflict is due to not having the following change
in stable/queens.
Change-Id: I4b606fce473d06 4b9bb00213696c0 75cea020aaf 88e73692f6bff5f 74d862fe5d) bc26399e668ceb9 911f8ec45d) 6439a4cedc098c5 a3c97b79d9)
Closes-Bug: #1840200
(cherry picked from commit ad482e53fbb9562
(cherry picked from commit fa59033c40745fe
(cherry picked from commit 8e7e54f60b0374d