openstack/fuel-qa
Code Issues Proposed changes

Merge "Revert fix for bug 1561687"

Browse Source
This commit is contained in:
Jenkins
2016-03-29 13:02:34 +00:00
committed by Gerrit Code Review
parent e968e7f7ee 8dc43aadea
commit a808b45b1f
1 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
fuelweb_test/tests/test_ha_one_controller.py
View File

@@ -676,10 +676,7 @@ class NodeDiskSizes(TestBasic):
for disk in node['meta']['disks']: for disk in node['meta']['disks']:
assert_equal(disk['size'], disk_size, 'Disk size') assert_equal(disk['size'], disk_size, 'Disk size')
# pylint: disable=round-builtin hdd_size = "{} TB HDD".format((disk_size * 3 / (10 ** 9)) / 1000)
hdd_size = "{} TB HDD".format(
round(((disk_size * 3 / (10 ** 9)) / 1000), 3))
# pylint: enable=round-builtin
notifications = self.fuel_web.client.get_notifications() notifications = self.fuel_web.client.get_notifications()
for node in nailgun_nodes: for node in nailgun_nodes:
# assert /api/notifications # assert /api/notifications
@@ -688,25 +685,13 @@ class NodeDiskSizes(TestBasic):
current_node = notification['node_id'] == node['id'] current_node = notification['node_id'] == node['id']
if current_node and discover and \ if current_node and discover and \
"discovered" in notification['message']: "discovered" in notification['message']:
assert_true( assert_true(hdd_size in notification['message'])
hdd_size in notification['message'],
'"{size}" not found in notification message '
'"{note}" for node {node} (hostname {host})!'.format(
size=hdd_size,
note=notification['message'],
node=node['name'],
host=node['hostname']
)
)
# assert disks # assert disks
disks = self.fuel_web.client.get_node_disks(node['id']) disks = self.fuel_web.client.get_node_disks(node['id'])
for disk in disks: for disk in disks:
assert_equal( assert_equal(disk['size'],
disk['size'], NODE_VOLUME_SIZE * 1024 - 500, NODE_VOLUME_SIZE * 1024 - 500, 'Disk size')
'Disk size {0} is not equals expected {1}'.format(
disk['size'], NODE_VOLUME_SIZE * 1024 - 500
))
@test(depends_on=[NodeMultipleInterfaces.deploy_node_multiple_interfaces], @test(depends_on=[NodeMultipleInterfaces.deploy_node_multiple_interfaces],
groups=["check_nodes_disks"]) groups=["check_nodes_disks"])