public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkg/tsdb: Check errors (#19837)

Browse Source 
Check errors in pkg/tsdb.
This commit is contained in:
Arve Knudsen
2019-10-22 16:16:53 +02:00
committed by GitHub
parent 79cbe191b6
commit bb50fc5965
10 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/mysql/mysql.go
+3 -1
View File
@@ -46,7 +46,9 @@ func newMysqlQueryEndpoint(datasource *models.DataSource) (tsdb.TsdbQueryEndpoin
if tlsConfig.RootCAs != nil || len(tlsConfig.Certificates) > 0 {
tlsConfigString := fmt.Sprintf("ds%d", datasource.Id)
mysql.RegisterTLSConfig(tlsConfigString, tlsConfig)
if err := mysql.RegisterTLSConfig(tlsConfigString, tlsConfig); err != nil {
return nil, err
}
cnnstr += "&tls=" + tlsConfigString
}
pkg/tsdb/mysql/mysql_test.go
+8 -4
View File
@@ -68,7 +68,8 @@ func TestMySQL(t *testing.T) {
Convey("Given a table with different native data types", func() {
if exists, err := sess.IsTableExist("mysql_types"); err != nil || exists {
So(err, ShouldBeNil)
sess.DropTable("mysql_types")
err = sess.DropTable("mysql_types")
So(err, ShouldBeNil)
}
sql := "CREATE TABLE `mysql_types` ("
@@ -181,7 +182,8 @@ func TestMySQL(t *testing.T) {
if exist, err := sess.IsTableExist(metric{}); err != nil || exist {
So(err, ShouldBeNil)
sess.DropTable(metric{})
err = sess.DropTable(metric{})
So(err, ShouldBeNil)
}
err := sess.CreateTable(metric{})
So(err, ShouldBeNil)
@@ -413,7 +415,8 @@ func TestMySQL(t *testing.T) {
if exist, err := sess.IsTableExist(metric_values{}); err != nil || exist {
So(err, ShouldBeNil)
sess.DropTable(metric_values{})
err = sess.DropTable(metric_values{})
So(err, ShouldBeNil)
}
err := sess.CreateTable(metric_values{})
So(err, ShouldBeNil)
@@ -788,7 +791,8 @@ func TestMySQL(t *testing.T) {
if exist, err := sess.IsTableExist(event{}); err != nil || exist {
So(err, ShouldBeNil)
sess.DropTable(event{})
err = sess.DropTable(event{})
So(err, ShouldBeNil)
}
err := sess.CreateTable(event{})
So(err, ShouldBeNil)