From 3d3d8296c490caa4d1f3a0607818a9c2af752233 Mon Sep 17 00:00:00 2001 From: Stuart McLaren Date: Mon, 14 Sep 2015 17:27:43 +0000 Subject: [PATCH] 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 --- glanceclient/common/utils.py | 4 +++- glanceclient/tests/unit/test_utils.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/glanceclient/common/utils.py b/glanceclient/common/utils.py index 42e45539..49fb40ed 100644 --- a/glanceclient/common/utils.py +++ b/glanceclient/common/utils.py @@ -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 diff --git a/glanceclient/tests/unit/test_utils.py b/glanceclient/tests/unit/test_utils.py index eb7f53e5..7e01edee 100644 --- a/glanceclient/tests/unit/test_utils.py +++ b/glanceclient/tests/unit/test_utils.py @@ -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