From 1a46ffd020dbf4f30b943b3d9fa2badb62a6a0f7 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 9 May 2023 23:59:05 +0800 Subject: [PATCH 1/3] Remove unnecessary code --- modules/indexer/issues/indexer_test.go | 4 +++- modules/indexer/stats/indexer_test.go | 6 ++++-- modules/setting/config_provider.go | 12 ------------ modules/setting/mailer_test.go | 8 ++++---- modules/setting/packages_test.go | 5 +++-- 5 files changed, 14 insertions(+), 21 deletions(-) diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go index c7c7cea90f0fb..9d4e1b3eb1e13 100644 --- a/modules/indexer/issues/indexer_test.go +++ b/modules/indexer/issues/indexer_test.go @@ -26,7 +26,9 @@ func TestMain(m *testing.M) { func TestBleveSearchIssues(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) - setting.CfgProvider = setting.NewEmptyConfigProvider() + var err error + setting.CfgProvider, err = setting.NewConfigProviderFromData("") + assert.NoError(t, err) tmpIndexerDir := t.TempDir() diff --git a/modules/indexer/stats/indexer_test.go b/modules/indexer/stats/indexer_test.go index be9c6659f14e2..97d32bfbe0ce0 100644 --- a/modules/indexer/stats/indexer_test.go +++ b/modules/indexer/stats/indexer_test.go @@ -28,11 +28,13 @@ func TestMain(m *testing.M) { func TestRepoStatsIndex(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) - setting.CfgProvider = setting.NewEmptyConfigProvider() + var err error + setting.CfgProvider, err = setting.NewConfigProviderFromData("") + assert.NoError(t, err) setting.LoadQueueSettings() - err := Init() + err = Init() assert.NoError(t, err) repo, err := repo_model.GetRepositoryByID(db.DefaultContext, 1) diff --git a/modules/setting/config_provider.go b/modules/setting/config_provider.go index 24825a6205089..ce9ef72248ad1 100644 --- a/modules/setting/config_provider.go +++ b/modules/setting/config_provider.go @@ -30,7 +30,6 @@ type ConfigProvider interface { Section(section string) ConfigSection NewSection(name string) (ConfigSection, error) GetSection(name string) (ConfigSection, error) - DeleteSection(name string) error Save() error } @@ -40,12 +39,6 @@ type iniFileConfigProvider struct { newFile bool // whether the file has not existed previously } -// NewEmptyConfigProvider create a new empty config provider -func NewEmptyConfigProvider() ConfigProvider { - cp, _ := NewConfigProviderFromData("") - return cp -} - // NewConfigProviderFromData this function is only for testing func NewConfigProviderFromData(configContent string) (ConfigProvider, error) { var cfg *ini.File @@ -121,11 +114,6 @@ func (p *iniFileConfigProvider) GetSection(name string) (ConfigSection, error) { return p.File.GetSection(name) } -func (p *iniFileConfigProvider) DeleteSection(name string) error { - p.File.DeleteSection(name) - return nil -} - // Save save the content into file func (p *iniFileConfigProvider) Save() error { if p.opts.CustomConf == "" { diff --git a/modules/setting/mailer_test.go b/modules/setting/mailer_test.go index f65dbaf8f57bd..8b2c79c8c51ee 100644 --- a/modules/setting/mailer_test.go +++ b/modules/setting/mailer_test.go @@ -10,7 +10,6 @@ import ( ) func Test_loadMailerFrom(t *testing.T) { - iniFile := NewEmptyConfigProvider() kases := map[string]*Mailer{ "smtp.mydomain.com": { SMTPAddr: "smtp.mydomain.com", @@ -27,13 +26,14 @@ func Test_loadMailerFrom(t *testing.T) { } for host, kase := range kases { t.Run(host, func(t *testing.T) { - iniFile.DeleteSection("mailer") - sec := iniFile.Section("mailer") + cfg, err := NewConfigProviderFromData("") + assert.NoError(t, err) + sec := cfg.Section("mailer") sec.NewKey("ENABLED", "true") sec.NewKey("HOST", host) // Check mailer setting - loadMailerFrom(iniFile) + loadMailerFrom(cfg) assert.EqualValues(t, kase.SMTPAddr, MailService.SMTPAddr) assert.EqualValues(t, kase.SMTPPort, MailService.SMTPPort) diff --git a/modules/setting/packages_test.go b/modules/setting/packages_test.go index 04d6e55834611..d9f6e105287f0 100644 --- a/modules/setting/packages_test.go +++ b/modules/setting/packages_test.go @@ -7,12 +7,13 @@ import ( "testing" "github.com/stretchr/testify/assert" - ini "gopkg.in/ini.v1" ) func TestMustBytes(t *testing.T) { test := func(value string) int64 { - sec, _ := ini.Empty().NewSection("test") + cfg, err := NewConfigProviderFromData("[test]") + assert.NoError(t, err) + sec := cfg.Section("test") sec.NewKey("VALUE", value) return mustBytes(sec, "VALUE") From 8b7351434b8cc2560e4a6830ee7f1d1476441ece Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 10 May 2023 08:40:31 +0800 Subject: [PATCH 2/3] ignore error when new empty setting data --- modules/indexer/issues/indexer_test.go | 4 +--- modules/indexer/stats/indexer_test.go | 6 ++---- modules/queue/manager_test.go | 5 +---- modules/setting/mailer_test.go | 3 +-- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go index 9d4e1b3eb1e13..a2d1794f4b662 100644 --- a/modules/indexer/issues/indexer_test.go +++ b/modules/indexer/issues/indexer_test.go @@ -26,9 +26,7 @@ func TestMain(m *testing.M) { func TestBleveSearchIssues(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) - var err error - setting.CfgProvider, err = setting.NewConfigProviderFromData("") - assert.NoError(t, err) + setting.CfgProvider, _ = setting.NewConfigProviderFromData("") tmpIndexerDir := t.TempDir() diff --git a/modules/indexer/stats/indexer_test.go b/modules/indexer/stats/indexer_test.go index 97d32bfbe0ce0..2d9844f8c94df 100644 --- a/modules/indexer/stats/indexer_test.go +++ b/modules/indexer/stats/indexer_test.go @@ -28,13 +28,11 @@ func TestMain(m *testing.M) { func TestRepoStatsIndex(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) - var err error - setting.CfgProvider, err = setting.NewConfigProviderFromData("") - assert.NoError(t, err) + setting.CfgProvider, _ = setting.NewConfigProviderFromData("") setting.LoadQueueSettings() - err = Init() + err := Init() assert.NoError(t, err) repo, err := repo_model.GetRepositoryByID(db.DefaultContext, 1) diff --git a/modules/queue/manager_test.go b/modules/queue/manager_test.go index 50265e27b674e..159f54dcef737 100644 --- a/modules/queue/manager_test.go +++ b/modules/queue/manager_test.go @@ -22,9 +22,7 @@ func TestManager(t *testing.T) { newQueueFromConfig := func(name, cfg string) (*WorkerPoolQueue[int], error) { cfgProvider, err := setting.NewConfigProviderFromData(cfg) - if err != nil { - return nil, err - } + assert.NoError(t, err) qs, err := setting.GetQueueSettings(cfgProvider, name) if err != nil { return nil, err @@ -77,7 +75,6 @@ QUEUE_NAME = _q2 SET_NAME = _u2 MAX_WORKERS = 2 `) - assert.NoError(t, err) q1 := createWorkerPoolQueue[string]("no-such", cfgProvider, nil, false) diff --git a/modules/setting/mailer_test.go b/modules/setting/mailer_test.go index 8b2c79c8c51ee..fbabf113786f7 100644 --- a/modules/setting/mailer_test.go +++ b/modules/setting/mailer_test.go @@ -26,8 +26,7 @@ func Test_loadMailerFrom(t *testing.T) { } for host, kase := range kases { t.Run(host, func(t *testing.T) { - cfg, err := NewConfigProviderFromData("") - assert.NoError(t, err) + cfg, _ := NewConfigProviderFromData("") sec := cfg.Section("mailer") sec.NewKey("ENABLED", "true") sec.NewKey("HOST", host) From 4f3b4ac1fd3ad5adce4b7dde559ecdd51bf4203d Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 10 May 2023 08:43:21 +0800 Subject: [PATCH 3/3] revert unnecessary change --- modules/queue/manager_test.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/queue/manager_test.go b/modules/queue/manager_test.go index 159f54dcef737..50265e27b674e 100644 --- a/modules/queue/manager_test.go +++ b/modules/queue/manager_test.go @@ -22,7 +22,9 @@ func TestManager(t *testing.T) { newQueueFromConfig := func(name, cfg string) (*WorkerPoolQueue[int], error) { cfgProvider, err := setting.NewConfigProviderFromData(cfg) - assert.NoError(t, err) + if err != nil { + return nil, err + } qs, err := setting.GetQueueSettings(cfgProvider, name) if err != nil { return nil, err @@ -75,6 +77,7 @@ QUEUE_NAME = _q2 SET_NAME = _u2 MAX_WORKERS = 2 `) + assert.NoError(t, err) q1 := createWorkerPoolQueue[string]("no-such", cfgProvider, nil, false)