Skip to content
Snippets Groups Projects
Commit e14b27bb authored by Nick Thomas's avatar Nick Thomas Committed by GitLab Release Tools Bot
Browse files

Merge branch 'sh-fix-detect-host-keys' into 'master'

Fix Detect Host Keys not working

Closes #56855

See merge request gitlab-org/gitlab-ce!24884

(cherry picked from commit 2b0f4df0)

4c1231ac Fix SSH Detect Host Keys not working
parent f8671e4c
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -54,7 +54,7 @@ class SshHostKey
 
# Needed for reactive caching
def self.primary_key
'id'
:id
end
 
def id
Loading
Loading
---
title: Fix Detect Host Keys not working
merge_request: 24884
author:
type: fixed
Loading
Loading
@@ -50,6 +50,12 @@ describe SshHostKey do
 
subject(:ssh_host_key) { described_class.new(project: project, url: 'ssh://example.com:2222', compare_host_keys: compare_host_keys) }
 
describe '.primary_key' do
it 'returns a symbol' do
expect(described_class.primary_key).to eq(:id)
end
end
describe '#fingerprints', :use_clean_rails_memory_store_caching do
it 'returns an array of indexed fingerprints when the cache is filled' do
stub_reactive_cache(ssh_host_key, known_hosts: known_hosts)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment