fix to tests

VKCOM · Jan 12, 2025 · 1707ce1 · 1707ce1
1 parent a0be3b8
commit 1707ce1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/internal/metajournal/journal.go b/internal/metajournal/journal.go
@@ -301,7 +301,9 @@ func (ms *Journal) updateJournal(aggLog AggLog) error {
 
 	if len(newJournal) > 0 {
 		lastEntry := newJournal[len(newJournal)-1]
-		log.Printf("Version updated from '%d' to '%d', last entity updated is %s, journal hash is '%s'", oldVersion, lastEntry.Version, lastEntry.Name, stateHash)
+		// TODO - remove this printf in tests
+		log.Printf("Version updated from '%d' to '%d', last entity updated is %s, journal hash is '%s'",
+			oldVersion, lastEntry.Version, lastEntry.Name, stateHash)
 		if aggLog != nil {
 			aggLog("journal_update", "", "ok",
 				strconv.FormatInt(oldVersion, 10),

diff --git a/internal/metajournal/meta_metrics_test.go b/internal/metajournal/meta_metrics_test.go
@@ -379,10 +379,11 @@ func TestMetricsStorage(t *testing.T) {
 	// actually 1 test, but grouped by small test case (need to run together)
 	t.Run("updateJournal test(each other depends on previous)", func(t *testing.T) {
 		descrField := "__description"
-		metric := format.BuiltinMetrics[format.BuiltinMetricIDAPIBRS]
+		metric := *format.BuiltinMetrics[format.BuiltinMetricIDAPIBRS]
 		metric.MetricID = metricID
 		metric.Name = "test_metric"
 		metric.GroupID = 0
+		metric.BuiltinAllowedToReceive = false // this field is not restored by RestoreCachedInfo
 		_ = metric.RestoreCachedInfo()
 		metricBytes, err := metric.MarshalBinary()
 		require.NoError(t, err)
@@ -423,8 +424,8 @@ func TestMetricsStorage(t *testing.T) {
 
 			require.Len(t, m.metricsByID, 1)
 			require.Len(t, m.metricsByName, 1)
-			require.Equal(t, *metric, *m.metricsByID[metric.MetricID])
-			require.Equal(t, *metric, *m.metricsByName[metric.Name])
+			require.Equal(t, metric, *m.metricsByID[metric.MetricID])
+			require.Equal(t, metric, *m.metricsByName[metric.Name])
 		})
 
 		t.Run("edit metric", func(t *testing.T) {
@@ -452,8 +453,8 @@ func TestMetricsStorage(t *testing.T) {
 
 			require.Len(t, m.metricsByID, 1)
 			require.Len(t, m.metricsByName, 1)
-			require.Equal(t, *metric, *m.metricsByID[metric.MetricID])
-			require.Equal(t, *metric, *m.metricsByName[metric.Name])
+			require.Equal(t, metric, *m.metricsByID[metric.MetricID])
+			require.Equal(t, metric, *m.metricsByName[metric.Name])
 		})
 
 		t.Run("rename metric", func(t *testing.T) {
@@ -482,8 +483,8 @@ func TestMetricsStorage(t *testing.T) {
 
 			require.Len(t, m.metricsByID, 1)
 			require.Len(t, m.metricsByName, 1)
-			require.Equal(t, *metric, *m.metricsByID[metric.MetricID])
-			require.Equal(t, *metric, *m.metricsByName[metric.Name])
+			require.Equal(t, metric, *m.metricsByID[metric.MetricID])
+			require.Equal(t, metric, *m.metricsByName[metric.Name])
 		})
 
 		t.Run("create dashboard", func(t *testing.T) {
@@ -669,7 +670,7 @@ func TestMetricsStorage(t *testing.T) {
 		})
 		t.Run("metric created (check new metric in group)", func(t *testing.T) {
 			var id int32 = 65463
-			metricCopy := *metric
+			metricCopy := metric
 			metricCopy.Version = incVersion()
 			metricCopy.MetricID = id
 			metricCopy.Name = group1.Name + "_metric5"