diff options
| author | Julie Qiu <julie@golang.org> | 2021-07-16 11:43:19 -0400 |
|---|---|---|
| committer | Julie Qiu <julie@golang.org> | 2021-07-16 19:00:08 +0000 |
| commit | 22c795fe59403c6c382390e301d2a203731082b6 (patch) | |
| tree | e912596c64ea6e5f93a5254881e2cab3212691db /internal/database/database_test.go | |
| parent | 24e0307d8284c90f264ed1bd6e080fbe0a4a8a28 (diff) | |
| download | go-x-pkgsite-22c795fe59403c6c382390e301d2a203731082b6.tar.xz | |
internal/database: merge dbtest into package
There doesn't seem to be any reason that dbtest needs to be its own
package, and the functions there are useful for scripts beyond use in Go
test files.
db_test.go is merged into the internal/datbase package and the file is
renamed to dbutil.go. References are fixed.
Change-Id: I5ed295f147c5b9e891c243e2c5028708b12f5c75
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/335089
Trust: Julie Qiu <julie@golang.org>
Run-TryBot: Julie Qiu <julie@golang.org>
TryBot-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jamal Carvalho <jamal@golang.org>
Reviewed-by: Jonathan Amsterdam <jba@google.com>
Diffstat (limited to 'internal/database/database_test.go')
| -rw-r--r-- | internal/database/database_test.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/internal/database/database_test.go b/internal/database/database_test.go index 8111258a..cf6e6731 100644 --- a/internal/database/database_test.go +++ b/internal/database/database_test.go @@ -22,7 +22,6 @@ import ( "github.com/jackc/pgx/v4" "github.com/jackc/pgx/v4/stdlib" "golang.org/x/pkgsite/internal/derrors" - "golang.org/x/pkgsite/internal/testing/dbtest" ) const testTimeout = 5 * time.Second @@ -32,18 +31,18 @@ const testDBName = "discovery_postgres_test" var testDB *DB func TestMain(m *testing.M) { - - if err := dbtest.CreateDBIfNotExists(testDBName); err != nil { + if err := CreateDBIfNotExists(testDBName); err != nil { if errors.Is(err, derrors.NotFound) && os.Getenv("GO_DISCOVERY_TESTDB") != "true" { log.Printf("SKIPPING: could not connect to DB (see doc/postgres.md to set up): %v", err) return } log.Fatal(err) } + var err error for _, driver := range []string{"postgres", "pgx"} { log.Printf("with driver %q", driver) - testDB, err = Open(driver, dbtest.DBConnURI(testDBName), "test") + testDB, err = Open(driver, DBConnURI(testDBName), "test") if err != nil { log.Fatalf("Open: %v %[1]T", err) } |