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

Replace check for integration tests. (#110707)

Browse Source 
* Replace check for integration tests.
* Revert changes in pkg/tsdb/mysql packages.
* Fix formatting of few tests.
This commit is contained in:
Peter Štibraný
2025-09-08 15:49:49 +02:00
committed by GitHub
parent 544872d117
commit 7fd9ab9481
218 changed files with 1130 additions and 1630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/accesscontrol/acimpl/service_test.go
+19 -27
View File
@@ -24,6 +24,7 @@ import (
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/tests/testsuite"
"github.com/grafana/grafana/pkg/util/testutil"
)
func TestMain(m *testing.M) {
@@ -50,9 +51,8 @@ func setupTestEnv(t testing.TB) *Service {
}
func TestIntegrationUsageMetrics(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []struct {
name string
expectedValue int
@@ -84,9 +84,8 @@ func TestIntegrationUsageMetrics(t *testing.T) {
}
func TestIntegrationService_DeclareFixedRoles(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []struct {
name string
registrations []accesscontrol.RoleRegistration
@@ -172,9 +171,8 @@ func TestIntegrationService_DeclareFixedRoles(t *testing.T) {
}
func TestIntegrationService_DeclarePluginRoles(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []struct {
name string
pluginID string
@@ -288,9 +286,8 @@ func TestIntegrationService_DeclarePluginRoles(t *testing.T) {
}
func TestIntegrationService_RegisterFixedRoles(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []struct {
name string
token licensing.Licensing
@@ -393,9 +390,8 @@ func TestIntegrationService_RegisterFixedRoles(t *testing.T) {
}
func TestIntegrationService_SearchUsersPermissions(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
searchOption := accesscontrol.SearchOptions{ActionPrefix: "teams"}
ctx := context.Background()
listAllPerms := map[string][]string{accesscontrol.ActionUsersPermissionsRead: {"users:*"}}
@@ -617,9 +613,8 @@ func TestIntegrationService_SearchUsersPermissions(t *testing.T) {
}
func TestIntegrationService_SearchUserPermissions(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
tests := []struct {
name string
@@ -851,9 +846,8 @@ func TestIntegrationService_SearchUserPermissions(t *testing.T) {
}
func TestIntegrationService_SaveExternalServiceRole(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
type run struct {
cmd accesscontrol.SaveExternalServiceRoleCommand
wantErr bool
@@ -941,9 +935,8 @@ func TestIntegrationService_SaveExternalServiceRole(t *testing.T) {
}
func TestIntegrationService_DeleteExternalServiceRole(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []struct {
name string
initCmd *accesscontrol.SaveExternalServiceRoleCommand
@@ -998,9 +991,8 @@ func TestIntegrationService_DeleteExternalServiceRole(t *testing.T) {
}
func TestIntegrationService_GetRoleByName(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
t.Parallel()
ctx := context.Background()
pkg/services/accesscontrol/database/database_test.go
+13 -18
View File
@@ -25,6 +25,7 @@ import (
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/services/user/userimpl"
"github.com/grafana/grafana/pkg/tests/testsuite"
"github.com/grafana/grafana/pkg/util/testutil"
)
// run tests with cleanup
@@ -45,9 +46,8 @@ type getUserPermissionsTestCase struct {
}
func TestIntegrationAccessControlStore_GetUserPermissions(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []getUserPermissionsTestCase{
{
desc: "should successfully get user, team and builtin permissions",
@@ -162,9 +162,8 @@ type getTeamsPermissionsTestCase struct {
}
func TestIntegrationAccessControlStore_GetTeamsPermissions(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []getTeamsPermissionsTestCase{
{
desc: "should successfully get team permissions",
@@ -237,9 +236,8 @@ func TestIntegrationAccessControlStore_GetTeamsPermissions(t *testing.T) {
}
func TestIntegrationAccessControlStore_DeleteUserPermissions(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
t.Run("expect permissions in all orgs to be deleted", func(t *testing.T) {
store, permissionsStore, usrSvc, teamSvc, _, sql := setupTestEnv(t)
user, _ := createUserAndTeam(t, sql, usrSvc, teamSvc, 1)
@@ -322,9 +320,8 @@ func TestIntegrationAccessControlStore_DeleteUserPermissions(t *testing.T) {
}
func TestIntegrationAccessControlStore_DeleteTeamPermissions(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
t.Run("expect permissions related to team to be deleted", func(t *testing.T) {
store, permissionsStore, usrSvc, teamSvc, _, sql := setupTestEnv(t)
user, team := createUserAndTeam(t, sql, usrSvc, teamSvc, 1)
@@ -505,9 +502,8 @@ func setupTestEnv(t testing.TB) (*database.AccessControlStore, rs.Store, user.Se
}
func TestIntegrationAccessControlStore_SearchUsersPermissions(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
readTeamPerm := func(teamID string) rs.SetResourcePermissionCommand {
return rs.SetResourcePermissionCommand{
@@ -783,9 +779,8 @@ func TestIntegrationAccessControlStore_SearchUsersPermissions(t *testing.T) {
}
func TestIntegrationAccessControlStore_GetUsersBasicRoles(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
tests := []struct {
name string
pkg/services/accesscontrol/database/externalservices_test.go
+5 -6
View File
@@ -9,13 +9,13 @@ import (
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/util/testutil"
"github.com/stretchr/testify/require"
)
func TestIntegrationAccessControlStore_SaveExternalServiceRole(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
type run struct {
cmd accesscontrol.SaveExternalServiceRoleCommand
wantErr bool
@@ -156,9 +156,8 @@ func TestIntegrationAccessControlStore_SaveExternalServiceRole(t *testing.T) {
}
func TestIntegrationAccessControlStore_DeleteExternalServiceRole(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
extID := "app1"
tests := []struct {
name string
pkg/services/accesscontrol/filter_test.go
+3 -3
View File
@@ -15,6 +15,7 @@ import (
dsService "github.com/grafana/grafana/pkg/services/datasources/service"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/tests/testsuite"
"github.com/grafana/grafana/pkg/util/testutil"
)
type filterDatasourcesTestCase struct {
@@ -33,9 +34,8 @@ func TestMain(m *testing.M) {
}
func TestIntegrationFilter_Datasources(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []filterDatasourcesTestCase{
{
desc: "expect all data sources to be returned",
pkg/services/accesscontrol/migrator/migrator_test.go
+3 -3
View File
@@ -15,6 +15,7 @@ import (
ac "github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/tests/testsuite"
"github.com/grafana/grafana/pkg/util/testutil"
)
func TestMain(m *testing.M) {
@@ -46,9 +47,8 @@ func batchInsertPermissions(cnt int, sqlStore db.DB) error {
// TestIntegrationMigrateScopeSplit tests the scope split migration
// also tests the scope split truncation logic
func TestIntegrationMigrateScopeSplitTruncation(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
sqlStore := db.InitTestDB(t)
logger := log.New("accesscontrol.migrator.test")
pkg/services/accesscontrol/resourcepermissions/api_test.go
+13 -18
View File
@@ -19,6 +19,7 @@ import (
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
"github.com/grafana/grafana/pkg/services/team"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/util/testutil"
"github.com/grafana/grafana/pkg/web"
)
@@ -31,9 +32,8 @@ type getDescriptionTestCase struct {
}
func TestIntegrationApi_getDescription(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []getDescriptionTestCase{
{
desc: "should return description",
@@ -139,9 +139,8 @@ type getPermissionsTestCase struct {
}
func TestIntegrationApi_getPermissions(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []getPermissionsTestCase{
{
desc: "expect permissions for resource with id 1",
@@ -188,9 +187,8 @@ type setBuiltinPermissionTestCase struct {
}
func TestIntegrationApi_setBuiltinRolePermission(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []setBuiltinPermissionTestCase{
{
desc: "should set Edit permission for Viewer",
@@ -270,9 +268,8 @@ type setTeamPermissionTestCase struct {
}
func TestIntegrationApi_setTeamPermission(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []setTeamPermissionTestCase{
{
desc: "should set Edit permission for team 1",
@@ -380,9 +377,8 @@ type setUserPermissionTestCase struct {
}
func TestIntegrationApi_setUserPermission(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []setUserPermissionTestCase{
{
desc: "should set Edit permission for user 1",
@@ -458,9 +454,8 @@ func TestIntegrationApi_setUserPermission(t *testing.T) {
}
func TestIntegrationApi_setUserPermissionForTeams(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
type setUserPermissionForTeamsTestCase struct {
setUserPermissionTestCase
teamCmd *team.CreateTeamCommand
pkg/services/accesscontrol/resourcepermissions/service_test.go
+11 -15
View File
@@ -24,6 +24,7 @@ import (
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/services/user/userimpl"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util/testutil"
)
type setUserPermissionTest struct {
@@ -32,9 +33,8 @@ type setUserPermissionTest struct {
}
func TestIntegrationService_SetUserPermission(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []setUserPermissionTest{
{
desc: "should call hook when updating user permissions",
@@ -79,9 +79,8 @@ type setTeamPermissionTest struct {
}
func TestIntegrationService_SetTeamPermission(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []setTeamPermissionTest{
{
desc: "should call hook when updating user permissions",
@@ -131,9 +130,8 @@ type setBuiltInRolePermissionTest struct {
}
func TestIntegrationService_SetBuiltInRolePermission(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []setBuiltInRolePermissionTest{
{
desc: "should call hook when updating user permissions",
@@ -176,9 +174,8 @@ type setPermissionsTest struct {
}
func TestIntegrationService_SetPermissions(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []setPermissionsTest{
{
desc: "should set all permissions",
@@ -248,9 +245,8 @@ func TestIntegrationService_SetPermissions(t *testing.T) {
}
func TestIntegrationService_RegisterActionSets(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
type registerActionSetsTest struct {
desc string
options Options
pkg/services/accesscontrol/resourcepermissions/store_test.go
+12 -18
View File
@@ -23,6 +23,7 @@ import (
"github.com/grafana/grafana/pkg/services/user/userimpl"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/tests/testsuite"
"github.com/grafana/grafana/pkg/util/testutil"
)
type setUserResourcePermissionTest struct {
@@ -41,9 +42,8 @@ func TestMain(m *testing.M) {
}
func TestIntegrationStore_SetUserResourcePermission(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []setUserResourcePermissionTest{
{
desc: "should set resource permission for user",
@@ -126,9 +126,8 @@ type setTeamResourcePermissionTest struct {
}
func TestIntegrationStore_SetTeamResourcePermission(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []setTeamResourcePermissionTest{
{
desc: "should add new resource permission for team",
@@ -214,9 +213,8 @@ type setBuiltInResourcePermissionTest struct {
}
func TestIntegrationStore_SetBuiltInResourcePermission(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []setBuiltInResourcePermissionTest{
{
desc: "should add new resource permission for builtin role",
@@ -298,9 +296,8 @@ type setResourcePermissionsTest struct {
}
func TestIntegrationStore_SetResourcePermissions(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []setResourcePermissionsTest{
{
desc: "should set all permissions provided",
@@ -371,9 +368,8 @@ type getResourcePermissionsTest struct {
}
func TestIntegrationStore_GetResourcePermissions(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
tests := []getResourcePermissionsTest{
{
desc: "should return permissions for resource id",
@@ -628,9 +624,7 @@ type orgPermission struct {
}
func TestIntegrationStore_DeleteResourcePermissions(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
type deleteResourcePermissionsTest struct {
desc string