Update tests

grafana · Jun 9, 2022 · 4036b14 · 4036b14
1 parent 5d634ba
commit 4036b14
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/pkg/usagestats/reporter_test.go b/pkg/usagestats/reporter_test.go
@@ -21,15 +21,17 @@ func Test_LeaderElection(t *testing.T) {
 	stabilityCheckInterval = 100 * time.Millisecond
 
 	result := make(chan *ClusterSeed, 10)
-	objectClient, err := local.NewFSObjectClient(local.FSConfig{
-		Directory: t.TempDir(),
+
+	objectClient, err := local.NewBackend(&local.Config{
+		Path: t.TempDir(),
 	})
 	require.NoError(t, err)
+
 	for i := 0; i < 3; i++ {
 		go func() {
 			r, err := NewReporter(Config{Leader: true, Enabled: true}, kv.Config{
 				Store: "inmemory",
-			}, objectClient, log.NewLogfmtLogger(os.Stdout), nil)
+			}, objectClient, objectClient, log.NewLogfmtLogger(os.Stdout), nil)
 			require.NoError(t, err)
 			r.init(context.Background())
 			result <- r.cluster
@@ -39,7 +41,7 @@ func Test_LeaderElection(t *testing.T) {
 		go func() {
 			r, err := NewReporter(Config{Leader: false, Enabled: true}, kv.Config{
 				Store: "inmemory",
-			}, objectClient, log.NewLogfmtLogger(os.Stdout), nil)
+			}, objectClient, objectClient, log.NewLogfmtLogger(os.Stdout), nil)
 			require.NoError(t, err)
 			r.init(context.Background())
 			result <- r.cluster
@@ -81,14 +83,15 @@ func Test_ReportLoop(t *testing.T) {
 	}))
 	usageStatsURL = server.URL
 
-	objectClient, err := local.NewFSObjectClient(local.FSConfig{
-		Directory: t.TempDir(),
+	objectClient, err := local.NewBackend(&local.Config{
+		Path: t.TempDir(),
 	})
+
 	require.NoError(t, err)
 
 	r, err := NewReporter(Config{Leader: true, Enabled: true}, kv.Config{
 		Store: "inmemory",
-	}, objectClient, log.NewLogfmtLogger(os.Stdout), prometheus.NewPedanticRegistry())
+	}, objectClient, objectClient, log.NewLogfmtLogger(os.Stdout), prometheus.NewPedanticRegistry())
 	require.NoError(t, err)
 	ctx, cancel := context.WithCancel(context.Background())
 	r.initLeader(ctx)
@@ -142,14 +145,14 @@ func Test_NextReport(t *testing.T) {
 }
 
 func TestWrongKV(t *testing.T) {
-	objectClient, err := local.NewFSObjectClient(local.FSConfig{
-		Directory: t.TempDir(),
+	objectClient, err := local.NewBackend(&local.Config{
+		Path: t.TempDir(),
 	})
 	require.NoError(t, err)
 
 	r, err := NewReporter(Config{Leader: true, Enabled: true}, kv.Config{
 		Store: "",
-	}, objectClient, log.NewLogfmtLogger(os.Stdout), prometheus.NewPedanticRegistry())
+	}, objectClient, objectClient, log.NewLogfmtLogger(os.Stdout), prometheus.NewPedanticRegistry())
 	require.NoError(t, err)
 	ctx, cancel := context.WithCancel(context.Background())
 	go func() {

diff --git a/pkg/usagestats/seed_test.go b/pkg/usagestats/seed_test.go
@@ -82,7 +82,7 @@ func Test_Memberlist(t *testing.T) {
 						return createMemberlist(t, initMKV.GetListeningPort(), i), nil
 					},
 				},
-			}, objectClient, log.NewLogfmtLogger(os.Stdout), nil)
+			}, objectClient, objectClient, log.NewLogfmtLogger(os.Stdout), nil)
 			require.NoError(t, err)
 			leader.init(context.Background())
 			result <- leader.cluster

diff --git a/pkg/usagestats/stats_test.go b/pkg/usagestats/stats_test.go
@@ -46,7 +46,7 @@ func Test_BuildReport(t *testing.T) {
 	r := buildReport(seed, now.Add(time.Hour))
 	require.Equal(t, r.Arch, runtime.GOARCH)
 	require.Equal(t, r.Os, runtime.GOOS)
-	require.Equal(t, r.PrometheusVersion, build.Version)
+	require.Equal(t, r.PrometheusVersion, build.GetVersion())
 	require.Equal(t, r.Edition, "OSS")
 	require.Equal(t, r.Target, "compactor")
 	require.Equal(t, r.Metrics["num_cpu"], runtime.NumCPU())