diff --git a/db/db.go b/db/db.go index e2eb903e..36e0b885 100644 --- a/db/db.go +++ b/db/db.go @@ -345,7 +345,7 @@ func (db *DB) BusyTimeout() (rwMs, roMs int, err error) { if err != nil { return 0, 0, err } - err = db.rwDB.QueryRow("PRAGMA busy_timeout").Scan(&roMs) + err = db.roDB.QueryRow("PRAGMA busy_timeout").Scan(&roMs) if err != nil { return 0, 0, err } diff --git a/db/db_common_test.go b/db/db_common_test.go index c46f73c4..5c3662d3 100644 --- a/db/db_common_test.go +++ b/db/db_common_test.go @@ -2,7 +2,6 @@ package db import ( "errors" - "fmt" "os" "strings" "testing" @@ -13,30 +12,21 @@ import ( ) func testBusyTimeout(t *testing.T, db *DB) { - rbt := random.Intn(10000) - _, err := db.ExecuteStringStmt(fmt.Sprintf("PRAGMA busy_timeout=%d", rbt)) + wantRw := random.Intn(10000) + wantRo := random.Intn(10000) + + err := db.SetBusyTimeout(wantRw, wantRo) if err != nil { t.Fatalf("failed to set busy_timeout: %s", err.Error()) } - rw, _, err := db.BusyTimeout() + gotRw, gotRo, err := db.BusyTimeout() if err != nil { t.Fatalf("failed to get busy_timeout: %s", err.Error()) } - if exp, got := rbt, rw; exp != got { - t.Fatalf("expected busy_timeout %d, got %d", exp, got) - } - rw2 := random.Intn(10000) - if err := db.SetBusyTimeout(rw2, 0); err != nil { - t.Fatalf("failed to set busy_timeout: %s", err.Error()) - } - rw, _, err = db.BusyTimeout() - if err != nil { - t.Fatalf("failed to get busy_timeout: %s", err.Error()) - } - if exp, got := rw2, rw; exp != got { - t.Fatalf("expected busy_timeout %d, got %d", exp, got) + if gotRw != wantRw || gotRo != wantRo { + t.Fatalf("want busy_timeout rw=%d, ro=%d, got rw=%d, ro=%d", wantRw, wantRo, gotRw, gotRo) } }