Chore: Run integration tests without grabpl (#49448)

* Chore: Run integration tests without grabpl

* Add new step for integration tests in lib.star

* Remove old integration test step from lib.star

* Change drone signature

* Fix: Edit starlark integration step to not affect enterprise

* Remove all build tags & rename starlark integration test step

* Resync .drone.yml with .drone.star

* Fix lint errors

* Fix lint errors

* Fix lint errors

* Fix more lint errors

* Fix another lint error

* Rename integration test step

* Fix last lint error

* Recomment enterprise step

* Remove comment from Makefile

Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com>
This commit is contained in:
Kat Yang
2022-06-01 14:55:22 -04:00
committed by GitHub
co-authored by Ida Furjesova
parent 2edfbb7767
commit c63ebc887b
57 changed files with 48 additions and 224 deletions
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
-3
View File
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
-3
View File
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore_test
import (
-3
View File
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
@@ -15,7 +12,6 @@ var theme = models.ThemeDark
var kind = models.ThumbnailKindDefault
func TestIntegrationSqlStorage(t *testing.T) {
var sqlStore *SQLStore
var savedFolder *models.Dashboard
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
@@ -108,20 +105,3 @@ func TestIntegrationGetDashboardVersions(t *testing.T) {
require.Equal(t, 2, len(query.Result))
})
}
func getDashboard(t *testing.T, sqlStore *SQLStore, dashboard *models.Dashboard) error {
t.Helper()
return sqlStore.WithDbSession(context.Background(), func(sess *DBSession) error {
has, err := sess.Get(dashboard)
if err != nil {
return err
} else if !has {
return models.ErrDashboardNotFound
}
dashboard.SetId(dashboard.Id)
dashboard.SetUid(dashboard.Uid)
return nil
})
}
-3
View File
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
-3
View File
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
+1 -3
View File
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
@@ -465,6 +462,7 @@ func insertTestDashboard(t *testing.T, sqlStore *SQLStore, title string, orgId i
return nil
})
require.NoError(t, err)
return dash
}
-3
View File
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
-3
View File
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
-3
View File
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
-3
View File
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
-3
View File
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
-3
View File
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
-5
View File
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
@@ -396,7 +393,6 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
// should not receive service account from query
require.Equal(t, len(teamMembersQuery.Result), 1)
})
})
})
}
@@ -480,7 +476,6 @@ func TestIntegrationSQLStore_GetTeamMembers_ACFilter(t *testing.T) {
// Seed 2 teams with 2 members
setup := func(store *SQLStore) {
team1, errCreateTeam := store.CreateTeam("group1 name", "test1@example.org", testOrgID)
require.NoError(t, errCreateTeam)
team2, errCreateTeam := store.CreateTeam("group2 name", "test2@example.org", testOrgID)
-3
View File
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
-6
View File
@@ -1,6 +1,3 @@
//go:build integration
// +build integration
package sqlstore
import (
@@ -15,7 +12,6 @@ import (
)
func TestIntegrationUserDataAccess(t *testing.T) {
ss := InitTestDB(t)
user := &models.SignedInUser{
OrgId: 1,
@@ -364,7 +360,6 @@ func TestIntegrationUserDataAccess(t *testing.T) {
ss = InitTestDB(t)
t.Run("Testing DB - enable all users", func(t *testing.T) {
users := createFiveTestUsers(t, ss, func(i int) *models.CreateUserCommand {
return &models.CreateUserCommand{
Email: fmt.Sprint("user", i, "@test.com"),
@@ -452,7 +447,6 @@ func TestIntegrationUserDataAccess(t *testing.T) {
})
t.Run("Testing DB - grafana admin users", func(t *testing.T) {
ss = InitTestDB(t)
createUserCmd := models.CreateUserCommand{