openstack/python-swiftclient
Code Issues Proposed changes

Added check for negative segment-size

Browse Source 
Closes-Bug: #1453135

Change-Id: Ia9c2b27d998e6ac1889cc74c12e456c06ecd84d9
This commit is contained in:
Pradeep Kumar Singh 2015-06-23 10:48:50 +09:00
parent 7c716997a8
commit e596489020
2 changed files with 26 additions and 0 deletions
swiftclient
shell.py
tests/unit
test_shell.py

3
swiftclient/shell.py

@ -763,6 +763,9 @@ def st_upload(parser, args, output_manager):
return
options.segment_size = str((1024 ** size_mod) * multiplier)
if int(options.segment_size) <= 0:
output_manager.error("segment-size should be positive")
return
_opts = vars(options)
_opts['object_uu_threads'] = options.object_threads

23
tests/unit/test_shell.py

@ -897,6 +897,29 @@ class TestShell(unittest.TestCase):
swiftclient.shell.main(argv)
self.assertEquals(output.err, "Invalid segment size\n")
def test_negative_upload_segment_size(self):
with CaptureOutput() as output:
with ExpectedException(SystemExit):
argv = ["", "upload", "-S", "-40", "container", "object"]
swiftclient.shell.main(argv)
self.assertEquals(output.err, "segment-size should be positive\n")
output.clear()
with ExpectedException(SystemExit):
argv = ["", "upload", "-S", "-40K", "container", "object"]
swiftclient.shell.main(argv)
self.assertEquals(output.err, "segment-size should be positive\n")
output.clear()
with ExpectedException(SystemExit):
argv = ["", "upload", "-S", "-40M", "container", "object"]
swiftclient.shell.main(argv)
self.assertEquals(output.err, "segment-size should be positive\n")
output.clear()
with ExpectedException(SystemExit):
argv = ["", "upload", "-S", "-40G", "container", "object"]
swiftclient.shell.main(argv)
self.assertEquals(output.err, "segment-size should be positive\n")
output.clear()
class TestSubcommandHelp(unittest.TestCase):