openstack/horizon
Code Issues Proposed changes

Merge "unite the property of usage test"

Browse Source
This commit is contained in:
Jenkins 2015-03-09 05:32:08 +00:00 committed by Gerrit Code Review
commit c9172c578d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack_dashboard/dashboards/admin/overview/tests.py
View File

@ -115,10 +115,10 @@ class UsageViewTests(test.BaseAdminViewTests):
<td class="sortable normal_column">%.2f</td> <td class="sortable normal_column">%.2f</td>
</tr> </tr>
''' % (usage_list[0].vcpus, ''' % (usage_list[0].vcpus,
sizeformat.diskgbformat(usage_list[0].disk_gb_hours), sizeformat.diskgbformat(usage_list[0].local_gb),
sizeformat.mb_float_format(usage_list[0].memory_mb), sizeformat.mb_float_format(usage_list[0].memory_mb),
usage_list[0].vcpu_hours, usage_list[0].vcpu_hours,
usage_list[0].total_local_gb_usage, usage_list[0].disk_gb_hours,
usage_list[0].memory_mb_hours) usage_list[0].memory_mb_hours)
) )
@ -134,10 +134,10 @@ class UsageViewTests(test.BaseAdminViewTests):
<td class="sortable normal_column">%.2f</td> <td class="sortable normal_column">%.2f</td>
</tr> </tr>
''' % (usage_list[1].vcpus, ''' % (usage_list[1].vcpus,
sizeformat.diskgbformat(usage_list[1].disk_gb_hours), sizeformat.diskgbformat(usage_list[1].local_gb),
sizeformat.mb_float_format(usage_list[1].memory_mb), sizeformat.mb_float_format(usage_list[1].memory_mb),
usage_list[1].vcpu_hours, usage_list[1].vcpu_hours,
usage_list[1].total_local_gb_usage, usage_list[1].disk_gb_hours,
usage_list[1].memory_mb_hours) usage_list[1].memory_mb_hours)
) )