diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2021-01-19 12:23:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 12:23:23 -0500 |
| commit | cdc5b81f33aee0ed3ef1ae239e5cec1906d0178a (patch) | |
| tree | 983963846c5a0b6b40af13d8b9c16fe4f5d5f148 /tests/unittests | |
| parent | 11630044d235e0c6e1ffd2b12ff8906613ccdac6 (diff) | |
| download | vyos-cloud-init-cdc5b81f33aee0ed3ef1ae239e5cec1906d0178a.tar.gz vyos-cloud-init-cdc5b81f33aee0ed3ef1ae239e5cec1906d0178a.zip | |
Revert "ssh_util: handle non-default AuthorizedKeysFile config (#586)" (#775)
This reverts commit b0e73814db4027dba0b7dc0282e295b7f653325c.
Diffstat (limited to 'tests/unittests')
| -rw-r--r-- | tests/unittests/test_sshutil.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/unittests/test_sshutil.py b/tests/unittests/test_sshutil.py index 88a111e3..fd1d1bac 100644 --- a/tests/unittests/test_sshutil.py +++ b/tests/unittests/test_sshutil.py @@ -593,7 +593,7 @@ class TestMultipleSshAuthorizedKeysFile(test_helpers.CiTestCase): fpw.pw_name, sshd_config) content = ssh_util.update_authorized_keys(auth_key_entries, []) - self.assertEqual(authorized_keys, auth_key_fn) + self.assertEqual("%s/.ssh/authorized_keys" % fpw.pw_dir, auth_key_fn) self.assertTrue(VALID_CONTENT['rsa'] in content) self.assertTrue(VALID_CONTENT['dsa'] in content) @@ -610,7 +610,7 @@ class TestMultipleSshAuthorizedKeysFile(test_helpers.CiTestCase): sshd_config = self.tmp_path('sshd_config') util.write_file( sshd_config, - "AuthorizedKeysFile %s %s" % (user_keys, authorized_keys) + "AuthorizedKeysFile %s %s" % (authorized_keys, user_keys) ) (auth_key_fn, auth_key_entries) = ssh_util.extract_authorized_keys( @@ -618,7 +618,7 @@ class TestMultipleSshAuthorizedKeysFile(test_helpers.CiTestCase): ) content = ssh_util.update_authorized_keys(auth_key_entries, []) - self.assertEqual(user_keys, auth_key_fn) + self.assertEqual("%s/.ssh/authorized_keys" % fpw.pw_dir, auth_key_fn) self.assertTrue(VALID_CONTENT['rsa'] in content) self.assertTrue(VALID_CONTENT['dsa'] in content) |