summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Powers <josh.powers@canonical.com>2017-06-26 13:45:52 -0700
committerScott Moser <smoser@brickies.net>2017-06-27 16:29:04 -0400
commit10e5195e4a4459d1893801aa9fb486dc2973415d (patch)
tree976797f093bc953f927997511c00a77c24954477
parentf0529559f9688a397f59f041dc6362e91faf96b6 (diff)
downloadvyos-cloud-init-10e5195e4a4459d1893801aa9fb486dc2973415d.tar.gz
vyos-cloud-init-10e5195e4a4459d1893801aa9fb486dc2973415d.zip
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 we confirm that the comment in authorized_users has the specified users.
-rw-r--r--tests/cloud_tests/testcases/modules/ssh_import_id.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/tests/cloud_tests/testcases/modules/ssh_import_id.py b/tests/cloud_tests/testcases/modules/ssh_import_id.py
index 055c6a29..ef156f47 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