IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-18 17:15:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

pkg/services: Check errors (#19712)

Browse Source 
* pkg/services: Check errors
* pkg/services: Don't treat context.Canceled|context.DeadlineExceeded as error
This commit is contained in:
Arve Knudsen
2019-10-22 14:08:18 +02:00
committed by GitHub
parent de5038441f
commit 2a78d2a61c
37 changed files with 431 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/notifications/codes_test.go
+8 -3
View File
@@ -14,7 +14,8 @@ func TestEmailCodes(t *testing.T) {
setting.EmailCodeValidMinutes = 120
user := &m.User{Id: 10, Email: "t@a.com", Login: "asd", Password: "1", Rands: "2"}
code := createUserEmailCode(user, nil)
code, err := createUserEmailCode(user, nil)
So(err, ShouldBeNil)
Convey("getLoginForCode should return login", func() {
login := getLoginForEmailCode(code)
@@ -22,12 +23,16 @@ func TestEmailCodes(t *testing.T) {
})
Convey("Can verify valid code", func() {
So(validateUserEmailCode(user, code), ShouldBeTrue)
isValid, err := validateUserEmailCode(user, code)
So(err, ShouldBeNil)
So(isValid, ShouldBeTrue)
})
Convey("Cannot verify in-valid code", func() {
code = "ASD"
So(validateUserEmailCode(user, code), ShouldBeFalse)
isValid, err := validateUserEmailCode(user, code)
So(err, ShouldBeNil)
So(isValid, ShouldBeFalse)
})
})