Fix tests

mtojek · mtojek · commit b8a969df3546 · 2023-10-12T13:14:04.000+02:00
diff --git a/enterprise/coderd/license/metricscollector_test.go b/enterprise/coderd/license/metricscollector_test.go
@@ -3,17 +3,14 @@ package license_test
 import (
 	"encoding/json"
 	"os"
-	"reflect"
 	"testing"
 
 	"github.com/aws/smithy-go/ptr"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/enterprise/coderd/license"
-	"github.com/coder/coder/v2/testutil"
 )
 
 func TestCollectLicenseMetrics(t *testing.T) {
@@ -39,9 +36,7 @@ func TestCollectLicenseMetrics(t *testing.T) {
 	})
 
 	// When
-	closeFunc, err := sut.Collect(ctx)
-	require.NoError(t, err)
-	t.Cleanup(closeFunc)
+	registry.Register(sut)
 
 	// Then
 	goldenFile, err := os.ReadFile("testdata/license-metrics.json")
@@ -52,26 +47,19 @@ func TestCollectLicenseMetrics(t *testing.T) {
 
 	collected := map[string]int{}
 
-	assert.Eventually(t, func() bool {
-		metrics, err := registry.Gather()
-		assert.NoError(t, err)
-
-		if len(metrics) < 1 {
-			return false
-		}
+	metrics, err := registry.Gather()
+	require.NoError(t, err)
 
-		for _, metric := range metrics {
-			switch metric.GetName() {
-			case "coderd_license_active_users", "coderd_license_user_limit":
-				for _, m := range metric.Metric {
-					collected[m.Label[0].GetName()+"="+m.Label[0].GetValue()+":"+metric.GetName()] = int(m.Gauge.GetValue())
-				}
-			default:
-				require.FailNowf(t, "unexpected metric collected", "metric: %s", metric.GetName())
+	for _, metric := range metrics {
+		switch metric.GetName() {
+		case "coderd_license_active_users", "coderd_license_limit_users", "coderd_license_user_limit_enabled":
+			for _, m := range metric.Metric {
+				collected[metric.GetName()] = int(m.Gauge.GetValue())
 			}
+		default:
+			require.FailNowf(t, "unexpected metric collected", "metric: %s", metric.GetName())
 		}
-		return reflect.DeepEqual(golden, collected)
-	}, testutil.WaitShort, testutil.IntervalFast)
+	}
 
-	assert.EqualValues(t, golden, collected)
+	require.EqualValues(t, golden, collected)
 }
diff --git a/enterprise/coderd/license/testdata/license-metrics.json b/enterprise/coderd/license/testdata/license-metrics.json
@@ -1,4 +1,5 @@
 {
-  "entitled=true:coderd_license_active_users": 4,
-  "entitled=true:coderd_license_user_limit": 7
+  "coderd_license_active_users": 4,
+  "coderd_license_limit_users": 7,
+  "coderd_license_user_limit_enabled": 1
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
`2`		`- "entitled=true:coderd_license_active_users": 4,`
`3`		`- "entitled=true:coderd_license_user_limit": 7`
	`2`	`+ "coderd_license_active_users": 4,`
	`3`	`+ "coderd_license_limit_users": 7,`
	`4`	`+ "coderd_license_user_limit_enabled": 1`
`4`	`5`	`}`