x/cloud-init
Code Issues Proposed changes

Fix running cloud-init with no arguments on Python 3.

Browse Source 
Change-Id: I4c1b27aa5a762fd2e9fbec7085c719060c60071c
This commit is contained in:
Daniel Watkins 2015-08-07 13:51:57 +01:00
parent cf4f35ddac
commit 833dbbb28c
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloudinit/shell.py
View File

@ -46,6 +46,8 @@ def main(args=sys.argv):
populate_parser(parser, COMMON_ARGS, SUBCOMMANDS)
parsed = parser.parse_args(args[1:])
if not hasattr(parsed, 'func'):
parser.error('too few arguments')
parsed.func(parsed)
return 0

19
cloudinit/tests/test_shell.py
View File

@ -3,8 +3,9 @@
#
# vi: ts=4 expandtab
import cloudinit.shell as shell
import six
import cloudinit.shell as shell
from cloudinit.tests import TestCase
from cloudinit.tests.util import mock
@ -29,3 +30,19 @@ class TestMain(TestCase):
shell.main(args=['cloud-init', 'version'])
write_arg = mock_out_write.write.call_args[0][0]
self.assertTrue(write_arg.startswith('cloud-init'))
@mock.patch('cloudinit.shell.sys.stderr', new_callable=six.StringIO)
def test_no_arguments_shows_usage(self, stderr):
self.assertRaises(SystemExit, shell.main, args=['cloud-init'])
self.assertIn('usage: cloud-init', stderr.getvalue())
@mock.patch('cloudinit.shell.sys.stderr', mock.MagicMock())
def test_no_arguments_exits_2(self):
exc = self.assertRaises(SystemExit, shell.main, args=['cloud-init'])
self.assertEqual(2, exc.code)
@mock.patch('cloudinit.shell.sys.stderr', new_callable=six.StringIO)
def test_no_arguments_shows_error_message(self, stderr):
self.assertRaises(SystemExit, shell.main, args=['cloud-init'])
self.assertIn('cloud-init: error: too few arguments',
stderr.getvalue())