Skip to content

Commit ab5c8c1

Browse files
committed
fix: assert debug log output in issue comment skip test
Signed-off-by: majiayu000 <1835304752@qq.com>
1 parent 6851693 commit ab5c8c1

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

pkg/provider/github/parse_payload_test.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010

1111
"github.com/google/go-github/v84/github"
1212
"github.com/jonboulle/clockwork"
13+
"go.uber.org/zap"
14+
zapobserver "go.uber.org/zap/zaptest/observer"
1315
"gotest.tools/v3/assert"
1416
"gotest.tools/v3/env"
1517
corev1 "k8s.io/api/core/v1"
@@ -462,6 +464,7 @@ func TestParsePayLoad(t *testing.T) {
462464
objectType string
463465
gitopscommentprefix string
464466
wantRepoCRError bool
467+
wantLogSnippet string
465468
}{
466469
{
467470
name: "bad/unknown event",
@@ -750,6 +753,7 @@ func TestParsePayLoad(t *testing.T) {
750753
eventType: "issue_comment",
751754
triggerTarget: "pull_request",
752755
githubClient: true,
756+
wantLogSnippet: "only newly created comment is supported",
753757
},
754758
{
755759
name: "good/issue comment",
@@ -1397,11 +1401,12 @@ func TestParsePayLoad(t *testing.T) {
13971401
}
13981402

13991403
stdata, _ := testclient.SeedTestData(t, ctx, tdata)
1400-
logger, _ := logger.GetLogger()
1404+
observer, logCatcher := zapobserver.New(zap.DebugLevel)
1405+
fakelogger := zap.New(observer).Sugar()
14011406
run := &params.Run{
14021407
Clients: clients.Clients{
14031408
PipelineAsCode: stdata.PipelineAsCode,
1404-
Log: logger,
1409+
Log: fakelogger,
14051410
Kube: stdata.Kube,
14061411
},
14071412
}
@@ -1484,7 +1489,7 @@ func TestParsePayLoad(t *testing.T) {
14841489

14851490
gprovider := Provider{
14861491
ghClient: ghClient,
1487-
Logger: logger,
1492+
Logger: fakelogger,
14881493
pacInfo: &info.PacOpts{
14891494
Settings: settings.Settings{SkipPushEventForPRCommits: tt.skipPushEventForPRCommits},
14901495
},
@@ -1503,6 +1508,10 @@ func TestParsePayLoad(t *testing.T) {
15031508
return
15041509
}
15051510
assert.NilError(t, err)
1511+
if tt.wantLogSnippet != "" {
1512+
assert.Assert(t, logCatcher.FilterMessageSnippet(tt.wantLogSnippet).Len() > 0,
1513+
"expected debug log containing %q but got none", tt.wantLogSnippet)
1514+
}
15061515
// If shaRet is empty, this is a skip case (push event for PR commit)
15071516
// In this case, ret should be nil
15081517
if tt.shaRet == "" {

0 commit comments

Comments
 (0)