diff options
| author | Mikio Hara <mikioh.mikioh@gmail.com> | 2017-02-09 12:32:33 +0900 |
|---|---|---|
| committer | Mikio Hara <mikioh.mikioh@gmail.com> | 2017-02-09 04:13:35 +0000 |
| commit | 3a6842a0ecf66cf06ce4f0a5fcb9c09fbfdbecc1 (patch) | |
| tree | d9bd395937339d37a130f793f1e66855aa8bee5b /src/database | |
| parent | 5630d39f0c726037e28b16b6d80bba64b848067a (diff) | |
| download | go-3a6842a0ecf66cf06ce4f0a5fcb9c09fbfdbecc1.tar.xz | |
database/sql: replace the expr of timeunit * N with N * timeunit in test
Change-Id: I97981b30a9629916f896cb989cc2a42a8bdbef47
Reviewed-on: https://go-review.googlesource.com/36672
Run-TryBot: Mikio Hara <mikioh.mikioh@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/database')
| -rw-r--r-- | src/database/sql/sql_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/database/sql/sql_test.go b/src/database/sql/sql_test.go index fee2fe860e..e14c66de22 100644 --- a/src/database/sql/sql_test.go +++ b/src/database/sql/sql_test.go @@ -365,7 +365,7 @@ func TestQueryContextWait(t *testing.T) { defer closeDB(t, db) prepares0 := numPrepares(t, db) - ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*15) + ctx, cancel := context.WithTimeout(context.Background(), 15*time.Millisecond) defer cancel() // This will trigger the *fakeConn.Prepare method which will take time @@ -387,7 +387,7 @@ func TestTxContextWait(t *testing.T) { db := newTestDB(t, "people") defer closeDB(t, db) - ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*15) + ctx, cancel := context.WithTimeout(context.Background(), 15*time.Millisecond) defer cancel() tx, err := db.BeginTx(ctx, nil) @@ -566,13 +566,13 @@ func TestPoolExhaustOnCancel(t *testing.T) { saturate.Wait() // Now cancel the request while it is waiting. - ctx, cancel := context.WithTimeout(context.Background(), time.Second*2) + ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) defer cancel() for i := 0; i < max; i++ { ctxReq, cancelReq := context.WithCancel(ctx) go func() { - time.Sleep(time.Millisecond * 100) + time.Sleep(100 * time.Millisecond) cancelReq() }() err := db.PingContext(ctxReq) @@ -1807,8 +1807,8 @@ func TestConnMaxLifetime(t *testing.T) { } // Expire first conn - offset = time.Second * 11 - db.SetConnMaxLifetime(time.Second * 10) + offset = 11 * time.Second + db.SetConnMaxLifetime(10 * time.Second) if err != nil { t.Fatal(err) } @@ -2765,7 +2765,7 @@ func TestIssue18719(t *testing.T) { // Wait for the context to cancel and tx to rollback. for tx.isDone() == false { - time.Sleep(time.Millisecond * 3) + time.Sleep(3 * time.Millisecond) } } defer func() { hookTxGrabConn = nil }() |