Merge branch 'id-sshd-test-3' into 'main'

Extract server config related code out of sshd.go

Closes #523

See merge request gitlab-org/gitlab-shell!523

1 files changed, 9 insertions, 7 deletions

diff --git a/internal/sshd/sshd_test.go b/internal/sshd/sshd_test.go
index cba1c3f..71f7733 100644
--- a/internal/sshd/sshd_test.go
+++ b/internal/sshd/sshd_test.go
@@ -104,13 +104,6 @@ func TestLivenessProbe(t *testing.T) {
 	require.Equal(t, 200, r.Result().StatusCode)
 }
 
-func TestNewServerWithoutHosts(t *testing.T) {
-	_, err := NewServer(&config.Config{GitlabUrl: "http://localhost"})
-
-	require.Error(t, err)
-	require.Equal(t, "No host keys could be loaded, aborting", err.Error())
-}
-
 func TestInvalidClientConfig(t *testing.T) {
 	setupServer(t)
 
@@ -120,6 +113,15 @@ func TestInvalidClientConfig(t *testing.T) {
 	require.Error(t, err)
 }
 
+func TestInvalidServerConfig(t *testing.T) {
+	s := &Server{Config: &config.Config{Server: config.ServerConfig{Listen: "invalid"}}}
+	err := s.ListenAndServe(context.Background())
+
+	require.Error(t, err)
+	require.Equal(t, "failed to listen for connection: listen tcp: address invalid: missing port in address", err.Error())
+	require.Nil(t, s.Shutdown())
+}
+
 func setupServer(t *testing.T) *Server {
 	t.Helper()