Use same time range as indicated by the issue report

grafana · Jun 1, 2018 · 2fcb744 · 2fcb744
1 parent 5e76195
commit 2fcb744
Showing 1 changed file with 21 additions and 26 deletions.
diff --git a/expr/func_summarize_test.go b/expr/func_summarize_test.go
@@ -669,35 +669,30 @@ func TestSummarizeLargeIntervalTimestamps(t *testing.T) {
 
 	// This test is specifically testing the timestamp behavior, so we don't need real values.
 	// However, we do need a lot of datapoints to trigger the bug we are regression testing against.
-	interval1Day := uint32(24 * 60 * 60)
-	numTimestamps := uint32(2000)
+	inputInterval := uint32(3600)
+	numTimestamps := uint32(89 * 24)
 	startTime := uint32(1464637518)
-	endTime := startTime + numTimestamps*interval1Day
+	endTime := startTime + numTimestamps*inputInterval
 
 	inputDps := make([]schema.Point, 0, numTimestamps)
 
 	for i := uint32(0); i < numTimestamps; i++ {
-		inputDps = append(inputDps, schema.Point{Val: 0, Ts: startTime + i*interval1Day})
+		inputDps = append(inputDps, schema.Point{Val: 0, Ts: startTime + i*inputInterval})
 	}
 
-	outputInterval := 365 * interval1Day
+	outputInterval := uint32(30 * 24 * 60 * 60)
 
-	var unaligned365dsum = []schema.Point{
-		{Val: 0, Ts: 1450656000},
-		{Val: 0, Ts: 1482192000},
-		{Val: 0, Ts: 1513728000},
-		{Val: 0, Ts: 1545264000},
-		{Val: 0, Ts: 1576800000},
-		{Val: 0, Ts: 1608336000},
+	var unalignedExpected = []schema.Point{
+		{Val: 0, Ts: 1464480000},
+		{Val: 0, Ts: 1467072000},
+		{Val: 0, Ts: 1469664000},
+		{Val: 0, Ts: 1472256000},
 	}
 
-	var aligned365dsum = []schema.Point{
+	var alignedExpected = []schema.Point{
 		{Val: 0, Ts: 1464637518},
-		{Val: 0, Ts: 1496173518},
-		{Val: 0, Ts: 1527709518},
-		{Val: 0, Ts: 1559245518},
-		{Val: 0, Ts: 1590781518},
-		{Val: 0, Ts: 1622317518},
+		{Val: 0, Ts: 1467229518},
+		{Val: 0, Ts: 1469821518},
 	}
 
 	input := []models.Series{
@@ -713,28 +708,28 @@ func TestSummarizeLargeIntervalTimestamps(t *testing.T) {
 	outputSum := [][]models.Series{
 		{
 			{
-				Target:     "summarize(align, \"365d\", \"sum\")",
-				QueryPatt:  "summarize(align, \"365d\", \"sum\")",
+				Target:     "summarize(align, \"30d\", \"sum\")",
+				QueryPatt:  "summarize(align, \"30d\", \"sum\")",
 				QueryFrom:  startTime,
 				QueryTo:    endTime,
 				Interval:   outputInterval,
-				Datapoints: getCopy(unaligned365dsum),
+				Datapoints: getCopy(unalignedExpected),
 			},
 		},
 		{
 			{
-				Target:     "summarize(align, \"365d\", \"sum\", true)",
-				QueryPatt:  "summarize(align, \"365d\", \"sum\", true)",
+				Target:     "summarize(align, \"30d\", \"sum\", true)",
+				QueryPatt:  "summarize(align, \"30d\", \"sum\", true)",
 				QueryFrom:  startTime,
 				QueryTo:    endTime,
 				Interval:   outputInterval,
-				Datapoints: getCopy(aligned365dsum),
+				Datapoints: getCopy(alignedExpected),
 			},
 		},
 	}
 
-	testSummarize("LongIntervals", input, outputSum[0], "365d", "sum", false, t)
-	testSummarize("LongIntervals", input, outputSum[1], "365d", "sum", true, t)
+	testSummarize("LongIntervals", input, outputSum[0], "30d", "sum", false, t)
+	testSummarize("LongIntervals", input, outputSum[1], "30d", "sum", true, t)
 }
 
 func testSummarize(name string, in []models.Series, out []models.Series, intervalString, fn string, alignToFrom bool, t *testing.T) {