Merge lp:~oddbloke/cloud-init/ssh-equals into lp:~cloud-init-dev/cloud-init/trunk

[Dan Watkins]

[lp:~oddbloke/cloud-init/ssh-equals]

1035. By Dan Watkins on 2014-11-13

Use test_helpers.TestCase for test_sshutil tests.

As requested by harlowja.

[Dan Watkins (oddbloke)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 13/11/14 09:44, Joshua Harlow wrote:
>> === modified file 'tests/unittests/test_sshutil.py' ---
>> tests/unittests/test_sshutil.py 2013-03-07 19:54:25 +0000 +++
>> tests/unittests/test_sshutil.py 2014-11-12 14:02:22 +0000 @@ -1,5
>> +1,8 @@ +from unittest import TestCase
>
> Can u use
> http://bazaar.launchpad.net/~cloud-init-dev/cloud-init/trunk/view/head:/tests/unittests/helpers.py#L37
> as the base class instead. This ensures that various functions that
> aren't on py26 actually work (or work good enough). Thanks.

Done and pushed.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBAgAGBQJUZInfAAoJEO7mh3btsT6gZ10P/3i9a3OpwmQWwzVhuqLb8JLO
hS8OKWYIAT3bpMg9gsVDlY7i+65mxh62Yy6z/im6mlI1ZVggcVplZBjNJjYIbLFu
zzDRBh2OSMki4NNqSIv70m79FYyhNhP1hzibWD9yc2N2XmLc8rEz+DvK/ra5Q9FZ
f3n06YddpXgttVhyGtrAAeHMmki5215B4xfFTyLyK6WDnq7S+lke66M9AQxJBuMO
tvy9XtK0fPOH3G0XRo3Qh9IxqIciI/VEKLcTvaPIHZyF52RKB1QN8bvDWOZZ4aZ/
UPF+zDUbSGtbX26ASqpyB1opEXwf2n2gXaJqo+8XEczyyR8V5Rej7LlIhW+fpY7U
L1iOEUk7pF8wHFJBRPKDPy2jLclnR4wjt1WYujik8rPCgKTdaPUBQZsXNqW12iue
Pg9ZpuI8y8G5WnCx4UJGcp0jZ435oKb6B7Yb/9AhahhWZvGiYvLL7sZltxUQpz16
UN+Dv446YwnIZxxyVAzWaSJJKSuwYtFTAPH6Ekfw099IgR3WmqtMvedvw/Br+SZm
ePZ3R/Ncnb65pi3ZxYo6zQeNaKjwmXt5yulspVaXkRCLBp/LgMdzN0AGrrYaTWEn
JrRQs/mMHUj/NL9UHmghzRILQzA1uJFOOzJSwA0gEqL8TrcDIueff4YLZ5w79E60
KYYBDzrkLftL6ch8zZQA
=k8vE
-----END PGP SIGNATURE-----

=== modified file 'cloudinit/ssh_util.py'
--- cloudinit/ssh_util.py	2013-06-19 06:44:00 +0000
+++ cloudinit/ssh_util.py	2014-11-13 10:36:24 +0000
@@ -293,7 +293,10 @@
         if not line or line.startswith("#"):
             lines.append(SshdConfigLine(line))
             continue
-        (key, val) = line.split(None, 1)
+        try:
+            key, val = line.split(None, 1)
+        except ValueError:
+            key, val = line.split('=', 1)
         lines.append(SshdConfigLine(line, key, val))
     return lines
 
 
=== modified file 'test-requirements.txt'
--- test-requirements.txt	2014-08-26 18:53:44 +0000
+++ test-requirements.txt	2014-11-13 10:36:24 +0000
@@ -1,4 +1,5 @@
 httpretty>=0.7.1
+mock
 mocker
 nose
 pep8==1.5.7
 
=== modified file 'tests/unittests/test_sshutil.py'
--- tests/unittests/test_sshutil.py	2013-03-07 19:54:25 +0000
+++ tests/unittests/test_sshutil.py	2014-11-13 10:36:24 +0000
@@ -1,5 +1,7 @@
+from mock import patch
+
+from . import helpers as test_helpers
 from cloudinit import ssh_util
-from unittest import TestCase
 
 
 VALID_CONTENT = {
@@ -35,7 +37,7 @@
     'user \"root\".\';echo;sleep 10"')
 
 
-class TestAuthKeyLineParser(TestCase):
+class TestAuthKeyLineParser(test_helpers.TestCase):
     def test_simple_parse(self):
         # test key line with common 3 fields (keytype, base64, comment)
         parser = ssh_util.AuthKeyLineParser()
@@ -98,4 +100,71 @@
         self.assertFalse(key.valid())
 
 
+class TestParseSSHConfig(test_helpers.TestCase):
+
+    def setUp(self):
+        self.load_file_patch = patch('cloudinit.ssh_util.util.load_file')
+        self.load_file = self.load_file_patch.start()
+        self.isfile_patch = patch('cloudinit.ssh_util.os.path.isfile')
+        self.isfile = self.isfile_patch.start()
+        self.isfile.return_value = True
+
+    def tearDown(self):
+        self.load_file_patch.stop()
+        self.isfile_patch.stop()
+
+    def test_not_a_file(self):
+        self.isfile.return_value = False
+        self.load_file.side_effect = IOError
+        ret = ssh_util.parse_ssh_config('not a real file')
+        self.assertEqual([], ret)
+
+    def test_empty_file(self):
+        self.load_file.return_value = ''
+        ret = ssh_util.parse_ssh_config('some real file')
+        self.assertEqual([], ret)
+
+    def test_comment_line(self):
+        comment_line = '# This is a comment'
+        self.load_file.return_value = comment_line
+        ret = ssh_util.parse_ssh_config('some real file')
+        self.assertEqual(1, len(ret))
+        self.assertEqual(comment_line, ret[0].line)
+
+    def test_blank_lines(self):
+        lines = ['', '\t', ' ']
+        self.load_file.return_value = '\n'.join(lines)
+        ret = ssh_util.parse_ssh_config('some real file')
+        self.assertEqual(len(lines), len(ret))
+        for line in ret:
+            self.assertEqual('', line.line)
+
+    def test_lower_case_config(self):
+        self.load_file.return_value = 'foo bar'
+        ret = ssh_util.parse_ssh_config('some real file')
+        self.assertEqual(1, len(ret))
+        self.assertEqual('foo', ret[0].key)
+        self.assertEqual('bar', ret[0].value)
+
+    def test_upper_case_config(self):
+        self.load_file.return_value = 'Foo Bar'
+        ret = ssh_util.parse_ssh_config('some real file')
+        self.assertEqual(1, len(ret))
+        self.assertEqual('foo', ret[0].key)
+        self.assertEqual('Bar', ret[0].value)
+
+    def test_lower_case_with_equals(self):
+        self.load_file.return_value = 'foo=bar'
+        ret = ssh_util.parse_ssh_config('some real file')
+        self.assertEqual(1, len(ret))
+        self.assertEqual('foo', ret[0].key)
+        self.assertEqual('bar', ret[0].value)
+
+    def test_upper_case_with_equals(self):
+        self.load_file.return_value = 'Foo=bar'
+        ret = ssh_util.parse_ssh_config('some real file')
+        self.assertEqual(1, len(ret))
+        self.assertEqual('foo', ret[0].key)
+        self.assertEqual('bar', ret[0].value)
+
 # vi: ts=4 expandtab