Backport #29254 The tests on migration tests failed but CI reports successfully https://github.com/go-gitea/gitea/actions/runs/7364373807/job/20044685969#step:8:141 This PR will fix the bug on migrations and also the CI hidden behaviour. The reason is on the Makefile `GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' $(MIGRATE_TEST_PACKAGES)` will return the error exit code. But `for pkg in $(shell $(GO) list code.gitea.io/gitea/models/migrations/...); do \ GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg; \ done` will not work. --------- Co-authored-by: Giteabot <teabot@gitea.io>tags/v1.21.8
@@ -49,7 +49,10 @@ jobs: | |||
- run: make backend | |||
env: | |||
TAGS: bindata | |||
- run: make test-pgsql-migration test-pgsql | |||
- name: run migration tests | |||
run: make test-pgsql-migration | |||
- name: run tests | |||
run: make test-pgsql | |||
timeout-minutes: 50 | |||
env: | |||
TAGS: bindata gogit | |||
@@ -72,7 +75,10 @@ jobs: | |||
- run: make backend | |||
env: | |||
TAGS: bindata gogit sqlite sqlite_unlock_notify | |||
- run: make test-sqlite-migration test-sqlite | |||
- name: run migration tests | |||
run: make test-sqlite-migration | |||
- name: run tests | |||
run: make test-sqlite | |||
timeout-minutes: 50 | |||
env: | |||
TAGS: bindata gogit sqlite sqlite_unlock_notify | |||
@@ -189,8 +195,10 @@ jobs: | |||
- run: make backend | |||
env: | |||
TAGS: bindata | |||
- name: run migration tests | |||
run: make test-mysql-migration | |||
- name: run tests | |||
run: make test-mysql-migration integration-test-coverage | |||
run: make integration-test-coverage | |||
env: | |||
TAGS: bindata | |||
RACE_ENABLED: true | |||
@@ -252,7 +260,9 @@ jobs: | |||
- run: make backend | |||
env: | |||
TAGS: bindata | |||
- run: make test-mssql-migration test-mssql | |||
- run: make test-mssql-migration | |||
- name: run tests | |||
run: make test-mssql | |||
timeout-minutes: 50 | |||
env: | |||
TAGS: bindata |
@@ -111,6 +111,7 @@ LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64 | |||
GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests code.gitea.io/gitea/tests/integration code.gitea.io/gitea/tests/e2e,$(shell $(GO) list ./... | grep -v /vendor/)) | |||
GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list code.gitea.io/gitea/models/migrations/...) code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests code.gitea.io/gitea/tests/integration code.gitea.io/gitea/tests/e2e,$(shell $(GO) list ./... | grep -v /vendor/)) | |||
MIGRATE_TEST_PACKAGES ?= $(shell $(GO) list code.gitea.io/gitea/models/migrations/...) | |||
FOMANTIC_WORK_DIR := web_src/fomantic | |||
@@ -748,9 +749,7 @@ migrations.sqlite.test: $(GO_SOURCES) generate-ini-sqlite | |||
.PHONY: migrations.individual.mysql.test | |||
migrations.individual.mysql.test: $(GO_SOURCES) | |||
for pkg in $(shell $(GO) list code.gitea.io/gitea/models/migrations/...); do \ | |||
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg; \ | |||
done | |||
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -p 1 $(MIGRATE_TEST_PACKAGES) | |||
.PHONY: migrations.individual.mysql8.test | |||
migrations.individual.mysql8.test: $(GO_SOURCES) | |||
@@ -764,20 +763,15 @@ migrations.individual.sqlite.test\#%: $(GO_SOURCES) generate-ini-sqlite | |||
.PHONY: migrations.individual.pgsql.test | |||
migrations.individual.pgsql.test: $(GO_SOURCES) | |||
for pkg in $(shell $(GO) list code.gitea.io/gitea/models/migrations/...); do \ | |||
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg; \ | |||
done | |||
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -p 1 $(MIGRATE_TEST_PACKAGES) | |||
.PHONY: migrations.individual.pgsql.test\#% | |||
migrations.individual.pgsql.test\#%: $(GO_SOURCES) generate-ini-pgsql | |||
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* | |||
.PHONY: migrations.individual.mssql.test | |||
migrations.individual.mssql.test: $(GO_SOURCES) generate-ini-mssql | |||
for pkg in $(shell $(GO) list code.gitea.io/gitea/models/migrations/...); do \ | |||
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mssql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg -test.failfast; \ | |||
done | |||
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mssql.ini $(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -p 1 $(MIGRATE_TEST_PACKAGES) | |||
.PHONY: migrations.individual.mssql.test\#% | |||
migrations.individual.mssql.test\#%: $(GO_SOURCES) generate-ini-mssql | |||
@@ -785,9 +779,7 @@ migrations.individual.mssql.test\#%: $(GO_SOURCES) generate-ini-mssql | |||
.PHONY: migrations.individual.sqlite.test | |||
migrations.individual.sqlite.test: $(GO_SOURCES) generate-ini-sqlite | |||
for pkg in $(shell $(GO) list code.gitea.io/gitea/models/migrations/...); do \ | |||
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg; \ | |||
done | |||
GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -p 1 $(MIGRATE_TEST_PACKAGES) | |||
.PHONY: migrations.individual.sqlite.test\#% | |||
migrations.individual.sqlite.test\#%: $(GO_SOURCES) generate-ini-sqlite |
@@ -36,12 +36,14 @@ func Test_DropTableColumns(t *testing.T) { | |||
"updated_unix", | |||
} | |||
x.SetMapper(names.GonicMapper{}) | |||
for i := range columns { | |||
x.SetMapper(names.GonicMapper{}) | |||
if err := x.Sync(new(DropTest)); err != nil { | |||
t.Errorf("unable to create DropTest table: %v", err) | |||
return | |||
} | |||
sess := x.NewSession() | |||
if err := sess.Begin(); err != nil { | |||
sess.Close() | |||
@@ -64,7 +66,6 @@ func Test_DropTableColumns(t *testing.T) { | |||
return | |||
} | |||
for j := range columns[i+1:] { | |||
x.SetMapper(names.GonicMapper{}) | |||
if err := x.Sync(new(DropTest)); err != nil { | |||
t.Errorf("unable to create DropTest table: %v", err) | |||
return |
@@ -0,0 +1,4 @@ | |||
- | |||
id: 1 | |||
repo_id: 1 | |||
index: 1 |
@@ -0,0 +1,11 @@ | |||
- | |||
id: 1 | |||
uuid: a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11 | |||
issue_id: 1 | |||
release_id: 0 | |||
- | |||
id: 2 | |||
uuid: a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a12 | |||
issue_id: 0 | |||
release_id: 1 |
@@ -0,0 +1,3 @@ | |||
- | |||
id: 1 | |||
repo_id: 1 |
@@ -0,0 +1,3 @@ | |||
- | |||
id: 1 | |||
repo_id: 1 |
@@ -15,7 +15,6 @@ func Test_AddRepoIDForAttachment(t *testing.T) { | |||
type Attachment struct { | |||
ID int64 `xorm:"pk autoincr"` | |||
UUID string `xorm:"uuid UNIQUE"` | |||
RepoID int64 `xorm:"INDEX"` // this should not be zero | |||
IssueID int64 `xorm:"INDEX"` // maybe zero when creating | |||
ReleaseID int64 `xorm:"INDEX"` // maybe zero when creating | |||
UploaderID int64 `xorm:"INDEX DEFAULT 0"` | |||
@@ -44,12 +43,21 @@ func Test_AddRepoIDForAttachment(t *testing.T) { | |||
return | |||
} | |||
var issueAttachments []*Attachment | |||
err := x.Where("issue_id > 0").Find(&issueAttachments) | |||
type NewAttachment struct { | |||
ID int64 `xorm:"pk autoincr"` | |||
UUID string `xorm:"uuid UNIQUE"` | |||
RepoID int64 `xorm:"INDEX"` // this should not be zero | |||
IssueID int64 `xorm:"INDEX"` // maybe zero when creating | |||
ReleaseID int64 `xorm:"INDEX"` // maybe zero when creating | |||
UploaderID int64 `xorm:"INDEX DEFAULT 0"` | |||
} | |||
var issueAttachments []*NewAttachment | |||
err := x.Table("attachment").Where("issue_id > 0").Find(&issueAttachments) | |||
assert.NoError(t, err) | |||
for _, attach := range issueAttachments { | |||
assert.Greater(t, attach.RepoID, 0) | |||
assert.Greater(t, attach.IssueID, 0) | |||
assert.Greater(t, attach.RepoID, int64(0)) | |||
assert.Greater(t, attach.IssueID, int64(0)) | |||
var issue Issue | |||
has, err := x.ID(attach.IssueID).Get(&issue) | |||
assert.NoError(t, err) | |||
@@ -57,12 +65,12 @@ func Test_AddRepoIDForAttachment(t *testing.T) { | |||
assert.EqualValues(t, attach.RepoID, issue.RepoID) | |||
} | |||
var releaseAttachments []*Attachment | |||
err = x.Where("release_id > 0").Find(&releaseAttachments) | |||
var releaseAttachments []*NewAttachment | |||
err = x.Table("attachment").Where("release_id > 0").Find(&releaseAttachments) | |||
assert.NoError(t, err) | |||
for _, attach := range releaseAttachments { | |||
assert.Greater(t, attach.RepoID, 0) | |||
assert.Greater(t, attach.IssueID, 0) | |||
assert.Greater(t, attach.RepoID, int64(0)) | |||
assert.Greater(t, attach.ReleaseID, int64(0)) | |||
var release Release | |||
has, err := x.ID(attach.ReleaseID).Get(&release) | |||
assert.NoError(t, err) |