saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

We require mock>=3.0.0, remove unneeded static method

Browse source
This commit is contained in:
Pedro Algarvio 2021-09-22 12:58:19 +01:00 • committed by Megan Wilhite
parent aba001fdb7
commit 115a02f53a
5 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/support/kernelpkg.py
View file

@ -165,7 +165,7 @@ class KernelPkgTestCase:
self.assertEqual(result["latest_installed"], self.KERNEL_LIST[-1])
self.assertEqual(result["reboot_requested"], True)
self.assertEqual(result["reboot_required"], True)
self.assert_called_once(self._kernelpkg.__salt__["system.reboot"])
self._kernelpkg.__salt__["system.reboot"].assert_called_once()
def test_upgrade_needed_without_reboot(self):
"""

1
tests/support/mock.py
View file

@ -14,7 +14,6 @@
# pylint: disable=unused-import,function-redefined,blacklisted-module,blacklisted-external-module
import collections
import copy
import errno
import fnmatch

10
tests/support/unit.py
View file

@ -244,16 +244,6 @@ class TestCase(_TestCase):
assert isinstance(state_ret, dict), state_ret
return {x.split("_|-")[1]: y for x, y in state_ret.items()}
@staticmethod
def assert_called_once(mock):
"""
mock.assert_called_once only exists in PY3 in 3.6 and newer
"""
try:
mock.assert_called_once()
except AttributeError:
log.warning("assert_called_once invoked, but not available")
class TextTestResult(_TextTestResult):
"""

6
tests/unit/test_proxy_minion.py
View file

@ -47,7 +47,7 @@ class ProxyMinionTestCase(TestCase):
):
try:
ret = proxy_minion._post_master_init("dummy_master")
self.assert_called_once(salt.minion._metaproxy_call)
salt.minion._metaproxy_call.assert_called_once()
finally:
proxy_minion.destroy()
@ -75,7 +75,7 @@ class ProxyMinionTestCase(TestCase):
try:
ret = proxy_minion._handle_decoded_payload(mock_data).result()
self.assertEqual(proxy_minion.jid_queue, mock_jid_queue)
self.assert_called_once(salt.minion._metaproxy_call)
salt.minion._metaproxy_call.assert_called_once()
finally:
proxy_minion.destroy()
@ -103,7 +103,7 @@ class ProxyMinionTestCase(TestCase):
try:
ret = proxy_minion._handle_decoded_payload(mock_data).result()
self.assertEqual(proxy_minion.jid_queue, mock_jid_queue)
self.assert_called_once(mock_metaproxy_call)
mock_metaproxy_call.assert_called_once()
finally:
proxy_minion.destroy()

14
tests/unit/utils/test_vmware.py
View file

@ -4837,7 +4837,7 @@ class CreateVirtualMachineTestCase(TestCase):
self.mock_folder_object,
self.mock_resourcepool_object,
)
self.assert_called_once(self.mock_vm_create_task)
self.mock_vm_create_task.assert_called_once()
def test_create_vm_host_task_call(self):
salt.utils.vmware.create_vm(
@ -4847,7 +4847,7 @@ class CreateVirtualMachineTestCase(TestCase):
self.mock_resourcepool_object,
host_object=self.mock_host_object,
)
self.assert_called_once(self.mock_vm_create_task)
self.mock_vm_create_task.assert_called_once()
def test_create_vm_raise_no_permission(self):
exception = vim.fault.NoPermission()
@ -4929,7 +4929,7 @@ class RegisterVirtualMachineTestCase(TestCase):
self.mock_vmx_path,
self.mock_resourcepool_object,
)
self.assert_called_once(self.mock_vm_register_task)
self.mock_vm_register_task.assert_called_once()
def test_register_vm_host_task_call(self):
salt.utils.vmware.register_vm(
@ -4939,7 +4939,7 @@ class RegisterVirtualMachineTestCase(TestCase):
self.mock_resourcepool_object,
host_object=self.mock_host_object,
)
self.assert_called_once(self.mock_vm_register_task)
self.mock_vm_register_task.assert_called_once()
def test_register_vm_raise_no_permission(self):
exception = vim.fault.NoPermission()
@ -5011,7 +5011,7 @@ class UpdateVirtualMachineTestCase(TestCase):
def test_update_vm_task_call(self):
salt.utils.vmware.update_vm(self.mock_vm_ref, self.mock_config_spec)
self.assert_called_once(self.mock_vm_update_task)
self.mock_vm_update_task.assert_called_once()
def test_update_vm_raise_vim_fault(self):
exception = vim.fault.VimFault()
@ -5056,7 +5056,7 @@ class DeleteVirtualMachineTestCase(TestCase):
def test_destroy_vm_task_call(self):
salt.utils.vmware.delete_vm(self.mock_vm_ref)
self.assert_called_once(self.mock_vm_destroy_task)
self.mock_vm_destroy_task.assert_called_once()
def test_destroy_vm_raise_vim_fault(self):
exception = vim.fault.VimFault()
@ -5099,7 +5099,7 @@ class UnregisterVirtualMachineTestCase(TestCase):
def test_unregister_vm_task_call(self):
salt.utils.vmware.unregister_vm(self.mock_vm_ref)
self.assert_called_once(self.mock_vm_unregister)
self.mock_vm_unregister.assert_called_once()
def test_unregister_vm_raise_vim_fault(self):
exception = vim.fault.VimFault()