openstack
/
python-glanceclient
Code Issues Proposed changes

Fix human readable when size is None 

If an image size is null don't stack trace when listing.

Change-Id: Iba18470edbe032d1d01380372d57fa17adef5f7e
Closes-bug: 1495632
(cherry picked from commit 3d3d8296c4)
This commit is contained in:
Stuart McLaren 2015-09-14 17:27:43 +00:00 committed by Flavio Percoco
parent 76a91c9fbc
commit e895e1a6b1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glanceclient/common/utils.py
View File

@ -306,8 +306,10 @@ def save_image(data, path):
def make_size_human_readable(size):
suffix = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB']
base = 1024.0
index = 0
if size is None:
size = 0
while size >= base:
index = index + 1
size = size / base

1
glanceclient/tests/unit/test_utils.py
View File

@ -33,6 +33,7 @@ class TestUtils(testtools.TestCase):
self.assertEqual("1MB", utils.make_size_human_readable(1048576))
self.assertEqual("1.4GB", utils.make_size_human_readable(1476395008))
self.assertEqual("9.3MB", utils.make_size_human_readable(9761280))
self.assertEqual("0B", utils.make_size_human_readable(None))
def test_get_new_file_size(self):
size = 98304