diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-07-13 16:55:16 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-07-14 23:21:01 +0200 |
| commit | 1efec8f5c790ea668e8ad4c72e9b7194d093fdfe (patch) | |
| tree | bd69310bfddacfc41f16144efaef365fdb5f1ac6 | |
| parent | 609fb51750f5938bd47f9b78c3d7d8fb435d069c (diff) | |
dashboard/app: say "issue" instead of "crash"
We've got several complains re using of word "crash" in all syzbot reports, e.g.:
https://groups.google.com/d/msg/syzkaller-bugs/8rFLFgQR9fo/HBYUXIRyBAAJ
https://groups.google.com/d/msg/syzkaller-bugs/3nlcT8Wn7hg/8Th16X3DBAAJ
Another suggested that "crash" is too hard for e.g. a LOCKDEP splat:
https://groups.google.com/d/msg/syzkaller/YzHLAU0dXpI/WOqq1ggBBQAJ
Another terminology complaint was regarding the following fact.
When we test a patch, we only detect if it still triggers _any_ issue
(not necessary the original one). Currently we way "still triggers crash"
(without any article, which is probably wrong from English perspective
anyway). We did not say "the", but people assumed that and complained.
Explicitly say "a".
Also replace all uses of "bug" with "issue" for consistency.
And use "final oops" instead of "final crash", which seems
to be standard terminology at least for Linux:
https://en.wikipedia.org/wiki/Linux_kernel_oops
| -rw-r--r-- | dashboard/app/bisect_test.go | 82 | ||||
| -rw-r--r-- | dashboard/app/email_test.go | 38 | ||||
| -rw-r--r-- | dashboard/app/jobs_test.go | 20 | ||||
| -rw-r--r-- | dashboard/app/mail_bisect_result.txt | 12 | ||||
| -rw-r--r-- | dashboard/app/mail_bug.txt | 18 | ||||
| -rw-r--r-- | dashboard/app/mail_test_result.txt | 6 |
6 files changed, 88 insertions, 88 deletions
diff --git a/dashboard/app/bisect_test.go b/dashboard/app/bisect_test.go index 42cf40131..31edbadf0 100644 --- a/dashboard/app/bisect_test.go +++ b/dashboard/app/bisect_test.go @@ -143,7 +143,7 @@ func TestBisectCause(t *testing.T) { c.expectEQ(msg.To, []string{"test@syzkaller.com"}) c.expectEQ(msg.Subject, crash2.Title) c.expectEQ(len(msg.Attachments), 0) - c.expectEQ(msg.Body, fmt.Sprintf(`syzbot has bisected this bug to: + c.expectEQ(msg.Body, fmt.Sprintf(`syzbot has bisected this issue to: commit 36e65cb4a0448942ec316b24d60446bbd5cc7827 Author: Author Kernelov <author@kernel.org> @@ -154,7 +154,7 @@ Date: Wed Feb 9 04:05:06 2000 +0000 bisection log: %[2]v start commit: 11111111 kernel_commit_title1 git tree: repo1 branch1 -final crash: %[3]v +final oops: %[3]v console output: %[4]v kernel config: %[5]v dashboard link: https://testapp.appspot.com/bug?extid=%[1]v @@ -196,7 +196,7 @@ For information about bisection process see: https://goo.gl/tpsmEJ#bisection c.expectEQ(msg.Subject, crash2.Title) c.expectEQ(msg.Body, fmt.Sprintf(`Hello, -syzbot found the following crash on: +syzbot found the following issue on: HEAD commit: 11111111 kernel_commit_title1 git tree: repo1 branch1 @@ -208,7 +208,7 @@ syz repro: %[4]v C reproducer: %[5]v CC: [author@kernel.org reviewer1@kernel.org reviewer2@kernel.org] -The bug was bisected to: +The issue was bisected to: commit 36e65cb4a0448942ec316b24d60446bbd5cc7827 Author: Author Kernelov <author@kernel.org> @@ -217,24 +217,24 @@ Date: Wed Feb 9 04:05:06 2000 +0000 kernel: add a bug bisection log: %[6]v -final crash: %[7]v +final oops: %[7]v console output: %[8]v -IMPORTANT: if you fix the bug, please add the following tag to the commit: +IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+%[1]v@testapp.appspotmail.com Fixes: 36e65cb4a044 ("kernel: add a bug") report2 --- -This bug is generated by a bot. It may contain errors. +This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. -syzbot will keep track of this bug report. See: +syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. For information about bisection process see: https://goo.gl/tpsmEJ#bisection -syzbot can test patches for this bug, for details see: +syzbot can test patches for this issue, for details see: https://goo.gl/tpsmEJ#testing-patches`, extBugID2, crashLogLink, kernelConfigLink, reproSyzLink, reproCLink, bisectLogLink, bisectCrashReportLink, bisectCrashLogLink)) @@ -301,7 +301,7 @@ https://goo.gl/tpsmEJ#testing-patches`, if i < 3 { c.expectTrue(strings.Contains(msg.Body, "Sending this report upstream.")) } else { - c.expectTrue(strings.Contains(msg.Body, "syzbot found the following crash on")) + c.expectTrue(strings.Contains(msg.Body, "syzbot found the following issue on")) } } } @@ -383,7 +383,7 @@ https://goo.gl/tpsmEJ#testing-patches`, // c.expectEQ(msg.To, []string{"test@syzkaller.com"}) c.expectEQ(msg.Subject, crash4.Title) c.expectEQ(len(msg.Attachments), 0) - c.expectEQ(msg.Body, fmt.Sprintf(`syzbot suspects this bug was fixed by commit: + c.expectEQ(msg.Body, fmt.Sprintf(`syzbot suspects this issue was fixed by commit: commit 46e65cb4a0448942ec316b24d60446bbd5cc7827 Author: Author Kernelov <author@kernel.org> @@ -394,13 +394,13 @@ Date: Wed Feb 9 04:05:06 2000 +0000 bisection log: %[2]v start commit: 11111111 kernel_commit_title1 git tree: repo1 branch1 -final crash: %[3]v +final oops: %[3]v console output: %[4]v kernel config: %[5]v dashboard link: https://testapp.appspot.com/bug?extid=%[1]v syz repro: %[6]v -If the result looks correct, please mark the bug fixed by replying with: +If the result looks correct, please mark the issue as fixed by replying with: #syz fix: kernel: add a fix @@ -504,7 +504,7 @@ For information about bisection process see: https://goo.gl/tpsmEJ#bisection }) c.expectEQ(msg.Body, fmt.Sprintf(`Hello, -syzbot found the following crash on: +syzbot found the following issue on: HEAD commit: 11111111 kernel_commit_title1 git tree: repo1 branch1 @@ -522,20 +522,20 @@ Bisection is inconclusive: the first bad commit could be any of: bisection log: %[6]v -IMPORTANT: if you fix the bug, please add the following tag to the commit: +IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+%[1]v@testapp.appspotmail.com report1 --- -This bug is generated by a bot. It may contain errors. +This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. -syzbot will keep track of this bug report. See: +syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. For information about bisection process see: https://goo.gl/tpsmEJ#bisection -syzbot can test patches for this bug, for details see: +syzbot can test patches for this issue, for details see: https://goo.gl/tpsmEJ#testing-patches`, extBugID2, crashLogLink, kernelConfigLink, reproSyzLink, reproCLink, bisectLogLink)) } @@ -594,7 +594,7 @@ func TestBisectWrong(t *testing.T) { c.expectOK(c.client2.JobDone(done)) if i == 0 { msg := c.pollEmailBug() - c.expectTrue(strings.Contains(msg.Body, "syzbot has bisected this bug to:")) + c.expectTrue(strings.Contains(msg.Body, "syzbot has bisected this issue to:")) } else { c.expectNoEmail() } @@ -624,7 +624,7 @@ func TestBisectWrong(t *testing.T) { c.expectOK(c.client2.JobDone(done)) if i == 0 { msg := c.pollEmailBug() - c.expectTrue(strings.Contains(msg.Body, "syzbot suspects this bug was fixed by commit:")) + c.expectTrue(strings.Contains(msg.Body, "syzbot suspects this issue was fixed by commit:")) } } { @@ -633,16 +633,16 @@ func TestBisectWrong(t *testing.T) { msg := c.pollEmailBug() c.expectTrue(strings.Contains(msg.Body, "Sending this report upstream")) msg = c.pollEmailBug() - c.expectTrue(strings.Contains(msg.Body, "syzbot found the following crash on:")) + c.expectTrue(strings.Contains(msg.Body, "syzbot found the following issue on:")) if i == 0 { - c.expectTrue(strings.Contains(msg.Body, "The bug was bisected to:")) + c.expectTrue(strings.Contains(msg.Body, "The issue was bisected to:")) c.expectEQ(msg.To, []string{ "bugs@syzkaller.com", "default@maintainers.com", "hacker@kernel.org", }) } else { - c.expectTrue(!strings.Contains(msg.Body, "The bug was bisected to:")) + c.expectTrue(!strings.Contains(msg.Body, "The issue was bisected to:")) c.expectEQ(msg.To, []string{ "bugs@syzkaller.com", "default@maintainers.com", @@ -694,12 +694,12 @@ func TestBisectCauseAncient(t *testing.T) { c.expectEQ(msg.To, []string{"test@syzkaller.com"}) c.expectEQ(msg.Subject, crash.Title) c.expectEQ(len(msg.Attachments), 0) - c.expectEQ(msg.Body, fmt.Sprintf(`Bisection is inconclusive: the bug happens on the oldest tested release. + c.expectEQ(msg.Body, fmt.Sprintf(`Bisection is inconclusive: the issue happens on the oldest tested release. bisection log: %[2]v oldest commit: 11111111 kernel_commit_title1 git tree: repo1 branch1 -final crash: %[3]v +final oops: %[3]v console output: %[4]v kernel config: %[5]v dashboard link: https://testapp.appspot.com/bug?extid=%[1]v @@ -723,7 +723,7 @@ For information about bisection process see: https://goo.gl/tpsmEJ#bisection }) c.expectEQ(msg.Body, fmt.Sprintf(`Hello, -syzbot found the following crash on: +syzbot found the following issue on: HEAD commit: 11111111 kernel_commit_title1 git tree: repo1 branch1 @@ -734,26 +734,26 @@ compiler: compiler1 syz repro: %[4]v C reproducer: %[5]v -Bisection is inconclusive: the bug happens on the oldest tested release. +Bisection is inconclusive: the issue happens on the oldest tested release. bisection log: %[6]v -final crash: %[7]v +final oops: %[7]v console output: %[8]v -IMPORTANT: if you fix the bug, please add the following tag to the commit: +IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+%[1]v@testapp.appspotmail.com report1 --- -This bug is generated by a bot. It may contain errors. +This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. -syzbot will keep track of this bug report. See: +syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. For information about bisection process see: https://goo.gl/tpsmEJ#bisection -syzbot can test patches for this bug, for details see: +syzbot can test patches for this issue, for details see: https://goo.gl/tpsmEJ#testing-patches`, extBugID2, crashLogLink, kernelConfigLink, reproSyzLink, reproCLink, bisectLogLink, bisectCrashReportLink, bisectCrashLogLink)) @@ -881,7 +881,7 @@ func TestBisectCauseReproSyz(t *testing.T) { c.client2.ReportCrash(crash) msg := c.client2.pollEmailBug() - if !strings.Contains(msg.Body, "syzbot found the following crash") { + if !strings.Contains(msg.Body, "syzbot found the following issue") { t.Fatalf("wrong email header:\n%v", msg.Body) } if !strings.Contains(msg.Body, "Bisection is inconclusive") { @@ -912,7 +912,7 @@ func TestBisectCauseReproSyz2(t *testing.T) { c.expectOK(c.client2.JobDone(done)) msg := c.client2.pollEmailBug() - if !strings.Contains(msg.Body, "syzbot found the following crash") { + if !strings.Contains(msg.Body, "syzbot found the following issue") { t.Fatalf("wrong email header:\n%v", msg.Body) } if !strings.Contains(msg.Body, "Bisection is inconclusive") { @@ -923,7 +923,7 @@ func TestBisectCauseReproSyz2(t *testing.T) { c.client2.ReportCrash(crash) msg = c.client2.pollEmailBug() - if !strings.Contains(msg.Body, "syzbot has found a reproducer for the following crash") { + if !strings.Contains(msg.Body, "syzbot has found a reproducer for the following issue") { t.Fatalf("wrong email header:\n%v", msg.Body) } // Do we need bisection results in this email as well? @@ -982,11 +982,11 @@ func TestBugBisectionResults(t *testing.T) { { c.advanceTime(30 * 24 * time.Hour) msg := c.client2.pollEmailBug() - c.expectTrue(strings.Contains(msg.Body, "syzbot has bisected this bug to:")) + c.expectTrue(strings.Contains(msg.Body, "syzbot has bisected this issue to:")) msg = c.client2.pollEmailBug() c.expectTrue(strings.Contains(msg.Body, "Sending this report upstream.")) msg = c.client2.pollEmailBug() - c.expectTrue(strings.Contains(msg.Body, "syzbot found the following crash")) + c.expectTrue(strings.Contains(msg.Body, "syzbot found the following issue")) } // Receive a JobBisectfix and send fix information. @@ -1020,7 +1020,7 @@ func TestBugBisectionResults(t *testing.T) { } c.expectOK(c.client2.JobDone(done)) msg := c.client2.pollEmailBug() - c.expectTrue(strings.Contains(msg.Body, "syzbot suspects this bug was fixed by commit:")) + c.expectTrue(strings.Contains(msg.Body, "syzbot suspects this issue was fixed by commit:")) // Fetch bug details. var bugs []*Bug @@ -1095,11 +1095,11 @@ func TestBugBisectionStatus(t *testing.T) { { c.advanceTime(30 * 24 * time.Hour) msg := c.client2.pollEmailBug() - c.expectTrue(strings.Contains(msg.Body, "syzbot has bisected this bug to:")) + c.expectTrue(strings.Contains(msg.Body, "syzbot has bisected this issue to:")) msg = c.client2.pollEmailBug() c.expectTrue(strings.Contains(msg.Body, "Sending this report upstream.")) msg = c.client2.pollEmailBug() - c.expectTrue(strings.Contains(msg.Body, "syzbot found the following crash")) + c.expectTrue(strings.Contains(msg.Body, "syzbot found the following issue")) } // Receive a JobBisectfix and send fix information. @@ -1137,5 +1137,5 @@ func TestBugBisectionStatus(t *testing.T) { c.expectTrue(bytes.Contains(content, []byte("cause+fix"))) msg := c.client2.pollEmailBug() - c.expectTrue(strings.Contains(msg.Body, "syzbot suspects this bug was fixed by commit:")) + c.expectTrue(strings.Contains(msg.Body, "syzbot suspects this issue was fixed by commit:")) } diff --git a/dashboard/app/email_test.go b/dashboard/app/email_test.go index ad34e4cbf..5bd46c95e 100644 --- a/dashboard/app/email_test.go +++ b/dashboard/app/email_test.go @@ -46,7 +46,7 @@ func TestEmailReport(t *testing.T) { c.expectEQ(len(msg.Attachments), 0) c.expectEQ(msg.Body, fmt.Sprintf(`Hello, -syzbot found the following crash on: +syzbot found the following issue on: HEAD commit: 11111111 kernel_commit_title1 git tree: repo1 branch1 @@ -56,19 +56,19 @@ dashboard link: https://testapp.appspot.com/bug?extid=%[1]v compiler: compiler1 CC: [bar@foo.com foo@bar.com idont@want.EMAILS] -Unfortunately, I don't have any reproducer for this crash yet. +Unfortunately, I don't have any reproducer for this issue yet. -IMPORTANT: if you fix the bug, please add the following tag to the commit: +IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+%[1]v@testapp.appspotmail.com report1 --- -This bug is generated by a bot. It may contain errors. +This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. -syzbot will keep track of this bug report. See: +syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot.`, extBugID0, crashLogLink, kernelConfigLink)) c.checkURLContents(crashLogLink, crash.Log) @@ -88,7 +88,7 @@ Content-Type: text/plain Hello -syzbot will keep track of this bug report. +syzbot will keep track of this issue. If you forgot to add the Reported-by tag, once the fix for this bug is merged into any tree, please reply to this email with: #syz fix: exact-commit-title @@ -155,7 +155,7 @@ For more options, visit https://groups.google.com/d/optout. c.expectEQ(msg.Subject, "Re: "+crash.Title) c.expectEQ(len(msg.Attachments), 0) c.expectEQ(msg.Headers["In-Reply-To"], []string{"<1234>"}) - c.expectEQ(msg.Body, fmt.Sprintf(`syzbot has found a reproducer for the following crash on: + c.expectEQ(msg.Body, fmt.Sprintf(`syzbot has found a reproducer for the following issue on: HEAD commit: 10101010 a really long title, longer than 80 chars, really.. git tree: repo10alias @@ -167,7 +167,7 @@ userspace arch: i386 syz repro: %[2]v CC: [bar@foo.com foo@bar.com maintainers@repo10.org bugs@repo10.org] -IMPORTANT: if you fix the bug, please add the following tag to the commit: +IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+%[1]v@testapp.appspotmail.com report1 @@ -206,7 +206,7 @@ report1 c.expectEQ(len(msg.Attachments), 0) c.expectEQ(msg.Body, fmt.Sprintf(`Hello, -syzbot found the following crash on: +syzbot found the following issue on: HEAD commit: 10101010 a really long title, longer than 80 chars, really.. git tree: repo10alias @@ -218,19 +218,19 @@ userspace arch: i386 syz repro: %[2]v CC: [bar@foo.com foo@bar.com maintainers@repo10.org bugs@repo10.org] -IMPORTANT: if you fix the bug, please add the following tag to the commit: +IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+%[1]v@testapp.appspotmail.com report1 --- -This bug is generated by a bot. It may contain errors. +This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. -syzbot will keep track of this bug report. See: +syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. -syzbot can test patches for this bug, for details see: +syzbot can test patches for this issue, for details see: https://goo.gl/tpsmEJ#testing-patches`, extBugID1, reproSyzLink, crashLogLink, kernelConfigLink)) c.checkURLContents(reproSyzLink, syzRepro) @@ -278,7 +278,7 @@ Content-Type: text/plain "maintainers@repo10.org", "new@new.com", "qux@qux.com"}) c.expectEQ(msg.Subject, "Re: "+crash.Title) c.expectEQ(len(msg.Attachments), 0) - c.expectEQ(msg.Body, fmt.Sprintf(`syzbot has found a reproducer for the following crash on: + c.expectEQ(msg.Body, fmt.Sprintf(`syzbot has found a reproducer for the following issue on: HEAD commit: 10101010 a really long title, longer than 80 chars, really.. git tree: repo10alias @@ -291,7 +291,7 @@ syz repro: %[3]v C reproducer: %[2]v CC: [qux@qux.com maintainers@repo10.org bugs@repo10.org] -IMPORTANT: if you fix the bug, please add the following tag to the commit: +IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+%[1]v@testapp.appspotmail.com report1 @@ -593,7 +593,7 @@ func TestEmailFailedBuild(t *testing.T) { c.expectEQ(len(msg.Attachments), 0) c.expectEQ(msg.Body, fmt.Sprintf(`Hello, -syzbot found the following crash on: +syzbot found the following issue on: HEAD commit: kern2 failed build 1 git tree: repo10alias @@ -603,7 +603,7 @@ dashboard link: https://testapp.appspot.com/bug?extid=%[1]v compiler: compiler10 CC: [maintainer@crash maintainers@repo10.org bugs@repo10.org build-maintainers@repo10.org] -IMPORTANT: if you fix the bug, please add the following tag to the commit: +IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+%[1]v@testapp.appspotmail.com report line 1 @@ -611,11 +611,11 @@ report line 2 --- -This bug is generated by a bot. It may contain errors. +This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. -syzbot will keep track of this bug report. See: +syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot.`, extBugID, crashLogLink, kernelConfigLink)) } diff --git a/dashboard/app/jobs_test.go b/dashboard/app/jobs_test.go index 9e601a9e4..63827e360 100644 --- a/dashboard/app/jobs_test.go +++ b/dashboard/app/jobs_test.go @@ -130,7 +130,7 @@ func TestJob(t *testing.T) { c.expectEQ(len(msg.Attachments), 0) c.expectEQ(msg.Body, fmt.Sprintf(`Hello, -syzbot has tested the proposed patch but the reproducer still triggered crash: +syzbot has tested the proposed patch but the reproducer is still triggering an issue: test crash title test crash report @@ -169,7 +169,7 @@ patch: %[1]v c.expectEQ(len(msg.Attachments), 0) c.expectEQ(msg.Body, fmt.Sprintf(`Hello, -syzbot tried to test the proposed patch but build/boot failed: +syzbot tried to test the proposed patch but the build/boot failed: failed to apply patch @@ -208,7 +208,7 @@ patch: %[1]v truncatedError := string(jobDoneReq.Error[len(jobDoneReq.Error)-maxInlineError:]) c.expectEQ(msg.Body, fmt.Sprintf(`Hello, -syzbot tried to test the proposed patch but build/boot failed: +syzbot tried to test the proposed patch but the build/boot failed: %[1]v @@ -247,7 +247,7 @@ patch: %[3]v c.expectEQ(len(msg.Attachments), 0) c.expectEQ(msg.Body, fmt.Sprintf(`Hello, -syzbot has tested the proposed patch and the reproducer did not trigger crash: +syzbot has tested the proposed patch and the reproducer did not trigger any issue: Reported-and-tested-by: syzbot+%v@testapp.appspotmail.com @@ -310,7 +310,7 @@ func TestJobWithoutPatch(t *testing.T) { c.expectEQ(len(msg.Attachments), 0) c.expectEQ(msg.Body, fmt.Sprintf(`Hello, -syzbot has tested the proposed patch and the reproducer did not trigger crash: +syzbot has tested the proposed patch and the reproducer did not trigger any issue: Reported-and-tested-by: syzbot+%v@testapp.appspotmail.com @@ -396,7 +396,7 @@ func TestBisectFixJob(t *testing.T) { msg = c.client2.pollEmailBug() c.expectEQ(msg.Subject, "title1") - c.expectTrue(strings.Contains(msg.Body, "syzbot found the following crash")) + c.expectTrue(strings.Contains(msg.Body, "syzbot found the following issue")) } // Ensure that we get a JobBisectFix. @@ -441,7 +441,7 @@ func TestBisectFixRetry(t *testing.T) { msg = c.client2.pollEmailBug() c.expectEQ(msg.Subject, "title1") - c.expectTrue(strings.Contains(msg.Body, "syzbot found the following crash")) + c.expectTrue(strings.Contains(msg.Body, "syzbot found the following issue")) } // Ensure that we get a JobBisectFix. We send back a crashlog, no error, no commits. @@ -506,7 +506,7 @@ func TestNotReportingAlreadyFixed(t *testing.T) { msg = c.client2.pollEmailBug() c.expectEQ(msg.Subject, "title1") - c.expectTrue(strings.Contains(msg.Body, "syzbot found the following crash")) + c.expectTrue(strings.Contains(msg.Body, "syzbot found the following issue")) sender = msg.Sender } @@ -597,7 +597,7 @@ func TestFixBisectionsListed(t *testing.T) { msg = c.client2.pollEmailBug() c.expectEQ(msg.Subject, "title1") - c.expectTrue(strings.Contains(msg.Body, "syzbot found the following crash")) + c.expectTrue(strings.Contains(msg.Body, "syzbot found the following issue")) } // Ensure that we get a JobBisectFix. We send back a crashlog, no error, @@ -675,7 +675,7 @@ func TestFixBisectionsDisabled(t *testing.T) { msg = c.client2.pollEmailBug() c.expectEQ(msg.Subject, "title20") - c.expectTrue(strings.Contains(msg.Body, "syzbot found the following crash")) + c.expectTrue(strings.Contains(msg.Body, "syzbot found the following issue")) } // Ensure that we do not get a JobBisectFix. diff --git a/dashboard/app/mail_bisect_result.txt b/dashboard/app/mail_bisect_result.txt index aa60b0848..4ec27d854 100644 --- a/dashboard/app/mail_bisect_result.txt +++ b/dashboard/app/mail_bisect_result.txt @@ -1,5 +1,5 @@ -{{with $br := .}}{{with $bisect := selectBisect .}}{{if $bisect.Commit}}{{if $bisect.Fix}}syzbot suspects this bug was fixed by commit: -{{else}}syzbot has bisected this bug to: +{{with $br := .}}{{with $bisect := selectBisect .}}{{if $bisect.Commit}}{{if $bisect.Fix}}syzbot suspects this issue was fixed by commit: +{{else}}syzbot has bisected this issue to: {{end}} commit {{$bisect.Commit.Hash}} Author: {{$bisect.Commit.AuthorName}} <{{$bisect.Commit.Author}}> @@ -9,12 +9,12 @@ Date: {{formatKernelTime $bisect.Commit.Date}} {{else if $bisect.Commits}}Bisection is inconclusive: the {{if $bisect.Fix}}fix{{else}}first bad{{end}} commit could be any of: {{range $com := $bisect.Commits}} {{formatShortHash $com.Hash}} {{$com.Title}}{{end}} -{{else}}Bisection is inconclusive: the bug happens on the {{if $bisect.Fix}}latest{{else}}oldest{{end}} tested release. +{{else}}Bisection is inconclusive: the issue happens on the {{if $bisect.Fix}}latest{{else}}oldest{{end}} tested release. {{end}} bisection log: {{$bisect.LogLink}} {{if $bisect.Commit}}start commit: {{else if $bisect.Commits}}start commit: {{else}}{{if $bisect.Fix}}latest commit: {{else}}oldest commit: {{end}}{{end}}{{formatShortHash $br.KernelCommit}} {{formatCommitTableTitle $br.KernelCommitTitle}} git tree: {{$br.KernelRepoAlias}} -{{if $bisect.CrashReportLink}}final crash: {{$bisect.CrashReportLink}} +{{if $bisect.CrashReportLink}}final oops: {{$bisect.CrashReportLink}} {{end}}{{if $bisect.CrashLogLink}}console output: {{$bisect.CrashLogLink}} {{end}}{{if $br.KernelConfigLink}}kernel config: {{$br.KernelConfigLink}} {{end}}dashboard link: {{$br.Link}} @@ -22,7 +22,7 @@ git tree: {{$br.KernelRepoAlias}} {{end}}{{if $br.ReproSyzLink}}syz repro: {{$br.ReproSyzLink}} {{end}}{{if $br.ReproCLink}}C reproducer: {{$br.ReproCLink}} {{end}}{{if $bisect.Fix}} -If the result looks correct, please mark the bug fixed by replying with: +If the result looks correct, please mark the issue as fixed by replying with: #syz fix: {{$bisect.Commit.Title}} {{else}}{{if $bisect.Commit}} @@ -30,4 +30,4 @@ Reported-by: {{$br.CreditEmail}} Fixes: {{formatTagHash $bisect.Commit.Hash}} ("{{$bisect.Commit.Title}}") {{end}}{{end}} For information about bisection process see: https://goo.gl/tpsmEJ#bisection -{{end}}{{end}}
\ No newline at end of file +{{- end}}{{- end}} diff --git a/dashboard/app/mail_bug.txt b/dashboard/app/mail_bug.txt index e6f80da63..47a06348e 100644 --- a/dashboard/app/mail_bug.txt +++ b/dashboard/app/mail_bug.txt @@ -2,7 +2,7 @@ Hello, {{end -}} -syzbot {{if .First}}found{{else}}has found a reproducer for{{end}} the following crash on: +syzbot {{if .First}}found{{else}}has found a reproducer for{{end}} the following issue on: HEAD commit: {{formatShortHash .KernelCommit}} {{formatCommitTableTitle .KernelCommitTitle}} git tree: {{.KernelRepoAlias}} @@ -15,9 +15,9 @@ git tree: {{.KernelRepoAlias}} {{end}}{{if .ReproCLink}}C reproducer: {{.ReproCLink}} {{end}}{{if and .Moderation .Maintainers}}CC: {{.Maintainers}} {{end}}{{if and (not .NoRepro) (not .ReproCLink) (not .ReproSyzLink)}} -Unfortunately, I don't have any reproducer for this crash yet. +Unfortunately, I don't have any reproducer for this issue yet. {{end}} -{{if .BisectCause}}{{if .BisectCause.Commit}}The bug was bisected to: +{{if .BisectCause}}{{if .BisectCause.Commit}}The issue was bisected to: commit {{.BisectCause.Commit.Hash}} Author: {{.BisectCause.Commit.AuthorName}} <{{.BisectCause.Commit.Author}}> @@ -27,27 +27,27 @@ Date: {{formatKernelTime .BisectCause.Commit.Date}} {{else if .BisectCause.Commits}}Bisection is inconclusive: the first bad commit could be any of: {{range $com := .BisectCause.Commits}} {{formatShortHash $com.Hash}} {{$com.Title}}{{end}} -{{else}}Bisection is inconclusive: the bug happens on the oldest tested release. +{{else}}Bisection is inconclusive: the issue happens on the oldest tested release. {{end}} bisection log: {{.BisectCause.LogLink}} -{{if .BisectCause.CrashReportLink}}final crash: {{.BisectCause.CrashReportLink}} +{{if .BisectCause.CrashReportLink}}final oops: {{.BisectCause.CrashReportLink}} {{end}}{{if .BisectCause.CrashLogLink}}console output: {{.BisectCause.CrashLogLink}} {{end}} -{{end}}IMPORTANT: if you fix the bug, please add the following tag to the commit: +{{end}}IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: {{.CreditEmail}} {{if .BisectCause}}{{if .BisectCause.Commit}}Fixes: {{formatTagHash .BisectCause.Commit.Hash}} ("{{.BisectCause.Commit.Title}}") {{end}}{{end}} {{printf "%s" .Report}} {{if .First}} --- -This bug is generated by a bot. It may contain errors. +This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. -syzbot will keep track of this bug report. See: +syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot.{{if .BisectCause}} For information about bisection process see: https://goo.gl/tpsmEJ#bisection{{end}}{{if or .ReproCLink .ReproSyzLink}} -syzbot can test patches for this bug, for details see: +syzbot can test patches for this issue, for details see: https://goo.gl/tpsmEJ#testing-patches {{- end -}} {{- end -}} diff --git a/dashboard/app/mail_test_result.txt b/dashboard/app/mail_test_result.txt index 43f0224b1..b1bfdfd61 100644 --- a/dashboard/app/mail_test_result.txt +++ b/dashboard/app/mail_test_result.txt @@ -1,11 +1,11 @@ Hello, {{if .CrashTitle}} -syzbot has tested the proposed patch but the reproducer still triggered crash: +syzbot has tested the proposed patch but the reproducer is still triggering an issue: {{.CrashTitle}} {{printf "%s" .Report}} {{else if .Error}} -syzbot tried to test the proposed patch but build/boot failed: +syzbot tried to test the proposed patch but the build/boot failed: {{printf "%s" .Error}} {{if .ErrorTruncated}} @@ -13,7 +13,7 @@ Error text is too large and was truncated, full error text is at: {{.ErrorLink}} {{end}} {{else}} -syzbot has tested the proposed patch and the reproducer did not trigger crash: +syzbot has tested the proposed patch and the reproducer did not trigger any issue: Reported-and-tested-by: {{.CreditEmail}} {{end}} |
