Fix some tests : make coverage -> test

.drone.yml

@@ -35,7 +35,7 @@ pipeline:
       TAGS: bindata sqlite
       GOPATH: /srv/app
     commands:
-      - make coverage
+      - make test
     when:
       event: [ push, tag, pull_request ]
 

.gitignore

@@ -45,4 +45,6 @@ _testmain.go
 /indexers
 /log
 /public/img/avatar
-/integrations/gitea-integration
+/integrations/gitea-integration-mysql
+/integrations/gitea-integration-pgsql
+/integrations/gitea-integration-sqlite

Makefile

@@ -54,7 +54,7 @@ all: build
 .PHONY: clean
 clean:
 	$(GO) clean -i ./...
-	rm -rf $(EXECUTABLE) $(DIST) $(BINDATA) integrations*.test
+	rm -rf $(EXECUTABLE) $(DIST) $(BINDATA) integrations*.test integrations/gitea-integration-pgsql/ integrations/gitea-integration-mysql/ integrations/gitea-integration-sqlite/
 
 required-gofmt-version:
 	@$(GO) version  | grep -q '\(1.7\|1.8\)' || { echo "We require go version 1.7 or 1.8 to format code" >&2 && exit 1; }
@@ -160,33 +160,36 @@ test-sqlite: integrations.sqlite.test
 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test
 
 .PHONY: test-mysql
-test-mysql: integrations.test
-	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.test
+test-mysql: integrations.mysql.test
+	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test
 
 .PHONY: test-pgsql
-test-pgsql: integrations.test
-	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.test
+test-pgsql: integrations.pgsql.test
+	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test
 
 
 .PHONY: bench-sqlite
 bench-sqlite: integrations.sqlite.test
 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/sqlite.ini ./integrations.sqlite.test -test.bench .
 
 .PHONY: bench-mysql
-bench-mysql: integrations.test
-	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.test -test.bench .
+bench-mysql: integrations.mysql.test
+	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.mysql.test -test.bench .
 
 .PHONY: bench-pgsql
-bench-pgsql: integrations.test
-	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.test -test.bench .
+bench-pgsql: integrations.pgsql.test
+	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/pgsql.ini ./integrations.pgsql.test -test.bench .
 
 
 .PHONY: integration-test-coverage
 integration-test-coverage: integrations.cover.test
 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.cover.test -test.coverprofile=integration.coverage.out
 
-integrations.test: $(SOURCES)
-	$(GO) test -c code.gitea.io/gitea/integrations
+integrations.mysql.test: $(SOURCES)
+	$(GO) test -c code.gitea.io/gitea/integrations -o integrations.mysql.test
+
+integrations.pgsql.test: $(SOURCES)
+	$(GO) test -c code.gitea.io/gitea/integrations -o integrations.pgsql.test
 
 integrations.sqlite.test: $(SOURCES)
 	$(GO) test -c code.gitea.io/gitea/integrations -o integrations.sqlite.test -tags 'sqlite'

integrations/integration_test.go

@@ -118,8 +118,8 @@ func initIntegrationTest() {
 
 func prepareTestEnv(t testing.TB) {
 	assert.NoError(t, models.LoadFixtures())
-	assert.NoError(t, os.RemoveAll("integrations/gitea-integration"))
-	assert.NoError(t, com.CopyDir("integrations/gitea-integration-meta", "integrations/gitea-integration"))
+	assert.NoError(t, os.RemoveAll(setting.RepoRootPath))
+	assert.NoError(t, com.CopyDir("integrations/gitea-repositories-meta", setting.RepoRootPath))
 }
 
 type TestSession struct {

integrations/mysql.ini

@@ -11,12 +11,15 @@ SSL_MODE = disable
 PATH     = data/gitea.db
 
 [repository]
-ROOT = integrations/gitea-integration/gitea-repositories
+ROOT = integrations/gitea-integration-mysql/gitea-repositories
+
+[repository.local]
+LOCAL_COPY_PATH = tmp/local-repo-mysql
 
 [server]
 SSH_DOMAIN       = localhost
-HTTP_PORT        = 3000
-ROOT_URL         = http://localhost:3000/
+HTTP_PORT        = 3001
+ROOT_URL         = http://localhost:3001/
 DISABLE_SSH      = false
 SSH_PORT         = 22
 LFS_START_SERVER = false

integrations/pgsql.ini

@@ -11,12 +11,15 @@ SSL_MODE = disable
 PATH     = data/gitea.db
 
 [repository]
-ROOT = integrations/gitea-integration/gitea-repositories
+ROOT = integrations/gitea-integration-pgsql/gitea-repositories
+
+[repository.local]
+LOCAL_COPY_PATH = tmp/local-repo-pgsql
 
 [server]
 SSH_DOMAIN       = localhost
-HTTP_PORT        = 3000
-ROOT_URL         = http://localhost:3000/
+HTTP_PORT        = 3002
+ROOT_URL         = http://localhost:3002/
 DISABLE_SSH      = false
 SSH_PORT         = 22
 LFS_START_SERVER = false

integrations/sqlite.ini

@@ -6,12 +6,15 @@ DB_TYPE  = sqlite3
 PATH     = :memory:
 
 [repository]
-ROOT = integrations/gitea-integration/gitea-repositories
+ROOT = integrations/gitea-integration-sqlite/gitea-repositories
+
+[repository.local]
+LOCAL_COPY_PATH = tmp/local-repo-sqlite
 
 [server]
 SSH_DOMAIN       = localhost
-HTTP_PORT        = 3000
-ROOT_URL         = http://localhost:3000/
+HTTP_PORT        = 3003
+ROOT_URL         = http://localhost:3003/
 DISABLE_SSH      = false
 SSH_PORT         = 22
 LFS_START_SERVER = false