зеркало из https://github.com/golang/pkgsite.git
all.bash,internal: force DB testing in CI
If the environment variable GO_DISCOVERY_TESTDB is "true" wherever we would skip DB tests, fail instead. Set it to "true" in all.bash. Fixes golang/go#39713. Change-Id: I80fe27578a05610e29cc3ad9f6d477c9768fd51a Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/239257 Reviewed-by: Julie Qiu <julie@golang.org>
This commit is contained in:
Родитель
43a5edf9d3
Коммит
ccd36309fc
4
all.bash
4
all.bash
|
@ -157,7 +157,7 @@ main() {
|
|||
"")
|
||||
standard_linters
|
||||
runcmd go mod tidy
|
||||
runcmd go test ./...
|
||||
runcmd env GO_DISCOVERY_TESTDB=true go test ./...
|
||||
# To test internal/secrets, set GO_DISCOVERY_SECRETS_BUCKET and GO_DISCOVERY_KMS_KEY_NAME
|
||||
# to appropriate test values.
|
||||
runcmd go test ./internal/secrets
|
||||
|
@ -166,7 +166,7 @@ main() {
|
|||
# Similar to the no-arg mode, but omit actions that require GCP
|
||||
# permissions or that don't test the code.
|
||||
standard_linters
|
||||
runcmd go test -race -count=1 ./...
|
||||
runcmd env GO_DISCOVERY_TESTDB=true go test -race -count=1 ./...
|
||||
;;
|
||||
lint) standard_linters ;;
|
||||
headers) check_headers ;;
|
||||
|
|
|
@ -138,7 +138,6 @@ func processRows(rows *sql.Rows, f func(*sql.Rows) error) error {
|
|||
//
|
||||
// If the isolation level requires it, Transact will retry the transaction upon
|
||||
// serialization failure, so txFunc may be called more than once.
|
||||
|
||||
func (db *DB) Transact(ctx context.Context, iso sql.IsolationLevel, txFunc func(*DB) error) (err error) {
|
||||
defer derrors.Wrap(&err, "Transact(%s)", iso)
|
||||
// For the levels which require retry, see
|
||||
|
|
|
@ -29,7 +29,7 @@ func TestMain(m *testing.M) {
|
|||
const dbName = "discovery_postgres_test"
|
||||
|
||||
if err := dbtest.CreateDBIfNotExists(dbName); err != nil {
|
||||
if errors.Is(err, derrors.NotFound) {
|
||||
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
|
||||
}
|
||||
|
|
|
@ -132,7 +132,7 @@ func RunDBTests(dbName string, m *testing.M, testDB **DB) {
|
|||
database.QueryLoggingDisabled = true
|
||||
db, err := SetupTestDB(dbName)
|
||||
if err != nil {
|
||||
if errors.Is(err, derrors.NotFound) {
|
||||
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
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче