openstack/python-manilaclient
Code Issues Proposed changes

Compare API call body in assertions with respect to values

Browse Source 
FakeClient.assert_called() compares dictionaries of actual and body 
in a wrong way. It takes into account only top-level keys of the dict,
leaving behind everything else.

Changes to the test_shell.py file fix tests which had wrong expected
values. Before this change expected values were not used properly,
that's why the tests were passing.

Closes-Bug: #1734115

Change-Id: Ib863c60a4698cbae01654bd8eea159b04d531569
This commit is contained in:
Alexander Pugachev 2017-11-01 01:12:25 +00:00
parent d80a7cef71
commit 434af1132c
2 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manilaclient/tests/unit/fakes.py
View File

@ -50,14 +50,7 @@ class FakeClient(object):
if body is not None:
actual = self.client.callstack[pos][2]
if isinstance(actual, dict) and isinstance(body, dict):
assert sorted(list(actual)) == sorted(list(body))
else:
assert actual == body, "Expected %(b)s; got %(a)s" % {
'b': body,
'a': actual
}
assert actual == body, "Expected %s; got %s" % (body, actual)
def assert_called_anytime(self, method, url, body=None,
clear_callstack=True):

25
manilaclient/tests/unit/v2/test_shell.py
View File

@ -503,10 +503,6 @@ class ShellTest(test_utils.TestCase):
'name': 'test-type-3',
'extra_specs': {
'driver_handles_share_servers': False,
'snapshot_support': True,
'create_share_from_snapshot_support': True,
'revert_to_snapshot_support': False,
'mount_snapshot_support': False,
},
'share_type_access:is_public': public
}
@ -901,10 +897,6 @@ class ShellTest(test_utils.TestCase):
"share_type_access:is_public": True,
"extra_specs": {
"driver_handles_share_servers": expected_bool,
"snapshot_support": True,
"create_share_from_snapshot_support": True,
"revert_to_snapshot_support": False,
"mount_snapshot_support": False,
}
}
}
@ -951,9 +943,6 @@ class ShellTest(test_utils.TestCase):
"extra_specs": {
"driver_handles_share_servers": False,
"snapshot_support": expected_bool,
"create_share_from_snapshot_support": True,
"revert_to_snapshot_support": False,
"mount_snapshot_support": False,
"replication_type": replication_type,
}
}
@ -982,8 +971,6 @@ class ShellTest(test_utils.TestCase):
"driver_handles_share_servers": False,
"snapshot_support": True,
"create_share_from_snapshot_support": expected_bool,
"revert_to_snapshot_support": False,
"mount_snapshot_support": False,
}
}
}
@ -1025,7 +1012,6 @@ class ShellTest(test_utils.TestCase):
"extra_specs": {
"driver_handles_share_servers": False,
"snapshot_support": True,
"create_share_from_snapshot_support": True,
"revert_to_snapshot_support": expected_bool,
}
}
@ -1060,7 +1046,6 @@ class ShellTest(test_utils.TestCase):
"extra_specs": {
"driver_handles_share_servers": False,
"snapshot_support": True,
"create_share_from_snapshot_support": True,
"revert_to_snapshot_support": False,
"mount_snapshot_support": expected_bool,
}
@ -1901,7 +1886,7 @@ class ShellTest(test_utils.TestCase):
def test_quota_update(self, cmd, expected_body):
self.run_command('quota-update 1234 %s' % cmd)
expected = {'quota_set': expected_body}
expected = {'quota_set': dict(expected_body, tenant_id='1234')}
self.assert_called('PUT', '/quota-sets/1234', body=expected)
@ddt.data(
@ -2046,7 +2031,7 @@ class ShellTest(test_utils.TestCase):
expected = {
'share_group': {
'name': 'fake_sg',
'description': 'my_sg',
'description': 'my_group',
'availability_zone': 'fake_az',
'share_group_type_id': '2345',
'share_network_id': '3456',
@ -2620,12 +2605,12 @@ class ShellTest(test_utils.TestCase):
expected = {'migration_start': {
'host': 'host@backend#pool',
'force_host_assisted_migration': 'True',
'preserve-metadata': 'False',
'preserve_metadata': 'False',
'writable': 'False',
'nondisruptive': 'True',
'preserve_snapshots': 'True',
'new_share_network_id': '1111',
'new_share_type_id': '1'
'new_share_network_id': 1111,
'new_share_type_id': 1,
}}
self.assert_called('POST', '/shares/1234/action', body=expected)