Sfoglia il codice sorgente

fix(build): fixed failing unit test

Torkel Ödegaard 9 anni fa
parent
commit
4a116ad4ad

+ 1 - 2
pkg/services/sqlstore/datasource.go

@@ -60,9 +60,8 @@ func DeleteDataSource(cmd *m.DeleteDataSourceCommand) error {
 func AddDataSource(cmd *m.AddDataSourceCommand) error {
 
 	return inTransaction(func(sess *xorm.Session) error {
-
 		existing := m.DataSource{OrgId: cmd.OrgId, Name: cmd.Name}
-		has, _ := x.Get(&existing)
+		has, _ := sess.Get(&existing)
 
 		if has {
 			return m.ErrDataSourceNameExists

+ 7 - 2
pkg/services/sqlstore/datasource_test.go

@@ -41,6 +41,7 @@ func TestDataAccess(t *testing.T) {
 
 			err := AddDataSource(&m.AddDataSourceCommand{
 				OrgId:    10,
+				Name:     "laban",
 				Type:     m.DS_INFLUXDB,
 				Access:   m.DS_ACCESS_DIRECT,
 				Url:      "http://test",
@@ -63,15 +64,19 @@ func TestDataAccess(t *testing.T) {
 
 		Convey("Given a datasource", func() {
 
-			AddDataSource(&m.AddDataSourceCommand{
+			err := AddDataSource(&m.AddDataSourceCommand{
 				OrgId:  10,
+				Name:   "nisse",
 				Type:   m.DS_GRAPHITE,
 				Access: m.DS_ACCESS_DIRECT,
 				Url:    "http://test",
 			})
+			So(err, ShouldBeNil)
 
 			query := m.GetDataSourcesQuery{OrgId: 10}
-			GetDataSources(&query)
+			err = GetDataSources(&query)
+			So(err, ShouldBeNil)
+
 			ds := query.Result[0]
 
 			Convey("Can delete datasource", func() {