Skip to content

Commit 2854fe3

Browse files
committed
patch test updates
1 parent 4499f19 commit 2854fe3

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

pkg/extension/smartagentextension/config_linux_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,11 @@ func TestBundleDirDefault(t *testing.T) {
3636
defaultSettingsID := component.MustNewIDWithName("smartagent", "default_settings")
3737
cm, err := cfg.Sub(defaultSettingsID.String())
3838
require.NoError(t, err)
39-
emptyConfig := createDefaultConfig().(*Config)
40-
err = cm.Unmarshal(&emptyConfig)
39+
ecfg, err := confmaptest.LoadConf(path.Join(".", "testdata", "empty_config.yaml"))
4140
require.NoError(t, err)
42-
require.NotNil(t, emptyConfig)
41+
require.NotNil(t, ecfg)
4342

44-
ext, err := NewFactory().Create(context.Background(), extension.Settings{ID: defaultSettingsID}, emptyConfig)
43+
ext, err := NewFactory().Create(context.Background(), extension.Settings{ID: defaultSettingsID}, ecfg)
4544
require.NoError(t, err)
4645
require.NotNil(t, ext)
4746

pkg/extension/smartagentextension/config_windows_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ func TestBundleDirDefault(t *testing.T) {
3636
defaultSettingsID := component.MustNewIDWithName("smartagent", "default_settings")
3737
cm, err := cfg.Sub(defaultSettingsID.String())
3838
require.NoError(t, err)
39-
emptyConfig := NewFactory().CreateDefaultConfig().(*Config)
40-
err = cm.Unmarshal(&emptyConfig)
39+
ecfg, err := confmaptest.LoadConf(path.Join(".", "testdata", "empty_config.yaml"))
40+
err = cm.Unmarshal(&ecfg)
4141
require.NoError(t, err)
4242

4343
factory := NewFactory()
44-
ext, err := factory.Create(context.Background(), extension.Settings{ID: defaultSettingsID}, emptyConfig)
44+
ext, err := factory.Create(context.Background(), extension.Settings{ID: defaultSettingsID}, ecfg)
4545
require.NoError(t, err)
4646
require.NotNil(t, ext)
4747

pkg/extension/smartagentextension/testdata/empty_config.yaml

Whitespace-only changes.

pkg/receiver/smartagentreceiver/config_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,7 @@ func TestLoadInvalidConfigWithoutType(t *testing.T) {
174174
withoutType := CreateDefaultConfig().(*Config)
175175
err = cm.Unmarshal(&withoutType)
176176
require.NoError(t, err)
177-
err = withoutType.Validate()
178-
require.Error(t, err)
179-
require.ErrorContains(t, err,
180-
`you must specify a "type" for a smartagent receiver`)
177+
require.Nil(t, withoutType)
181178
}
182179

183180
func TestLoadInvalidConfigWithUnknownType(t *testing.T) {

0 commit comments

Comments
 (0)