code review 12810043: database/sql: add a disabled broken test

database/sql: add a disabled broken test

Update issue 6081

[bradfitz, 2013-08-12 21:56:17]

Hello golang-dev@googlegroups.com,

I'd like you to review this change to
https://go.googlecode.com/hg/

[bradfitz, 2013-08-13 14:42:20]

ping.  anybody?

It's just a new test, and it's disabled.



On Mon, Aug 12, 2013 at 2:56 PM, <bradfitz@golang.org> wrote:

> Reviewers: golang-dev1,
>
> Message:
> Hello golang-dev@googlegroups.com,
>
> I'd like you to review this change to
> https://go.googlecode.com/hg/
>
>
> Description:
> database/sql: add a disabled broken test
>
> Update issue 6081
>
> Please review this at
https://codereview.appspot.**com/12810043/<https://codereview.appspot.com/128...
>
> Affected files:
>   M src/pkg/database/sql/sql.go
>   M src/pkg/database/sql/sql_test.**go
>
>
> Index: src/pkg/database/sql/sql.go
> ==============================**==============================**=======
> --- a/src/pkg/database/sql/sql.go
> +++ b/src/pkg/database/sql/sql.go
> @@ -1372,6 +1372,8 @@
>         return nil
>  }
>
> +var rowsCloseHook func(*Rows, *error)
> +
>  // Close closes the Rows, preventing further enumeration. If the
>  // end is encountered, the Rows are closed automatically. Close
>  // is idempotent.
> @@ -1381,6 +1383,9 @@
>         }
>         rs.closed = true
>         err := rs.rowsi.Close()
> +       if fn := rowsCloseHook; fn != nil {
> +               fn(rs, &err)
> +       }
>         if rs.closeStmt != nil {
>                 rs.closeStmt.Close()
>         }
> Index: src/pkg/database/sql/sql_test.**go
> ==============================**==============================**=======
> --- a/src/pkg/database/sql/sql_**test.go
> +++ b/src/pkg/database/sql/sql_**test.go
> @@ -5,6 +5,7 @@
>  package sql
>
>  import (
> +       "database/sql/driver"
>         "fmt"
>         "reflect"
>         "runtime"
> @@ -1110,6 +1111,52 @@
>         wg.Wait()
>  }
>
> +func TestIssue6081(t *testing.T) {
> +       t.Skip("known broken test")
> +       db := newTestDB(t, "people")
> +       defer closeDB(t, db)
> +
> +       drv := db.driver.(*fakeDriver)
> +       drv.mu.Lock()
> +       opens0 := drv.openCount
> +       closes0 := drv.closeCount
> +       drv.mu.Unlock()
> +
> +       stmt, err := db.Prepare("SELECT|people|**name|")
> +       if err != nil {
> +               t.Fatal(err)
> +       }
> +       rowsCloseHook = func(rows *Rows, err *error) {
> +               *err = driver.ErrBadConn
> +       }
> +       defer func() { rowsCloseHook = nil }()
> +       for i := 0; i < 10; i++ {
> +               rows, err := stmt.Query()
> +               if err != nil {
> +                       t.Fatal(err)
> +               }
> +               rows.Close()
> +       }
> +       if n := len(stmt.css); n > 1 {
> +               t.Errorf("len(css slice) = %d; want <= 1", n)
> +       }
> +       stmt.Close()
> +       if n := len(stmt.css); n != 0 {
> +               t.Errorf("len(css slice) after Close = %d; want 0", n)
> +       }
> +
> +       drv.mu.Lock()
> +       opens := drv.openCount - opens0
> +       closes := drv.closeCount - closes0
> +       drv.mu.Unlock()
> +       if opens < 9 {
> +               t.Errorf("opens = %d; want >= 9", opens)
> +       }
> +       if closes < 9 {
> +               t.Errorf("closes = %d; want >= 9", closes)
> +       }
> +}
> +
>  func TestConcurrency(t *testing.T) {
>         manyConcurrentQueries(t)
>  }
>
>
>

[gri, 2013-08-13 21:49:00]

LGTM

[bradfitz, 2013-08-13 21:56:42]

*** Submitted as https://code.google.com/p/go/source/detail?r=478fdd871e70 ***

database/sql: add a disabled broken test

Update issue 6081

R=golang-dev, gri
CC=golang-dev
https://codereview.appspot.com/12810043