aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Jones <evan.jones@datadoghq.com>2020-11-16 11:52:56 -0500
committerGitHub <noreply@github.com>2020-11-17 01:52:56 +0900
commit3fb3c0de3797a5c55534c1985e982c240ee149b2 (patch)
tree0217b5e6d8c06cbe75009dfa09987dd3bc941774
parentsqlite3_test.go: Move Go 1.13 test to sqlite3_go113_test.go (#883) (diff)
downloadgolite-3fb3c0de3797a5c55534c1985e982c240ee149b2.tar.gz
golite-3fb3c0de3797a5c55534c1985e982c240ee149b2.tar.xz
TestExecContextCancel: Reduce timeout to make less flaky (#879)
This test fails fairly often. On my system, I can trigger it with: go test . -run=TestExecContextCancel -count=10 -failfast -v This makes the test less flaky by timing out the context after a consistent 50 millisecond delay. This was enough time for the query to start, then get cancelled with sqlite3_interrupt() in my tests. This now passes the above check. This is a modified version of the change suggested in: https://github.com/mattn/go-sqlite3/pull/865
-rw-r--r--sqlite3_go18_test.go14
1 files changed, 10 insertions, 4 deletions
diff --git a/sqlite3_go18_test.go b/sqlite3_go18_test.go
index 5ee3d81..8c8c451 100644
--- a/sqlite3_go18_test.go
+++ b/sqlite3_go18_test.go
@@ -150,8 +150,11 @@ func TestExecContextCancel(t *testing.T) {
ts := time.Now()
initDatabase(t, db, 1000)
spent := time.Since(ts)
- if spent < 100*time.Millisecond {
- t.Skip("test will be too racy, as ExecContext below will be too fast.")
+ const minTestTime = 100 * time.Millisecond
+ if spent < minTestTime {
+ t.Skipf("test will be too racy (spent=%s < min=%s) as ExecContext below will be too fast.",
+ spent.String(), minTestTime.String(),
+ )
}
// expected to be extremely slow query
@@ -160,14 +163,17 @@ INSERT INTO test_table (key1, key_id, key2, key3, key4, key5, key6, data)
SELECT t1.key1 || t2.key1, t1.key_id || t2.key_id, t1.key2 || t2.key2, t1.key3 || t2.key3, t1.key4 || t2.key4, t1.key5 || t2.key5, t1.key6 || t2.key6, t1.data || t2.data
FROM test_table t1 LEFT OUTER JOIN test_table t2`
// expect query above take ~ same time as setup above
- ctx, cancel := context.WithTimeout(context.Background(), spent/2)
+ // This is racy: the context must be valid so sql/db.ExecContext calls the sqlite3 driver.
+ // It starts the query, the context expires, then calls sqlite3_interrupt
+ ctx, cancel := context.WithTimeout(context.Background(), minTestTime/2)
defer cancel()
ts = time.Now()
r, err := db.ExecContext(ctx, q)
// racy check
if r != nil {
n, err := r.RowsAffected()
- t.Log(n, err, time.Since(ts))
+ t.Logf("query should not have succeeded: rows=%d; err=%v; duration=%s",
+ n, err, time.Since(ts).String())
}
if err != context.DeadlineExceeded {
t.Fatal(err, ctx.Err())