aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
author0x1a8510f2 <admin@0x1a8510f2.space>2022-11-02 13:20:10 +0000
committerGitHub <noreply@github.com>2022-11-02 13:20:10 +0000
commit51ab0a8ccfab539e127df0d97c29f364fbb57864 (patch)
tree6a0f81ee06e00ac8f9d65539e19f22ba0af1e54d /test
parent16c2a9590002a2124cf7dae69da07aab0f13a5a8 (diff)
Fix `moderncsqlite` errors and rebase onto `main` (#2832)
This is #2819 but rebased on latest `main`. This PR is against main too as opposed to the `moderncsqlite` branch. The main change here is simply: ```go // add query parameters to the dsn if strings.Contains(dsn, "?") { dsn += "&" } else { dsn += "?" } // wait some time before erroring if the db is locked // https://gitlab.com/cznic/sqlite/-/issues/106#note_1058094993 dsn += "_pragma=busy_timeout%3d10000" ``` ### Pull Request Checklist <!-- Please read https://matrix-org.github.io/dendrite/development/contributing before submitting your pull request --> * [x] I have added tests for PR _or_ I have justified why this PR doesn't need tests. * [x] Pull request includes a [sign off below using a legally identifiable name](https://matrix-org.github.io/dendrite/development/contributing#sign-off) _or_ I have already signed off privately Signed off privately. Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
Diffstat (limited to 'test')
-rw-r--r--test/db.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/db.go b/test/db.go
index c7cb919f..17f637e1 100644
--- a/test/db.go
+++ b/test/db.go
@@ -176,7 +176,7 @@ func WithAllDatabases(t *testing.T, testFn func(t *testing.T, db DBType)) {
for dbName, dbType := range dbs {
dbt := dbType
t.Run(dbName, func(tt *testing.T) {
- tt.Parallel()
+ //tt.Parallel()
testFn(tt, dbt)
})
}