openstack/python-swiftclient
Code Issues Proposed changes

Improve formatting for billions of objects

Browse Source 
Change-Id: If8aa08c4c8c8ad6ca2c861602baf1eefa8642a8a
This commit is contained in:
Tim Burke 2021-09-20 12:33:16 -07:00
parent bcf19d47a3
commit 553e34ebfe
2 changed files with 11 additions and 9 deletions
swiftclient
shell.py
test/unit
test_shell.py

4
swiftclient/shell.py

@ -552,7 +552,7 @@ def st_list(parser, args, output_manager, return_parser=False):
datestamp = '????-??-?? ??:??:??' datestamp = '????-??-?? ??:??:??'
if not options['totals']: if not options['totals']:
output_manager.print_msg( output_manager.print_msg(
"%5s %s %s %s", count, byte_str, "%12s %s %s %s", count, byte_str,
datestamp, item_name) datestamp, item_name)
else: # list container contents else: # list container contents
subdir = item.get('subdir') subdir = item.get('subdir')
@ -584,7 +584,7 @@ def st_list(parser, args, output_manager, return_parser=False):
if options['long'] or human: if options['long'] or human:
if not container: if not container:
output_manager.print_msg( output_manager.print_msg(
"%5s %s", prt_bytes(total_count, True), "%12s %s", prt_bytes(total_count, True),
prt_bytes(total_bytes, human)) prt_bytes(total_bytes, human))
else: else:
output_manager.print_msg( output_manager.print_msg(

16
test/unit/test_shell.py

@ -475,9 +475,10 @@ class TestShell(unittest.TestCase):
mock.call(marker='container', prefix=None, headers={})] mock.call(marker='container', prefix=None, headers={})]
connection.return_value.get_account.assert_has_calls(calls) connection.return_value.get_account.assert_has_calls(calls)
self.assertEqual(output.out, self.assertEqual(
' 0 0 1970-01-01 00:00:01 container\n' output.out,
' 0 0\n') ' 0 0 1970-01-01 00:00:01 container\n'
' 0 0\n')
# Now test again, this time without returning metadata # Now test again, this time without returning metadata
connection.return_value.head_container.return_value = {} connection.return_value.head_container.return_value = {}
@ -495,9 +496,10 @@ class TestShell(unittest.TestCase):
mock.call(marker='container', prefix=None, headers={})] mock.call(marker='container', prefix=None, headers={})]
connection.return_value.get_account.assert_has_calls(calls) connection.return_value.get_account.assert_has_calls(calls)
self.assertEqual(output.out, self.assertEqual(
' 0 0 ????-??-?? ??:??:?? container\n' output.out,
' 0 0\n') ' 0 0 ????-??-?? ??:??:?? container\n'
' 0 0\n')
def test_list_account_totals_error(self): def test_list_account_totals_error(self):
# No --lh provided: expect info message about incorrect --totals use # No --lh provided: expect info message about incorrect --totals use
@ -523,7 +525,7 @@ class TestShell(unittest.TestCase):
swiftclient.shell.main(argv) swiftclient.shell.main(argv)
calls = [mock.call(marker='', prefix=None, headers={})] calls = [mock.call(marker='', prefix=None, headers={})]
connection.return_value.get_account.assert_has_calls(calls) connection.return_value.get_account.assert_has_calls(calls)
self.assertEqual(output.out, ' 6 3\n') self.assertEqual(output.out, ' 6 3\n')
@mock.patch('swiftclient.service.Connection') @mock.patch('swiftclient.service.Connection')
def test_list_container(self, connection): def test_list_container(self, connection):