diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | integrations/integration_test.go | 12 |
2 files changed, 12 insertions, 5 deletions
@@ -96,7 +96,8 @@ test-vendor: govendor status || exit 1 .PHONY: test-sqlite -test-sqlite: integrations.test +test-sqlite: + go test -c code.gitea.io/gitea/integrations -tags 'sqlite' GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.test .PHONY: test-mysql @@ -108,7 +109,7 @@ test-pgsql: integrations.test GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.test integrations.test: $(SOURCES) - go test -c code.gitea.io/gitea/integrations -tags 'sqlite' + go test -c code.gitea.io/gitea/integrations .PHONY: check check: test diff --git a/integrations/integration_test.go b/integrations/integration_test.go index 4a809403bd..1bac2c1964 100644 --- a/integrations/integration_test.go +++ b/integrations/integration_test.go @@ -79,6 +79,9 @@ func initIntegrationTest() { if err != nil { log.Fatalf("sql.Open: %v", err) } + if _, err = db.Exec("DROP DATABASE IF EXISTS testgitea"); err != nil { + log.Fatalf("db.drop db: %v", err) + } if _, err = db.Exec("CREATE DATABASE IF NOT EXISTS testgitea"); err != nil { log.Fatalf("db.Exec: %v", err) } @@ -96,11 +99,14 @@ func initIntegrationTest() { } defer rows.Close() - if !rows.Next() { - if _, err = db.Exec("CREATE DATABASE testgitea"); err != nil { - log.Fatalf("db.Exec: %v", err) + if rows.Next() { + if _, err = db.Exec("DROP DATABASE testgitea"); err != nil { + log.Fatalf("db.drop db: %v", err) } } + if _, err = db.Exec("CREATE DATABASE testgitea"); err != nil { + log.Fatalf("db.Exec: %v", err) + } } routers.GlobalInit() } |