Skip to content

Commit b7879cc

Browse files
fix(log testing): fix logs
Signed-off-by: ivan katliarchuk <[email protected]>
1 parent 66009e7 commit b7879cc

File tree

3 files changed

+3
-18
lines changed

3 files changed

+3
-18
lines changed

internal/testutils/log.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ package testutils
1818

1919
import (
2020
"bytes"
21-
"flag"
2221
"testing"
2322

2423
log "github.com/sirupsen/logrus"
25-
"k8s.io/klog/v2"
2624
)
2725

2826
// LogsToBuffer redirects log(s) output to a buffer for testing purposes
@@ -38,12 +36,5 @@ func LogsToBuffer(level log.Level, t *testing.T) *bytes.Buffer {
3836
buf := new(bytes.Buffer)
3937
log.SetOutput(buf)
4038
log.SetLevel(level)
41-
klog.SetOutput(buf)
42-
flags := &flag.FlagSet{}
43-
klog.InitFlags(flags)
44-
// make sure klog doesn't write to stderr by default in tests
45-
_ = flags.Set("logtostderr", "false")
46-
_ = flags.Set("alsologtostderr", "false")
47-
_ = flags.Set("stderrthreshold", "4")
4839
return buf
4940
}

source/gateway_httproute_test.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package source
1818

1919
import (
20-
"bytes"
2120
"context"
2221
"testing"
2322

@@ -1506,10 +1505,8 @@ func TestGatewayHTTPRouteSourceEndpoints(t *testing.T) {
15061505
src, err := NewGatewayHTTPRouteSource(clients, &tt.config)
15071506
require.NoError(t, err, "failed to create Gateway HTTPRoute Source")
15081507

1509-
var b *bytes.Buffer
1510-
if len(tt.logExpectations) > 0 {
1511-
b = testutils.LogsToBuffer(log.DebugLevel, t)
1512-
}
1508+
b := testutils.LogsToBuffer(log.DebugLevel, t)
1509+
15131510
endpoints, err := src.Endpoints(ctx)
15141511
require.NoError(t, err, "failed to get Endpoints")
15151512
validateEndpoints(t, endpoints, tt.endpoints)

source/node_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -394,10 +394,7 @@ func testNodeSourceEndpoints(t *testing.T) {
394394
} {
395395
tc := tc
396396
t.Run(tc.title, func(t *testing.T) {
397-
var buf *bytes.Buffer
398-
if len(tc.expectedLogs) != 0 || len(tc.expectedAbsentLogs) != 0 {
399-
buf = testutils.LogsToBuffer(log.DebugLevel, t)
400-
}
397+
buf := testutils.LogsToBuffer(log.DebugLevel, t)
401398

402399
labelSelector := labels.Everything()
403400
if tc.labelSelector != "" {

0 commit comments

Comments
 (0)