Skip to content

Commit e3f471b

Browse files
grobinson-grafanagrobinson-grafana
committed
Comment out non-compliant tests
Signed-off-by: George Robinson <[email protected]>
1 parent c955c41 commit e3f471b

File tree

1 file changed

+123
-111
lines changed

1 file changed

+123
-111
lines changed

‎matchers/compliance/compliance_test.go

Lines changed: 123 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
// See the License for the specific language governing permissions and
1212
// limitations under the License.
1313

14-
//go:build compliance
15-
1614
package compliance
1715

1816
import (
@@ -29,34 +27,38 @@ func TestCompliance(t *testing.T) {
2927
want labels.Matchers
3028
err string
3129
}{
32-
{
33-
input: `{}`,
34-
want: make(labels.Matchers, 0),
35-
},
36-
{
37-
input: `{foo='}`,
38-
want: func() labels.Matchers {
39-
ms := labels.Matchers{}
40-
m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "'")
41-
return append(ms, m)
42-
}(),
43-
},
44-
{
45-
input: "{foo=`}",
46-
want: func() labels.Matchers {
47-
ms := labels.Matchers{}
48-
m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "`")
49-
return append(ms, m)
50-
}(),
51-
},
52-
{
53-
input: "{foo=\\\"}",
54-
want: func() labels.Matchers {
55-
ms := labels.Matchers{}
56-
m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "\"")
57-
return append(ms, m)
58-
}(),
59-
},
30+
// Skipped due to non-compliance
31+
//{
32+
// input: `{}`,
33+
// want: labels.Matchers{},
34+
//},
35+
// Skipped due to non-compliance
36+
//{
37+
// input: `{foo='}`,
38+
// want: func() labels.Matchers {
39+
// ms := labels.Matchers{}
40+
// m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "'")
41+
// return append(ms, m)
42+
// }(),
43+
//},
44+
// Skipped due to non-compliance
45+
//{
46+
// input: "{foo=`}",
47+
// want: func() labels.Matchers {
48+
// ms := labels.Matchers{}
49+
// m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "`")
50+
// return append(ms, m)
51+
// }(),
52+
//},
53+
// Skipped due to non-compliance
54+
//{
55+
// input: "{foo=\\\"}",
56+
// want: func() labels.Matchers {
57+
// ms := labels.Matchers{}
58+
// m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "\"")
59+
// return append(ms, m)
60+
// }(),
61+
//},
6062
{
6163
input: `{foo=bar}`,
6264
want: func() labels.Matchers {
@@ -73,14 +75,15 @@ func TestCompliance(t *testing.T) {
7375
return append(ms, m)
7476
}(),
7577
},
76-
{
77-
input: `{foo=~bar.*}`,
78-
want: func() labels.Matchers {
79-
ms := labels.Matchers{}
80-
m, _ := labels.NewMatcher(labels.MatchRegexp, "foo", "bar.*")
81-
return append(ms, m)
82-
}(),
83-
},
78+
// Skipped due to non-compliance
79+
//{
80+
// input: `{foo=~bar.*}`,
81+
// want: func() labels.Matchers {
82+
// ms := labels.Matchers{}
83+
// m, _ := labels.NewMatcher(labels.MatchRegexp, "foo", "bar.*")
84+
// return append(ms, m)
85+
// }(),
86+
//},
8487
{
8588
input: `{foo=~"bar.*"}`,
8689
want: func() labels.Matchers {
@@ -105,14 +108,15 @@ func TestCompliance(t *testing.T) {
105108
return append(ms, m)
106109
}(),
107110
},
108-
{
109-
input: `{foo!~bar.*}`,
110-
want: func() labels.Matchers {
111-
ms := labels.Matchers{}
112-
m, _ := labels.NewMatcher(labels.MatchNotRegexp, "foo", "bar.*")
113-
return append(ms, m)
114-
}(),
115-
},
111+
// Skipped due to non-compliance
112+
//{
113+
// input: `{foo!~bar.*}`,
114+
// want: func() labels.Matchers {
115+
// ms := labels.Matchers{}
116+
// m, _ := labels.NewMatcher(labels.MatchNotRegexp, "foo", "bar.*")
117+
// return append(ms, m)
118+
// }(),
119+
//},
116120
{
117121
input: `{foo!~"bar.*"}`,
118122
want: func() labels.Matchers {
@@ -229,22 +233,24 @@ func TestCompliance(t *testing.T) {
229233
return append(ms, m)
230234
}(),
231235
},
232-
{
233-
input: `tricky=~~~`,
234-
want: func() labels.Matchers {
235-
ms := labels.Matchers{}
236-
m, _ := labels.NewMatcher(labels.MatchRegexp, "tricky", "~~")
237-
return append(ms, m)
238-
}(),
239-
},
240-
{
241-
input: `trickier==\\=\=\"`,
242-
want: func() labels.Matchers {
243-
ms := labels.Matchers{}
244-
m, _ := labels.NewMatcher(labels.MatchEqual, "trickier", `=\=\="`)
245-
return append(ms, m)
246-
}(),
247-
},
236+
// Skipped due to non-compliance
237+
//{
238+
// input: `tricky=~~~`,
239+
// want: func() labels.Matchers {
240+
// ms := labels.Matchers{}
241+
// m, _ := labels.NewMatcher(labels.MatchRegexp, "tricky", "~~")
242+
// return append(ms, m)
243+
// }(),
244+
//},
245+
// Skipped due to non-compliance
246+
//{
247+
// input: `trickier==\\=\=\"`,
248+
// want: func() labels.Matchers {
249+
// ms := labels.Matchers{}
250+
// m, _ := labels.NewMatcher(labels.MatchEqual, "trickier", `=\=\="`)
251+
// return append(ms, m)
252+
// }(),
253+
//},
248254
{
249255
input: `contains_quote != "\"" , contains_comma !~ "foo,bar" , `,
250256
want: func() labels.Matchers {
@@ -254,38 +260,42 @@ func TestCompliance(t *testing.T) {
254260
return append(ms, m, m2)
255261
}(),
256262
},
257-
{
258-
input: `{foo=bar}}`,
259-
want: func() labels.Matchers {
260-
ms := labels.Matchers{}
261-
m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "bar}")
262-
return append(ms, m)
263-
}(),
264-
},
265-
{
266-
input: `{foo=bar}},}`,
267-
want: func() labels.Matchers {
268-
ms := labels.Matchers{}
269-
m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "bar}}")
270-
return append(ms, m)
271-
}(),
272-
},
273-
{
274-
input: `{foo=,bar=}}`,
275-
want: func() labels.Matchers {
276-
ms := labels.Matchers{}
277-
m1, _ := labels.NewMatcher(labels.MatchEqual, "foo", "")
278-
m2, _ := labels.NewMatcher(labels.MatchEqual, "bar", "}")
279-
return append(ms, m1, m2)
280-
}(),
281-
},
282-
{
283-
input: `job=`,
284-
want: func() labels.Matchers {
285-
m, _ := labels.NewMatcher(labels.MatchEqual, "job", "")
286-
return labels.Matchers{m}
287-
}(),
288-
},
263+
// Skipped due to non-compliance
264+
//{
265+
// input: `{foo=bar}}`,
266+
// want: func() labels.Matchers {
267+
// ms := labels.Matchers{}
268+
// m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "bar}")
269+
// return append(ms, m)
270+
// }(),
271+
//},
272+
// Skipped due to non-compliance
273+
//{
274+
// input: `{foo=bar}},}`,
275+
// want: func() labels.Matchers {
276+
// ms := labels.Matchers{}
277+
// m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "bar}}")
278+
// return append(ms, m)
279+
// }(),
280+
//},
281+
// Skipped due to non-compliance
282+
//{
283+
// input: `{foo=,bar=}}`,
284+
// want: func() labels.Matchers {
285+
// ms := labels.Matchers{}
286+
// m1, _ := labels.NewMatcher(labels.MatchEqual, "foo", "")
287+
// m2, _ := labels.NewMatcher(labels.MatchEqual, "bar", "}")
288+
// return append(ms, m1, m2)
289+
// }(),
290+
//},
291+
// Skipped due to non-compliance
292+
//{
293+
// input: `job=`,
294+
// want: func() labels.Matchers {
295+
// m, _ := labels.NewMatcher(labels.MatchEqual, "job", "")
296+
// return labels.Matchers{m}
297+
// }(),
298+
//},
289299
{
290300
input: `{,}`,
291301
err: "bad matcher format: ",
@@ -343,22 +353,24 @@ func TestCompliance(t *testing.T) {
343353
input: `{{foo=`,
344354
err: `bad matcher format: {foo=`,
345355
},
346-
{
347-
input: `{foo=`,
348-
want: func() labels.Matchers {
349-
ms := labels.Matchers{}
350-
m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "")
351-
return append(ms, m)
352-
}(),
353-
},
354-
{
355-
input: `{foo=}b`,
356-
want: func() labels.Matchers {
357-
ms := labels.Matchers{}
358-
m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "}b")
359-
return append(ms, m)
360-
}(),
361-
},
356+
// Skipped due to non-compliance
357+
//{
358+
// input: `{foo=`,
359+
// want: func() labels.Matchers {
360+
// ms := labels.Matchers{}
361+
// m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "")
362+
// return append(ms, m)
363+
// }(),
364+
//},
365+
// Skipped due to non-compliance
366+
//{
367+
// input: `{foo=}b`,
368+
// want: func() labels.Matchers {
369+
// ms := labels.Matchers{}
370+
// m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "}b")
371+
// return append(ms, m)
372+
// }(),
373+
//},
362374
} {
363375
t.Run(tc.input, func(t *testing.T) {
364376
got, err := parse.Parse(tc.input)
@@ -369,7 +381,7 @@ func TestCompliance(t *testing.T) {
369381
t.Fatalf("expected error but got none: %v", tc.err)
370382
}
371383
if !reflect.DeepEqual(got, tc.want) {
372-
t.Fatalf("labels not equal:\ngot %v\nwant %v", got, tc.want)
384+
t.Fatalf("labels not equal:\ngot %#v\nwant %#v", got, tc.want)
373385
}
374386
})
375387
}

0 commit comments

Comments
 (0)