unit tests

mtojek · mtojek · commit 6ce2d00b264d · 2023-11-29T15:32:50.000+01:00
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -408,7 +408,7 @@ func New(options *Options) *API {
 
 	if options.HealthcheckFunc == nil {
 		options.HealthcheckFunc = func(ctx context.Context, apiKey string) *healthcheck.Report {
-			dismissedHealthchecks := loadDismissedHealthcheck(ctx, options.Database, options.Logger)
+			dismissedHealthchecks := loadDismissedHealthchecks(ctx, options.Database, options.Logger)
 			return healthcheck.Run(ctx, &healthcheck.ReportOptions{
 				Database: healthcheck.DatabaseReportOptions{
 					DB:        options.Database,
diff --git a/coderd/debug.go b/coderd/debug.go
@@ -8,13 +8,12 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/google/uuid"
 	"golang.org/x/exp/slices"
 	"golang.org/x/xerrors"
 
 	"cdr.dev/slog"
 
-	"github.com/google/uuid"
-
 	"github.com/coder/coder/v2/coderd/audit"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/healthcheck"
@@ -256,7 +255,7 @@ func validateHealthSettings(settings codersdk.HealthSettings) error {
 // @x-apidocgen {"skip": true}
 func _debugws(http.ResponseWriter, *http.Request) {} //nolint:unused
 
-func loadDismissedHealthcheck(ctx context.Context, db database.Store, logger slog.Logger) []string {
+func loadDismissedHealthchecks(ctx context.Context, db database.Store, logger slog.Logger) []string {
 	dismissedHealthchecks := []string{}
 	settingsJSON, err := db.GetHealthSettings(ctx)
 	if err == nil {
diff --git a/coderd/healthcheck/accessurl_test.go b/coderd/healthcheck/accessurl_test.go
@@ -109,6 +109,23 @@ func TestAccessURL(t *testing.T) {
 		require.NotNil(t, report.Error)
 		assert.Contains(t, *report.Error, expErr.Error())
 	})
+
+	t.Run("DismissedError", func(t *testing.T) {
+		t.Parallel()
+
+		var (
+			ctx, cancel = context.WithCancel(context.Background())
+			report      healthcheck.AccessURLReport
+		)
+		defer cancel()
+
+		report.Run(ctx, &healthcheck.AccessURLReportOptions{
+			Dismissed: true,
+		})
+
+		assert.True(t, report.Dismissed)
+		assert.Equal(t, health.SeverityError, report.Severity)
+	})
 }
 
 type roundTripFunc func(r *http.Request) (*http.Response, error)
diff --git a/coderd/healthcheck/database_test.go b/coderd/healthcheck/database_test.go
@@ -67,6 +67,26 @@ func TestDatabase(t *testing.T) {
 		assert.Contains(t, *report.Error, err.Error())
 	})
 
+	t.Run("DismissedError", func(t *testing.T) {
+		t.Parallel()
+
+		var (
+			ctx, cancel = context.WithTimeout(context.Background(), testutil.WaitShort)
+			report      = healthcheck.DatabaseReport{}
+			db          = dbmock.NewMockStore(gomock.NewController(t))
+			err         = xerrors.New("ping error")
+		)
+		defer cancel()
+
+		db.EXPECT().Ping(gomock.Any()).Return(time.Duration(0), err)
+
+		report.Run(ctx, &healthcheck.DatabaseReportOptions{DB: db, Dismissed: true})
+
+		assert.Equal(t, health.SeverityError, report.Severity)
+		assert.True(t, report.Dismissed)
+		require.NotNil(t, report.Error)
+	})
+
 	t.Run("Median", func(t *testing.T) {
 		t.Parallel()
 
diff --git a/coderd/healthcheck/derphealth/derp_test.go b/coderd/healthcheck/derphealth/derp_test.go
@@ -120,13 +120,15 @@ func TestDERP(t *testing.T) {
 						}},
 					},
 				}},
+				Dismissed: true, // Let's sneak an extra unit test
 			}
 		)
 
 		report.Run(ctx, opts)
 
 		assert.True(t, report.Healthy)
 		assert.Equal(t, health.SeverityWarning, report.Severity)
+		assert.True(t, report.Dismissed)
 		for _, region := range report.Regions {
 			assert.True(t, region.Healthy)
 			assert.True(t, region.NodeReports[0].Healthy)
diff --git a/coderd/healthcheck/websocket_test.go b/coderd/healthcheck/websocket_test.go
@@ -68,4 +68,22 @@ func TestWebsocket(t *testing.T) {
 		assert.Equal(t, wsReport.Body, "test error")
 		assert.Equal(t, wsReport.Code, http.StatusBadRequest)
 	})
+
+	t.Run("DismissedError", func(t *testing.T) {
+		t.Parallel()
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
+		defer cancel()
+
+		wsReport := healthcheck.WebsocketReport{}
+		wsReport.Run(ctx, &healthcheck.WebsocketReportOptions{
+			AccessURL: &url.URL{Host: "fake"},
+			Dismissed: true,
+		})
+
+		require.True(t, wsReport.Dismissed)
+		require.Equal(t, health.SeverityError, wsReport.Severity)
+		require.NotNil(t, wsReport.Error)
+		require.Equal(t, health.SeverityError, wsReport.Severity)
+	})
 }
diff --git a/coderd/healthcheck/workspaceproxy_test.go b/coderd/healthcheck/workspaceproxy_test.go
@@ -236,3 +236,15 @@ func fakeUpdateProxyHealth(err error) func(context.Context) error {
 		return err
 	}
 }
+
+func TestWorkspaceProxy_Dismissed(t *testing.T) {
+	t.Parallel()
+
+	var report healthcheck.WorkspaceProxyReport
+	report.Run(context.Background(), &healthcheck.WorkspaceProxyReportOptions{
+		Dismissed: true,
+	})
+
+	assert.True(t, report.Dismissed)
+	assert.Equal(t, health.SeverityOK, report.Severity)
+}

Original file line number	Diff line number	Diff line change
`@@ -120,13 +120,15 @@ func TestDERP(t *testing.T) {`
`120`	`120`	`}},`
`121`	`121`	`},`
`122`	`122`	`}},`
	`123`	`+ Dismissed: true, // Let's sneak an extra unit test`
`123`	`124`	`}`
`124`	`125`	`)`
`125`	`126`
`126`	`127`	`report.Run(ctx, opts)`
`127`	`128`
`128`	`129`	`assert.True(t, report.Healthy)`
`129`	`130`	`assert.Equal(t, health.SeverityWarning, report.Severity)`
	`131`	`+ assert.True(t, report.Dismissed)`
`130`	`132`	`for _, region := range report.Regions {`
`131`	`133`	`assert.True(t, region.Healthy)`
`132`	`134`	`assert.True(t, region.NodeReports[0].Healthy)`