opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 12:42:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13631 from mjtrangoni/fix-megacheck-issues

Browse Source 
Fix trivial megacheck issues
This commit is contained in:
Torkel Ödegaard
2018-10-13 06:56:29 +02:00
committed by GitHub
parent 7051a150cf 74533a7a19
commit d17025fb43
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/services/alerting/notifiers/telegram.go
View File

@ -127,7 +127,13 @@ func (this *TelegramNotifier) buildMessageInlineImage(evalContext *alerting.Eval
var err error
imageFile, err = os.Open(evalContext.ImageOnDiskPath)
defer imageFile.Close()
defer func() {
err := imageFile.Close()
if err != nil {
log.Error2("Could not close Telegram inline image.", "err", err)
}
}()
if err != nil {
return nil, err
}

2
pkg/services/sqlstore/user_auth_test.go
View File

@ -16,7 +16,6 @@ func TestUserAuth(t *testing.T) {
Convey("Given 5 users", t, func() {
var err error
var cmd *m.CreateUserCommand
users := []m.User{}
for i := 0; i < 5; i++ {
cmd = &m.CreateUserCommand{
Email: fmt.Sprint("user", i, "@test.com"),
@ -25,7 +24,6 @@ func TestUserAuth(t *testing.T) {
}
err = CreateUser(context.Background(), cmd)
So(err, ShouldBeNil)
users = append(users, cmd.Result)
}
Reset(func() {

2
pkg/tsdb/mssql/mssql_test.go
View File

@ -692,7 +692,7 @@ func TestMSSQL(t *testing.T) {
},
}
resp, err := endpoint.Query(nil, nil, query)
resp, err := endpoint.Query(context.Background(), nil, query)
So(err, ShouldBeNil)
queryResult := resp.Results["A"]
So(queryResult.Error, ShouldBeNil)

2
pkg/tsdb/mysql/mysql_test.go
View File

@ -769,7 +769,7 @@ func TestMySQL(t *testing.T) {
},
}
resp, err := endpoint.Query(nil, nil, query)
resp, err := endpoint.Query(context.Background(), nil, query)
So(err, ShouldBeNil)
queryResult := resp.Results["A"]
So(queryResult.Error, ShouldBeNil)

2
pkg/tsdb/postgres/postgres_test.go
View File

@ -701,7 +701,7 @@ func TestPostgres(t *testing.T) {
},
}
resp, err := endpoint.Query(nil, nil, query)
resp, err := endpoint.Query(context.Background(), nil, query)
So(err, ShouldBeNil)
queryResult := resp.Results["A"]
So(queryResult.Error, ShouldBeNil)