bergquist 8 лет назад
Родитель
Сommit
ff6108051d
2 измененных файлов с 2 добавлено и 8 удалено
  1. 1 4
      pkg/services/sqlstore/dashboard_folder_test.go
  2. 1 4
      pkg/services/sqlstore/dashboard_test.go

+ 1 - 4
pkg/services/sqlstore/dashboard_folder_test.go

@@ -3,7 +3,6 @@ package sqlstore
 import (
 import (
 	"testing"
 	"testing"
 
 
-	"github.com/go-xorm/xorm"
 	. "github.com/smartystreets/goconvey/convey"
 	. "github.com/smartystreets/goconvey/convey"
 
 
 	m "github.com/grafana/grafana/pkg/models"
 	m "github.com/grafana/grafana/pkg/models"
@@ -11,10 +10,8 @@ import (
 )
 )
 
 
 func TestDashboardFolderDataAccess(t *testing.T) {
 func TestDashboardFolderDataAccess(t *testing.T) {
-	var x *xorm.Engine
-
 	Convey("Testing DB", t, func() {
 	Convey("Testing DB", t, func() {
-		x = InitTestDB(t)
+		InitTestDB(t)
 
 
 		Convey("Given one dashboard folder with two dashboards and one dashboard in the root folder", func() {
 		Convey("Given one dashboard folder with two dashboards and one dashboard in the root folder", func() {
 			folder := insertTestDashboard("1 test dash folder", 1, 0, true, "prod", "webapp")
 			folder := insertTestDashboard("1 test dash folder", 1, 0, true, "prod", "webapp")

+ 1 - 4
pkg/services/sqlstore/dashboard_test.go

@@ -5,7 +5,6 @@ import (
 	"testing"
 	"testing"
 	"time"
 	"time"
 
 
-	"github.com/go-xorm/xorm"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	m "github.com/grafana/grafana/pkg/models"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/search"
 	"github.com/grafana/grafana/pkg/services/search"
@@ -15,10 +14,8 @@ import (
 )
 )
 
 
 func TestDashboardDataAccess(t *testing.T) {
 func TestDashboardDataAccess(t *testing.T) {
-	var x *xorm.Engine
-
 	Convey("Testing DB", t, func() {
 	Convey("Testing DB", t, func() {
-		x = InitTestDB(t)
+		InitTestDB(t)
 
 
 		Convey("Given saved dashboard", func() {
 		Convey("Given saved dashboard", func() {
 			savedFolder := insertTestDashboard("1 test dash folder", 1, 0, true, "prod", "webapp")
 			savedFolder := insertTestDashboard("1 test dash folder", 1, 0, true, "prod", "webapp")