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

fix tests

Browse Source
This commit is contained in:
Will Browne
2025-11-26 11:48:13 +00:00
parent 881c81f0b3
commit d5efce72f3
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/plugins/pkg/app/meta/core_test.go
+5 -5
View File
@@ -23,7 +23,7 @@ func TestCoreProvider_GetMeta(t *testing.T) {
provider := NewCoreProvider()
expectedSpec := pluginsv0alpha1.PluginMetaSpec{
PluginJSON: pluginsv0alpha1.PluginMetaJSONData{
PluginJson: pluginsv0alpha1.PluginMetaJSONData{
Id: "test-plugin",
Name: "Test Plugin",
Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
@@ -61,7 +61,7 @@ func TestCoreProvider_GetMeta(t *testing.T) {
provider := NewCoreProvider()
expectedSpec := pluginsv0alpha1.PluginMetaSpec{
PluginJSON: pluginsv0alpha1.PluginMetaJSONData{
PluginJson: pluginsv0alpha1.PluginMetaJSONData{
Id: "test-plugin",
Name: "Test Plugin",
Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
@@ -86,7 +86,7 @@ func TestCoreProvider_GetMeta(t *testing.T) {
provider := NewCoreProviderWithTTL(customTTL)
expectedSpec := pluginsv0alpha1.PluginMetaSpec{
PluginJSON: pluginsv0alpha1.PluginMetaJSONData{
PluginJson: pluginsv0alpha1.PluginMetaJSONData{
Id: "test-plugin",
Name: "Test Plugin",
Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
@@ -232,8 +232,8 @@ func TestCoreProvider_loadPlugins(t *testing.T) {
if loaded {
result, err := provider.GetMeta(ctx, "test-datasource", "1.0.0")
require.NoError(t, err)
assert.Equal(t, "test-datasource", result.Meta.PluginJSON.Id)
assert.Equal(t, "Test Datasource", result.Meta.PluginJSON.Name)
assert.Equal(t, "test-datasource", result.Meta.PluginJson.Id)
assert.Equal(t, "Test Datasource", result.Meta.PluginJson.Name)
}
})
}
apps/plugins/pkg/app/meta/manager_test.go
+13 -13
View File
@@ -36,7 +36,7 @@ func TestProviderManager_GetMeta(t *testing.T) {
t.Run("returns cached result when available and not expired", func(t *testing.T) {
cachedMeta := pluginsv0alpha1.PluginMetaSpec{
PluginJSON: pluginsv0alpha1.PluginMetaJSONData{
PluginJson: pluginsv0alpha1.PluginMetaJSONData{
Id: "test-plugin",
Name: "Test Plugin",
Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
@@ -63,7 +63,7 @@ func TestProviderManager_GetMeta(t *testing.T) {
provider.getMetaFunc = func(ctx context.Context, pluginID, version string) (*Result, error) {
return &Result{
Meta: pluginsv0alpha1.PluginMetaSpec{
PluginJSON: pluginsv0alpha1.PluginMetaJSONData{Id: "different"},
PluginJson: pluginsv0alpha1.PluginMetaJSONData{Id: "different"},
},
TTL: time.Hour,
}, nil
@@ -78,7 +78,7 @@ func TestProviderManager_GetMeta(t *testing.T) {
t.Run("fetches from provider when not cached", func(t *testing.T) {
expectedMeta := pluginsv0alpha1.PluginMetaSpec{
PluginJSON: pluginsv0alpha1.PluginMetaJSONData{
PluginJson: pluginsv0alpha1.PluginMetaJSONData{
Id: "test-plugin",
Name: "Test Plugin",
Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
@@ -115,14 +115,14 @@ func TestProviderManager_GetMeta(t *testing.T) {
t.Run("does not cache result with zero TTL and tries next provider", func(t *testing.T) {
zeroTTLMeta := pluginsv0alpha1.PluginMetaSpec{
PluginJSON: pluginsv0alpha1.PluginMetaJSONData{
PluginJson: pluginsv0alpha1.PluginMetaJSONData{
Id: "test-plugin",
Name: "Zero TTL Plugin",
Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
},
}
expectedMeta := pluginsv0alpha1.PluginMetaSpec{
PluginJSON: pluginsv0alpha1.PluginMetaJSONData{
PluginJson: pluginsv0alpha1.PluginMetaJSONData{
Id: "test-plugin",
Name: "Test Plugin",
Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
@@ -165,7 +165,7 @@ func TestProviderManager_GetMeta(t *testing.T) {
t.Run("tries next provider when first returns ErrMetaNotFound", func(t *testing.T) {
expectedMeta := pluginsv0alpha1.PluginMetaSpec{
PluginJSON: pluginsv0alpha1.PluginMetaJSONData{
PluginJson: pluginsv0alpha1.PluginMetaJSONData{
Id: "test-plugin",
Name: "Test Plugin",
Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
@@ -242,14 +242,14 @@ func TestProviderManager_GetMeta(t *testing.T) {
t.Run("skips expired cache entries", func(t *testing.T) {
expiredMeta := pluginsv0alpha1.PluginMetaSpec{
PluginJSON: pluginsv0alpha1.PluginMetaJSONData{
PluginJson: pluginsv0alpha1.PluginMetaJSONData{
Id: "test-plugin",
Name: "Expired Plugin",
Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
},
}
expectedMeta := pluginsv0alpha1.PluginMetaSpec{
PluginJSON: pluginsv0alpha1.PluginMetaJSONData{
PluginJson: pluginsv0alpha1.PluginMetaJSONData{
Id: "test-plugin",
Name: "Test Plugin",
Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
@@ -289,14 +289,14 @@ func TestProviderManager_GetMeta(t *testing.T) {
t.Run("uses first successful provider", func(t *testing.T) {
expectedMeta1 := pluginsv0alpha1.PluginMetaSpec{
PluginJSON: pluginsv0alpha1.PluginMetaJSONData{
PluginJson: pluginsv0alpha1.PluginMetaJSONData{
Id: "test-plugin",
Name: "Provider 1 Plugin",
Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
},
}
expectedMeta2 := pluginsv0alpha1.PluginMetaSpec{
PluginJSON: pluginsv0alpha1.PluginMetaJSONData{
PluginJson: pluginsv0alpha1.PluginMetaJSONData{
Id: "test-plugin",
Name: "Provider 2 Plugin",
Type: pluginsv0alpha1.PluginMetaJSONDataTypeDatasource,
@@ -351,9 +351,9 @@ func TestProviderManager_Run(t *testing.T) {
func TestProviderManager_cleanupExpired(t *testing.T) {
t.Run("removes expired entries", func(t *testing.T) {
validMeta := pluginsv0alpha1.PluginMetaSpec{PluginJSON: pluginsv0alpha1.PluginMetaJSONData{Id: "valid"}}
expiredMeta1 := pluginsv0alpha1.PluginMetaSpec{PluginJSON: pluginsv0alpha1.PluginMetaJSONData{Id: "expired1"}}
expiredMeta2 := pluginsv0alpha1.PluginMetaSpec{PluginJSON: pluginsv0alpha1.PluginMetaJSONData{Id: "expired2"}}
validMeta := pluginsv0alpha1.PluginMetaSpec{PluginJson: pluginsv0alpha1.PluginMetaJSONData{Id: "valid"}}
expiredMeta1 := pluginsv0alpha1.PluginMetaSpec{PluginJson: pluginsv0alpha1.PluginMetaJSONData{Id: "expired1"}}
expiredMeta2 := pluginsv0alpha1.PluginMetaSpec{PluginJson: pluginsv0alpha1.PluginMetaJSONData{Id: "expired2"}}
provider := &mockProvider{
getMetaFunc: func(ctx context.Context, pluginID, version string) (*Result, error) {
pkg/tests/apis/plugins/pluginmeta_test.go
+4 -4
View File
@@ -43,10 +43,10 @@ func TestIntegrationPluginMeta(t *testing.T) {
}, &pluginsv0alpha1.PluginMeta{})
require.NotNil(t, response.Result)
require.NotNil(t, response.Result.Spec.PluginJSON)
require.Equal(t, "grafana-piechart-panel", response.Result.Spec.PluginJSON.Id)
require.NotEmpty(t, response.Result.Spec.PluginJSON.Name)
require.NotEmpty(t, response.Result.Spec.PluginJSON.Type)
require.NotNil(t, response.Result.Spec.PluginJson)
require.Equal(t, "grafana-piechart-panel", response.Result.Spec.PluginJson.Id)
require.NotEmpty(t, response.Result.Spec.PluginJson.Name)
require.NotEmpty(t, response.Result.Spec.PluginJson.Type)
})
t.Run("get plugin meta for non-existent plugin", func(t *testing.T) {
pkg/tests/apis/plugins/pluginmetas_test.go
+5 -5
View File
@@ -58,11 +58,11 @@ func TestIntegrationPluginMetas(t *testing.T) {
foundIDs := make(map[string]bool)
for _, item := range response.Result.Items {
require.NotNil(t, item.Spec.PluginJSON)
foundIDs[item.Spec.PluginJSON.Id] = true
require.NotEmpty(t, item.Spec.PluginJSON.Id)
require.NotEmpty(t, item.Spec.PluginJSON.Type)
require.NotEmpty(t, item.Spec.PluginJSON.Name)
require.NotNil(t, item.Spec.PluginJson)
foundIDs[item.Spec.PluginJson.Id] = true
require.NotEmpty(t, item.Spec.PluginJson.Id)
require.NotEmpty(t, item.Spec.PluginJson.Type)
require.NotEmpty(t, item.Spec.PluginJson.Name)
}
require.True(t, foundIDs["grafana-piechart-panel"])
require.True(t, foundIDs["grafana-clock-panel"])