cloud-init-dev team mailing list archive

[Joshua Powers <josh.powers@xxxxxxxxxxxxx>]

Joshua Powers has proposed merging ~powersj/cloud-init:fix_ssh_import_id into cloud-init:master.

Commit message:
Tests: Simplify the check on ssh-import-id

I want to be able to add additional SSH keys to my account, therefore I
should not be limiting these tests to look for one specific key. Instead
confirm that the comment in authorized_users has the specified users.

Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~powersj/cloud-init/+git/cloud-init/+merge/326323

Test sucessfully with:

python3 -m tests.cloud_tests run --os-name xenial --preserve-data --data-dir results --verbose -t modules/ssh_import_id --deb cloud-init_0.7.9-194-gecb408af-1~bddeb_all.deb

python3 -m tests.cloud_tests run --os-name artful --preserve-data --data-dir results --verbose -t modules/ssh_import_id --deb cloud-init_0.7.9-194-gecb408af-1~bddeb_all.deb
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~powersj/cloud-init:fix_ssh_import_id into cloud-init:master.

diff --git a/tests/cloud_tests/testcases/modules/ssh_import_id.py b/tests/cloud_tests/testcases/modules/ssh_import_id.py
index 055c6a2..ef156f4 100644
--- a/tests/cloud_tests/testcases/modules/ssh_import_id.py
+++ b/tests/cloud_tests/testcases/modules/ssh_import_id.py
@@ -11,16 +11,7 @@ class TestSshImportId(base.CloudTestCase):
         """Test that ssh keys were imported."""
         out = self.get_data_file('auth_keys_ubuntu')
 
-        # Rather than checking the key fingerprints, you could just check
-        # the ending comment for where it got imported from in case these
-        # change in the future :\
-        self.assertIn('8sXGTYYw3iQSkOvDUUlIsqdaO+w== powersj@github/'
-                      '18564351 # ssh-import-id gh:powersj', out)
-        self.assertIn('Hj29SCmXp5Kt5/82cD/VN3NtHw== smoser@brickies-'
-                      'canonical # ssh-import-id lp:smoser', out)
-        self.assertIn('7cUDQSXbabilgnzTjHo9mjd/kZ7cLOHP smoser@bart-'
-                      'canonical # ssh-import-id lp:smoser', out)
-        self.assertIn('aX0VHGXvHAQlPl4n7+FzAE1UmWFYEGrsSoNvLv3 smose'
-                      'r@kaypeah # ssh-import-id lp:smoser', out)
+        self.assertIn('# ssh-import-id gh:powersj', out)
+        self.assertIn('# ssh-import-id lp:smoser', out)
 
 # vi: ts=4 expandtab