Merge lp:~gnuoy/charms/trusty/nova-compute/unit_test_update into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Liam Young]

[James Page (james-page)]

review: Approve

=== modified file 'unit_tests/test_nova_compute_utils.py'
--- unit_tests/test_nova_compute_utils.py	2014-06-24 13:44:41 +0000
+++ unit_tests/test_nova_compute_utils.py	2014-11-28 10:22:59 +0000
@@ -192,7 +192,9 @@
             self.assertFalse(_open.called)
 
     @patch('pwd.getpwnam')
-    def _test_import_authorized_keys_base(self, getpwnam, prefix=None):
+    def _test_import_authorized_keys_base(self, getpwnam, prefix=None,
+                                          auth_key_path='/home/foo/.ssh/'
+                                                        'authorized_keys'):
         getpwnam.return_value = self.fake_user('foo')
         self.relation_get.side_effect = [
             3,          # relation_get('known_hosts_max_index')
@@ -207,77 +209,44 @@
 
         ex_open = [
             call('/home/foo/.ssh/known_hosts', 'wb'),
-            call('/home/foo/.ssh/authorized_keys', 'wb')
-        ]
-        ex_write = [
-            call('k_h_0\n'),
-            call('k_h_1\n'),
-            call('k_h_2\n'),
-            call('auth_0\n'),
-            call('auth_1\n'),
-            call('auth_2\n')
-        ]
-
-        with patch_open() as (_open, _file):
-            utils.import_authorized_keys(user='foo')
-            self.assertEquals(ex_open, _open.call_args_list)
-            self.assertEquals(ex_write, _file.write.call_args_list)
-            expected_relations = [
-                call('known_hosts_max_index'),
-                call('known_hosts_0'),
-                call('known_hosts_1'),
-                call('known_hosts_2'),
-                call('authorized_keys_max_index'),
-                call('authorized_keys_0'),
-                call('authorized_keys_1'),
-                call('authorized_keys_2')
-                ]
-            self.assertEquals(sorted(self.relation_get.call_args_list),
-                              sorted(expected_relations))
-
-    @patch('pwd.getpwnam')
-    def test_import_authorized_keys_prefix(self, getpwnam):
-        getpwnam.return_value = self.fake_user('foo')
-        self.relation_get.side_effect = [
-            3,          # relation_get('bar_known_hosts_max_index')
-            'k_h_0',    # relation_get_('bar_known_hosts_0')
-            'k_h_1',    # relation_get_('bar_known_hosts_1')
-            'k_h_2',    # relation_get_('bar_known_hosts_2')
-            3,          # relation_get('bar_authorized_keys_max_index')
-            'auth_0',   # relation_get('bar_authorized_keys_0')
-            'auth_1',   # relation_get('bar_authorized_keys_1')
-            'auth_2',   # relation_get('bar_authorized_keys_2')
-        ]
-
-        ex_open = [
-            call('/home/foo/.ssh/known_hosts', 'wb'),
-            call('/home/foo/.ssh/authorized_keys', 'wb')
-        ]
-        ex_write = [
-            call('k_h_0\n'),
-            call('k_h_1\n'),
-            call('k_h_2\n'),
-            call('auth_0\n'),
-            call('auth_1\n'),
-            call('auth_2\n')
-        ]
-
-        with patch_open() as (_open, _file):
-            utils.import_authorized_keys(user='foo', prefix='bar')
-            self.assertEquals(ex_open, _open.call_args_list)
-            self.assertEquals(ex_write, _file.write.call_args_list)
-            expected_relations = [
-                call('bar_known_hosts_max_index'),
-                call('bar_known_hosts_0'),
-                call('bar_known_hosts_1'),
-                call('bar_known_hosts_2'),
-                call('bar_authorized_keys_max_index'),
-                call('bar_authorized_keys_0'),
-                call('bar_authorized_keys_1'),
-                call('bar_authorized_keys_2')
-                ]
-            self.assertEquals(sorted(self.relation_get.call_args_list),
-                              sorted(expected_relations))
+            call(auth_key_path, 'wb')
+        ]
+        ex_write = [
+            call('k_h_0\n'),
+            call('k_h_1\n'),
+            call('k_h_2\n'),
+            call('auth_0\n'),
+            call('auth_1\n'),
+            call('auth_2\n')
+        ]
+
+        with patch_open() as (_open, _file):
+            utils.import_authorized_keys(user='foo', prefix=prefix)
+            self.assertEquals(ex_open, _open.call_args_list)
+            self.assertEquals(ex_write, _file.write.call_args_list)
+            authkey_root = 'authorized_keys_'
+            known_hosts_root = 'known_hosts_'
+            if prefix:
+                authkey_root = prefix + '_authorized_keys_'
+                known_hosts_root = prefix + '_known_hosts_'
+            expected_relations = [
+                call(known_hosts_root + 'max_index'),
+                call(known_hosts_root + '0'),
+                call(known_hosts_root + '1'),
+                call(known_hosts_root + '2'),
+                call(authkey_root + 'max_index'),
+                call(authkey_root + '0'),
+                call(authkey_root + '1'),
+                call(authkey_root + '2')
+                ]
+            self.assertEquals(sorted(self.relation_get.call_args_list),
+                              sorted(expected_relations))
+
+    def test_import_authorized_keys_noprefix(self):
+        self._test_import_authorized_keys_base()
+
+    def test_import_authorized_keys_prefix(self):
+        self._test_import_authorized_keys_base(prefix='bar')
 
     @patch('subprocess.check_call')
     def test_import_keystone_cert_missing_data(self, check_call):