openstack/openstacksdk
Code Issues Proposed changes

Remove unnecessary mocks

Browse Source 
We haven't called 'has_service' since we removed some unnecessary checks
for Swift in change I7349b0bf37b3d296f59f4ee3547dd98a142e1ec7.

Change-Id: I2ce72027ebd96dcb165cd3aa0249ebb87ed28f84
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane
2022-12-19 10:47:47 +00:00
parent e350c80aca
commit 0c54b0993e
1 changed files with 14 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
openstack/tests/unit/block_storage/v2/test_proxy.py
View File

@@ -198,41 +198,31 @@ class TestVolumeActions(TestVolumeProxy):
class TestBackup(TestVolumeProxy): class TestBackup(TestVolumeProxy):
def test_backups_detailed(self): def test_backups_detailed(self):
# NOTE: mock has_service self.verify_list(
self.proxy._connection = mock.Mock() self.proxy.backups,
self.proxy._connection.has_service = mock.Mock(return_value=True) backup.Backup,
self.verify_list(self.proxy.backups, backup.Backup, method_kwargs={"details": True, "query": 1},
method_kwargs={"details": True, "query": 1}, expected_kwargs={"query": 1, "base_path": "/backups/detail"},
expected_kwargs={"query": 1, )
"base_path": "/backups/detail"})
def test_backups_not_detailed(self): def test_backups_not_detailed(self):
# NOTE: mock has_service self.verify_list(
self.proxy._connection = mock.Mock() self.proxy.backups,
self.proxy._connection.has_service = mock.Mock(return_value=True) backup.Backup,
self.verify_list(self.proxy.backups, backup.Backup, method_kwargs={"details": False, "query": 1},
method_kwargs={"details": False, "query": 1}, expected_kwargs={"query": 1},
expected_kwargs={"query": 1}) )
def test_backup_get(self): def test_backup_get(self):
# NOTE: mock has_service
self.proxy._connection = mock.Mock()
self.proxy._connection.has_service = mock.Mock(return_value=True)
self.verify_get(self.proxy.get_backup, backup.Backup) self.verify_get(self.proxy.get_backup, backup.Backup)
def test_backup_find(self): def test_backup_find(self):
self.verify_find(self.proxy.find_backup, backup.Backup) self.verify_find(self.proxy.find_backup, backup.Backup)
def test_backup_delete(self): def test_backup_delete(self):
# NOTE: mock has_service
self.proxy._connection = mock.Mock()
self.proxy._connection.has_service = mock.Mock(return_value=True)
self.verify_delete(self.proxy.delete_backup, backup.Backup, False) self.verify_delete(self.proxy.delete_backup, backup.Backup, False)
def test_backup_delete_ignore(self): def test_backup_delete_ignore(self):
# NOTE: mock has_service
self.proxy._connection = mock.Mock()
self.proxy._connection.has_service = mock.Mock(return_value=True)
self.verify_delete(self.proxy.delete_backup, backup.Backup, True) self.verify_delete(self.proxy.delete_backup, backup.Backup, True)
def test_backup_delete_force(self): def test_backup_delete_force(self):
@@ -245,15 +235,9 @@ class TestBackup(TestVolumeProxy):
) )
def test_backup_create_attrs(self): def test_backup_create_attrs(self):
# NOTE: mock has_service
self.proxy._connection = mock.Mock()
self.proxy._connection.has_service = mock.Mock(return_value=True)
self.verify_create(self.proxy.create_backup, backup.Backup) self.verify_create(self.proxy.create_backup, backup.Backup)
def test_backup_restore(self): def test_backup_restore(self):
# NOTE: mock has_service
self.proxy._connection = mock.Mock()
self.proxy._connection.has_service = mock.Mock(return_value=True)
self._verify( self._verify(
'openstack.block_storage.v2.backup.Backup.restore', 'openstack.block_storage.v2.backup.Backup.restore',
self.proxy.restore_backup, self.proxy.restore_backup,
@@ -268,7 +252,8 @@ class TestBackup(TestVolumeProxy):
"openstack.block_storage.v2.backup.Backup.reset", "openstack.block_storage.v2.backup.Backup.reset",
self.proxy.reset_backup, self.proxy.reset_backup,
method_args=["value", "new_status"], method_args=["value", "new_status"],
expected_args=[self.proxy, "new_status"]) expected_args=[self.proxy, "new_status"],
)
class TestSnapshot(TestVolumeProxy): class TestSnapshot(TestVolumeProxy):