Skip to content

Commit 9265787

Browse files
committed
Fix log checking for NGF for NGINX Plus - ignore usage report errors (those errors ask users to configure usage reporting, which we don't need for tests)
1 parent f1c1e41 commit 9265787

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

tests/suite/scale_test.go

+13-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,12 @@ var _ = Describe("Scale test", Ordered, Label("nfr", "scale"), func() {
190190
return buckets
191191
}
192192

193-
checkLogErrors := func(containerName string, substrings []string, fileName string) int {
193+
checkLogErrors := func(
194+
containerName string,
195+
substrings []string,
196+
ignoredSubstrings []string,
197+
fileName string,
198+
) int {
194199
logs, err := resourceManager.GetPodLogs(ngfNamespace, ngfPodName, &core.PodLogOptions{
195200
Container: containerName,
196201
})
@@ -201,6 +206,11 @@ var _ = Describe("Scale test", Ordered, Label("nfr", "scale"), func() {
201206

202207
outer:
203208
for _, line := range logLines {
209+
for _, substr := range ignoredSubstrings {
210+
if strings.Contains(line, substr) {
211+
continue outer
212+
}
213+
}
204214
for _, substr := range substrings {
205215
if strings.Contains(line, substr) {
206216
errors++
@@ -418,11 +428,13 @@ var _ = Describe("Scale test", Ordered, Label("nfr", "scale"), func() {
418428
ngfErrors := checkLogErrors(
419429
"nginx-gateway",
420430
[]string{"error"},
431+
[]string{`"logger":"usageReporter`}, // ignore usageReporter errors
421432
filepath.Join(testResultsDir, framework.CreateResultsFilename("log", "ngf", *plusEnabled)),
422433
)
423434
nginxErrors := checkLogErrors(
424435
"nginx",
425436
[]string{"[error]", "[emerg]", "[crit]", "[alert]"},
437+
nil,
426438
filepath.Join(testResultsDir, framework.CreateResultsFilename("log", "nginx", *plusEnabled)),
427439
)
428440

0 commit comments

Comments
 (0)