mirror of
https://github.com/prometheus/prometheus
synced 2024-12-24 23:42:32 +00:00
Replaced test validations with testutils on storage/remote/codec_test.go (#6097)
* Replaced test validations with testutils on storage/remote/codec_test.go Signed-off-by: George Felix <george.felix@ubeeqo.com> * gofmt Signed-off-by: George Felix <george.felix@ubeeqo.com> * Removed shouldPass assertion Signed-off-by: George Felix <gfelixc@gmail.com> * Fixes to improve readability Signed-off-by: George Felix <george.felix@ubeeqo.com> * Fixes based on code review comments Signed-off-by: George Felix <george.felix@ubeeqo.com>
This commit is contained in:
parent
16f1e252f4
commit
895abbb7d0
@ -27,7 +27,6 @@ func TestValidateLabelsAndMetricName(t *testing.T) {
|
||||
tests := []struct {
|
||||
input labels.Labels
|
||||
expectedErr string
|
||||
shouldPass bool
|
||||
description string
|
||||
}{
|
||||
{
|
||||
@ -36,7 +35,6 @@ func TestValidateLabelsAndMetricName(t *testing.T) {
|
||||
"labelName", "labelValue",
|
||||
),
|
||||
expectedErr: "",
|
||||
shouldPass: true,
|
||||
description: "regular labels",
|
||||
},
|
||||
{
|
||||
@ -45,7 +43,6 @@ func TestValidateLabelsAndMetricName(t *testing.T) {
|
||||
"_labelName", "labelValue",
|
||||
),
|
||||
expectedErr: "",
|
||||
shouldPass: true,
|
||||
description: "label name with _",
|
||||
},
|
||||
{
|
||||
@ -54,7 +51,6 @@ func TestValidateLabelsAndMetricName(t *testing.T) {
|
||||
"@labelName", "labelValue",
|
||||
),
|
||||
expectedErr: "invalid label name: @labelName",
|
||||
shouldPass: false,
|
||||
description: "label name with @",
|
||||
},
|
||||
{
|
||||
@ -63,7 +59,6 @@ func TestValidateLabelsAndMetricName(t *testing.T) {
|
||||
"123labelName", "labelValue",
|
||||
),
|
||||
expectedErr: "invalid label name: 123labelName",
|
||||
shouldPass: false,
|
||||
description: "label name starts with numbers",
|
||||
},
|
||||
{
|
||||
@ -72,7 +67,6 @@ func TestValidateLabelsAndMetricName(t *testing.T) {
|
||||
"", "labelValue",
|
||||
),
|
||||
expectedErr: "invalid label name: ",
|
||||
shouldPass: false,
|
||||
description: "label name is empty string",
|
||||
},
|
||||
{
|
||||
@ -81,7 +75,6 @@ func TestValidateLabelsAndMetricName(t *testing.T) {
|
||||
"labelName", string([]byte{0xff}),
|
||||
),
|
||||
expectedErr: "invalid label value: " + string([]byte{0xff}),
|
||||
shouldPass: false,
|
||||
description: "label value is an invalid UTF-8 value",
|
||||
},
|
||||
{
|
||||
@ -89,7 +82,6 @@ func TestValidateLabelsAndMetricName(t *testing.T) {
|
||||
"__name__", "@invalid_name",
|
||||
),
|
||||
expectedErr: "invalid metric name: @invalid_name",
|
||||
shouldPass: false,
|
||||
description: "metric name starts with @",
|
||||
},
|
||||
{
|
||||
@ -98,7 +90,6 @@ func TestValidateLabelsAndMetricName(t *testing.T) {
|
||||
"__name__", "name2",
|
||||
),
|
||||
expectedErr: "duplicate label with name: __name__",
|
||||
shouldPass: false,
|
||||
description: "duplicate label names",
|
||||
},
|
||||
{
|
||||
@ -107,7 +98,6 @@ func TestValidateLabelsAndMetricName(t *testing.T) {
|
||||
"label2", "name",
|
||||
),
|
||||
expectedErr: "",
|
||||
shouldPass: true,
|
||||
description: "duplicate label values",
|
||||
},
|
||||
{
|
||||
@ -116,7 +106,6 @@ func TestValidateLabelsAndMetricName(t *testing.T) {
|
||||
"label2", "name",
|
||||
),
|
||||
expectedErr: "invalid label name: ",
|
||||
shouldPass: false,
|
||||
description: "don't report as duplicate label name",
|
||||
},
|
||||
}
|
||||
@ -124,16 +113,11 @@ func TestValidateLabelsAndMetricName(t *testing.T) {
|
||||
for _, test := range tests {
|
||||
t.Run(test.description, func(t *testing.T) {
|
||||
err := validateLabelsAndMetricName(test.input)
|
||||
if err == nil {
|
||||
if !test.shouldPass {
|
||||
t.Fatalf("Test should fail, but passed instead.")
|
||||
}
|
||||
if test.expectedErr != "" {
|
||||
testutil.NotOk(t, err)
|
||||
testutil.Equals(t, test.expectedErr, err.Error())
|
||||
} else {
|
||||
if test.shouldPass {
|
||||
t.Fatalf("Test should pass, got unexpected error: %v", err)
|
||||
} else if err.Error() != test.expectedErr {
|
||||
t.Fatalf("Test should fail with: %s got unexpected error instead: %v", test.expectedErr, err)
|
||||
}
|
||||
testutil.Ok(t, err)
|
||||
}
|
||||
})
|
||||
}
|
||||
@ -151,21 +135,11 @@ func TestConcreteSeriesSet(t *testing.T) {
|
||||
c := &concreteSeriesSet{
|
||||
series: []storage.Series{series1, series2},
|
||||
}
|
||||
if !c.Next() {
|
||||
t.Fatalf("Expected Next() to be true.")
|
||||
}
|
||||
if c.At() != series1 {
|
||||
t.Fatalf("Unexpected series returned.")
|
||||
}
|
||||
if !c.Next() {
|
||||
t.Fatalf("Expected Next() to be true.")
|
||||
}
|
||||
if c.At() != series2 {
|
||||
t.Fatalf("Unexpected series returned.")
|
||||
}
|
||||
if c.Next() {
|
||||
t.Fatalf("Expected Next() to be false.")
|
||||
}
|
||||
testutil.Assert(t, c.Next(), "Expected Next() to be true.")
|
||||
testutil.Equals(t, series1, c.At(), "Unexpected series returned.")
|
||||
testutil.Assert(t, c.Next(), "Expected Next() to be true.")
|
||||
testutil.Equals(t, series2, c.At(), "Unexpected series returned.")
|
||||
testutil.Assert(t, !c.Next(), "Expected Next() to be false.")
|
||||
}
|
||||
|
||||
func TestConcreteSeriesClonesLabels(t *testing.T) {
|
||||
|
Loading…
Reference in New Issue
Block a user