Skip to content

[chore] Update types used in extensiontest.NewNopSettingsWithType #37844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mx-psi merged 1 commit into from
Feb 11, 2025
Merged

[chore] Update types used in extensiontest.NewNopSettingsWithType #37844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions extension/observer/k8sobserver/extension_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestNewExtension(t *testing.T) {
config := factory.CreateDefaultConfig().(*Config)
mockServiceHost(t, config)

ext, err := newObserver(config, extensiontest.NewNopSettingsWithType(extensiontest.NopType))
ext, err := newObserver(config, extensiontest.NewNopSettingsWithType(factory.Type()))
require.NoError(t, err)
require.NotNil(t, ext)
}
Expand All @@ -46,7 +46,7 @@ func TestExtensionObserveServices(t *testing.T) {
config.ObservePods = false // avoid causing data race when multiple test cases running in the same process using podListerWatcher
mockServiceHost(t, config)

set := extensiontest.NewNopSettingsWithType(extensiontest.NopType)
set := extensiontest.NewNopSettingsWithType(factory.Type())
set.ID = component.NewID(metadata.Type)
ext, err := newObserver(config, set)
require.NoError(t, err)
Expand Down Expand Up @@ -135,7 +135,7 @@ func TestExtensionObservePods(t *testing.T) {
config := factory.CreateDefaultConfig().(*Config)
mockServiceHost(t, config)

set := extensiontest.NewNopSettingsWithType(extensiontest.NopType)
set := extensiontest.NewNopSettingsWithType(factory.Type())
set.ID = component.NewID(metadata.Type)
ext, err := newObserver(config, set)
require.NoError(t, err)
Expand Down Expand Up @@ -219,7 +219,7 @@ func TestExtensionObserveNodes(t *testing.T) {
config.ObservePods = false // avoid causing data race when multiple test cases running in the same process using podListerWatcher
mockServiceHost(t, config)

set := extensiontest.NewNopSettingsWithType(extensiontest.NopType)
set := extensiontest.NewNopSettingsWithType(factory.Type())
set.ID = component.NewID(metadata.Type)
ext, err := newObserver(config, set)
require.NoError(t, err)
Expand Down Expand Up @@ -320,7 +320,7 @@ func TestExtensionObserveIngresses(t *testing.T) {
config.ObserveIngresses = true
mockServiceHost(t, config)

set := extensiontest.NewNopSettingsWithType(extensiontest.NopType)
set := extensiontest.NewNopSettingsWithType(factory.Type())
set.ID = component.NewID(metadata.Type)
ext, err := newObserver(config, set)
require.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion extension/observer/k8sobserver/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestFactory_Create(t *testing.T) {
factory := NewFactory()
cfg := factory.CreateDefaultConfig().(*Config)

ext, err := factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
ext, err := factory.Create(context.Background(), extensiontest.NewNopSettingsWithType(factory.Type()), cfg)
require.Error(t, err)
require.Nil(t, ext)
}
10 changes: 6 additions & 4 deletions extension/opampextension/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,21 @@ import (
)

func TestFactory_CreateDefaultConfig(t *testing.T) {
cfg := NewFactory().CreateDefaultConfig()
f := NewFactory()
cfg := f.CreateDefaultConfig()
assert.Equal(t, createDefaultConfig().(*Config), cfg)

assert.NoError(t, componenttest.CheckConfigStruct(cfg))
ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(f.Type()), cfg)
require.NoError(t, err)
require.NotNil(t, ext)
require.NoError(t, ext.Shutdown(context.Background()))
}

func TestFactory_Create(t *testing.T) {
cfg := NewFactory().CreateDefaultConfig()
ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(extensiontest.NopType), cfg)
f := NewFactory()
cfg := f.CreateDefaultConfig()
ext, err := createExtension(context.Background(), extensiontest.NewNopSettingsWithType(f.Type()), cfg)
require.NoError(t, err)
require.NotNil(t, ext)
require.NoError(t, ext.Shutdown(context.Background()))
Expand Down