opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-25 10:54:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Attempt to reduce flakiness in integration tests (#97247)

Browse Source 
* sqlstore/sqlutil: set sync=OFF for sqlite in tests if wal=true

* testinfra: set max open/idle conn to 2 to match e2e tests
This commit is contained in:
Matheus Macabu
2024-12-10 10:55:18 +01:00
committed by GitHub
parent aa5ba238a4
commit dd969f8a54
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/services/sqlstore/sqlutil/sqlutil.go
View File

@ -110,7 +110,8 @@ func sqLite3TestDB() (*TestDB, error) {
ret.ConnStr = "file:" + sqliteDb + "?cache=private&mode=rwc" ret.ConnStr = "file:" + sqliteDb + "?cache=private&mode=rwc"
if os.Getenv("SQLITE_JOURNAL_MODE") != "false" { if os.Getenv("SQLITE_JOURNAL_MODE") != "false" {
ret.ConnStr += "&_journal_mode=WAL" // For tests, set sync=OFF for faster commits. Reference: https://www.sqlite.org/pragma.html#pragma_synchronous.
ret.ConnStr += "&_journal_mode=WAL&_synchronous=OFF"
} }
ret.Path = sqliteDb ret.Path = sqliteDb

9
pkg/tests/testinfra/testinfra.go
View File

@ -461,9 +461,14 @@ func CreateGrafDir(t *testing.T, opts ...GrafanaOpts) (string, string) {
} }
} }
} }
logSection, err := getOrCreateSection("database")
dbSection, err := getOrCreateSection("database")
require.NoError(t, err) require.NoError(t, err)
_, err = logSection.NewKey("query_retries", fmt.Sprintf("%d", queryRetries)) _, err = dbSection.NewKey("query_retries", fmt.Sprintf("%d", queryRetries))
require.NoError(t, err)
_, err = dbSection.NewKey("max_open_conn", "2")
require.NoError(t, err)
_, err = dbSection.NewKey("max_idle_conn", "2")
require.NoError(t, err) require.NoError(t, err)
cfgPath := filepath.Join(cfgDir, "test.ini") cfgPath := filepath.Join(cfgDir, "test.ini")