You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
forgejo/integrations
kolaente 59b30f060a
Auto merge pull requests when all checks succeeded via API (#9307)
* Fix indention

Signed-off-by: kolaente <k@knt.li>

* Add option to merge a pr right now without waiting for the checks to succeed

Signed-off-by: kolaente <k@knt.li>

* Fix lint

Signed-off-by: kolaente <k@knt.li>

* Add scheduled pr merge to tables used for testing

Signed-off-by: kolaente <k@knt.li>

* Add status param to make GetPullRequestByHeadBranch reusable

Signed-off-by: kolaente <k@knt.li>

* Move "Merge now" to a seperate button to make the ui clearer

Signed-off-by: kolaente <k@knt.li>

* Update models/scheduled_pull_request_merge.go

Co-authored-by: 赵智超 <1012112796@qq.com>

* Update web_src/js/index.js

Co-authored-by: 赵智超 <1012112796@qq.com>

* Update web_src/js/index.js

Co-authored-by: 赵智超 <1012112796@qq.com>

* Re-add migration after merge

* Fix frontend lint

* Fix version compare

* Add vendored dependencies

* Add basic tets

* Make sure the api route is capable of scheduling PRs for merging

* Fix comparing version

* make vendor

* adopt refactor

* apply suggestion: User -> Doer

* init var once

* Fix Test

* Update templates/repo/issue/view_content/comments.tmpl

* adopt

* nits

* next

* code format

* lint

* use same name schema; rm CreateUnScheduledPRToAutoMergeComment

* API: can not create schedule twice

* Add TestGetBranchNamesForSha

* nits

* new go routine for each pull to merge

* Update models/pull.go

Co-authored-by: a1012112796 <1012112796@qq.com>

* Update models/scheduled_pull_request_merge.go

Co-authored-by: a1012112796 <1012112796@qq.com>

* fix & add renaming sugestions

* Update services/automerge/pull_auto_merge.go

Co-authored-by: a1012112796 <1012112796@qq.com>

* fix conflict relicts

* apply latest refactors

* fix: migration after merge

* Update models/error.go

Co-authored-by: delvh <dev.lh@web.de>

* Update options/locale/locale_en-US.ini

Co-authored-by: delvh <dev.lh@web.de>

* Update options/locale/locale_en-US.ini

Co-authored-by: delvh <dev.lh@web.de>

* adapt latest refactors

* fix test

* use more context

* skip potential edgecases

* document func usage

* GetBranchNamesForSha() -> GetRefsBySha()

* start refactoring

* ajust to new changes

* nit

* docu nit

* the great check move

* move checks for branchprotection into own package

* resolve todo now ...

* move & rename

* unexport if posible

* fix

* check if merge is allowed before merge on scheduled pull

* debugg

* wording

* improve SetDefaults & nits

* NotAllowedToMerge -> DisallowedToMerge

* fix test

* merge files

* use package "errors"

* merge files

* add string names

* other implementation for gogit

* adapt refactor

* more context for models/pull.go

* GetUserRepoPermission use context

* more ctx

* use context for loading pull head/base-repo

* more ctx

* more ctx

* models.LoadIssueCtx()

* models.LoadIssueCtx()

* Handle pull_service.Merge in one DB transaction

* add TODOs

* next

* next

* next

* more ctx

* more ctx

* Start refactoring structure of old pull code ...

* move code into new packages

* shorter names ... and finish **restructure**

* Update models/branches.go

Co-authored-by: zeripath <art27@cantab.net>

* finish UpdateProtectBranch

* more and fix

* update datum

* template: use "svg" helper

* rename prQueue 2 prPatchCheckerQueue

* handle automerge in queue

* lock pull on git&db actions ...

* lock pull on git&db actions ...

* add TODO notes

* the regex

* transaction in tests

* GetRepositoryByIDCtx

* shorter table name and lint fix

* close transaction bevore notify

* Update models/pull.go

* next

* CheckPullMergable check all branch protections!

* Update routers/web/repo/pull.go

* CheckPullMergable check all branch protections!

* Revert "PullService lock via pullID (#19520)" (for now...)

This reverts commit 6cde7c9159a5ea75a10356feb7b8c7ad4c434a9a.

* Update services/pull/check.go

* Use for a repo action one database transaction

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: delvh <dev.lh@web.de>

* Update services/issue/status.go

Co-authored-by: delvh <dev.lh@web.de>

* Update services/issue/status.go

Co-authored-by: delvh <dev.lh@web.de>

* use db.WithTx()

* gofmt

* make pr.GetDefaultMergeMessage() context aware

* make MergePullRequestForm.SetDefaults context aware

* use db.WithTx()

* pull.SetMerged only with context

* fix deadlock in `test-sqlite\#TestAPIBranchProtection`

* dont forget templates

* db.WithTx allow to set the parentCtx

* handle db transaction in service packages but not router

* issue_service.ChangeStatus just had caused another deadlock :/
it has to do something with how notification package is handled

* if we merge a pull in one database transaktion, we get a lock, because merge infoce internal api that cant handle open db sessions to the same repo

* ajust to current master

* Apply suggestions from code review

Co-authored-by: delvh <dev.lh@web.de>

* dont open db transaction in router

* make generate-swagger

* one _success less

* wording nit

* rm

* adapt

* remove not needed test files

* rm less diff & use attr in JS

* ...

* Update services/repository/files/commit.go

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

* ajust db schema for PullAutoMerge

* skip broken pull refs

* more context in error messages

* remove webUI part for another pull

* remove more WebUI only parts

* API: add CancleAutoMergePR

* Apply suggestions from code review

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

* fix lint

* Apply suggestions from code review

* cancle -> cancel

Co-authored-by: delvh <dev.lh@web.de>

* change queue identifyer

* fix swagger

* prevent nil issue

* fix and dont drop error

* as per @zeripath

* Update integrations/git_test.go

Co-authored-by: delvh <dev.lh@web.de>

* Update integrations/git_test.go

Co-authored-by: delvh <dev.lh@web.de>

* more declarative integration tests (dedup code)

* use assert.False/True helper

Co-authored-by: 赵智超 <1012112796@qq.com>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
2 years ago
..
gitea-repositories-meta rm .sample hooks which aren't used (#19101) 2 years ago
migration-test Remove legacy `unknwon/com` package (#19298) 2 years ago
README.md Fix various typos of software names (#18083) 3 years ago
README_ZH.md upgrade postgres refrence to 14 (#19416) 2 years ago
admin_user_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
api_admin_org_test.go format with gofumpt (#18184) 2 years ago
api_admin_test.go Move keys to models/asymkey (#17917) 3 years ago
api_branch_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
api_comment_test.go format with gofumpt (#18184) 2 years ago
api_fork_test.go Fix "data race" in testlogger (#9159) 5 years ago
api_gpg_keys_test.go format with gofumpt (#18184) 2 years ago
api_helper_for_declarative_test.go Auto merge pull requests when all checks succeeded via API (#9307) 2 years ago
api_issue_label_test.go format with gofumpt (#18184) 2 years ago
api_issue_milestone_test.go Move milestone to models/issues/ (#19278) 2 years ago
api_issue_reaction_test.go Move milestone to models/issues/ (#19278) 2 years ago
api_issue_stopwatch_test.go Move milestone to models/issues/ (#19278) 2 years ago
api_issue_subscription_test.go format with gofumpt (#18184) 2 years ago
api_issue_test.go Remove dependent on session auth for api/v1 routers (#19321) 2 years ago
api_issue_tracked_time_test.go Move milestone to models/issues/ (#19278) 2 years ago
api_keys_test.go Move keys to models/asymkey (#17917) 3 years ago
api_nodeinfo_test.go Federation: return useful statistic information for nodeinfo (#19561) 2 years ago
api_notification_test.go format with gofumpt (#18184) 2 years ago
api_oauth2_apps_test.go Use `CryptoRandomBytes` instead of `CryptoRandomString` (#18439) 2 years ago
api_org_test.go Remove dependent on session auth for api/v1 routers (#19321) 2 years ago
api_packages_composer_test.go Add Package Registry (#16510) 2 years ago
api_packages_conan_test.go Add Package Registry (#16510) 2 years ago
api_packages_container_test.go Add Package Registry (#16510) 2 years ago
api_packages_generic_test.go Add Package Registry (#16510) 2 years ago
api_packages_helm_test.go Add Helm Chart registry (#19406) 2 years ago
api_packages_maven_test.go Add Package Registry (#16510) 2 years ago
api_packages_npm_test.go Add Package Registry (#16510) 2 years ago
api_packages_nuget_test.go Add Package Registry (#16510) 2 years ago
api_packages_pypi_test.go Add Package Registry (#16510) 2 years ago
api_packages_rubygems_test.go Add Package Registry (#16510) 2 years ago
api_packages_test.go Hide private repositories in packages (#19584) 2 years ago
api_private_serv_test.go Fix the bug: deploy key with write access can not push (#19010) 2 years ago
api_pull_commits_test.go Move repository model into models/repo (#17933) 3 years ago
api_pull_review_test.go format with gofumpt (#18184) 2 years ago
api_pull_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
api_releases_test.go Remove dependent on session auth for api/v1 routers (#19321) 2 years ago
api_repo_archive_test.go Move repository model into models/repo (#17933) 3 years ago
api_repo_collaborator_test.go Add API to query collaborators permission for a repository (#18761) 2 years ago
api_repo_edit_test.go format with gofumpt (#18184) 2 years ago
api_repo_file_create_test.go Make git.OpenRepository accept Context (#19260) 2 years ago
api_repo_file_delete_test.go Move repository model into models/repo (#17933) 3 years ago
api_repo_file_helpers.go Propagate context and ensure git commands run in request context (#17868) 2 years ago
api_repo_file_update_test.go Make git.OpenRepository accept Context (#19260) 2 years ago
api_repo_get_contents_list_test.go Make git.OpenRepository accept Context (#19260) 2 years ago
api_repo_get_contents_test.go Make git.OpenRepository accept Context (#19260) 2 years ago
api_repo_git_blobs_test.go Move repository model into models/repo (#17933) 3 years ago
api_repo_git_commits_test.go format with gofumpt (#18184) 2 years ago
api_repo_git_hook_test.go Move repository model into models/repo (#17933) 3 years ago
api_repo_git_notes_test.go Move user related model into models/user (#17781) 3 years ago
api_repo_git_ref_test.go Move user related model into models/user (#17781) 3 years ago
api_repo_git_tags_test.go Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280) 2 years ago
api_repo_git_trees_test.go Move repository model into models/repo (#17933) 3 years ago
api_repo_languages_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
api_repo_lfs_locks_test.go format with gofumpt (#18184) 2 years ago
api_repo_lfs_migrate_test.go Move user related model into models/user (#17781) 3 years ago
api_repo_lfs_test.go Fix continuance tests (#18027) 3 years ago
api_repo_raw_test.go Move user related model into models/user (#17781) 3 years ago
api_repo_tags_test.go Simplify parameter types (#18006) 3 years ago
api_repo_teams_test.go Move organization related structs into sub package (#18518) 2 years ago
api_repo_test.go An attempt to sync a non-mirror repo must give 400 (Bad Request) (#19300) 2 years ago
api_repo_topic_test.go Remove dependent on session auth for api/v1 routers (#19321) 2 years ago
api_settings_test.go Make mirror feature more configurable (#16957) 3 years ago
api_team_test.go Add API to check if team has repo access (#19540) 2 years ago
api_team_user_test.go Move user related model into models/user (#17781) 3 years ago
api_token_test.go Move user related model into models/user (#17781) 3 years ago
api_user_email_test.go Don't panic on `ErrEmailInvalid` (#19441) 2 years ago
api_user_heatmap_test.go Remove dependent on session auth for api/v1 routers (#19321) 2 years ago
api_user_org_perm_test.go Add `ContextUser` to http request context (#18798) 2 years ago
api_user_orgs_test.go format with gofumpt (#18184) 2 years ago
api_user_search_test.go Move user related model into models/user (#17781) 3 years ago
api_wiki_test.go Add API to get/edit wiki (#17278) 3 years ago
attachment_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
auth_ldap_test.go Remove legacy unmaintained packages, refactor to support change default locale (#19308) 2 years ago
benchmarks_test.go format with gofumpt (#18184) 2 years ago
branches_test.go Remove legacy unmaintained packages, refactor to support change default locale (#19308) 2 years ago
change_default_branch_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
cmd_keys_test.go format with gofumpt (#18184) 2 years ago
compare_test.go Allow default branch to be inferred on compare page (#17908) 3 years ago
cors_test.go Fix "data race" in testlogger (#9159) 5 years ago
create_no_session_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
csrf_test.go Refactor CSRF protection modules, make sure CSRF tokens can be up-to-date. (#19337) 2 years ago
delete_user_test.go Move organization related structs into sub package (#18518) 2 years ago
download_test.go A better go code formatter, and now `make fmt` can run in Windows (#17684) 3 years ago
dump_restore_test.go Add Index to comment for migrations and mirroring (#18806) 2 years ago
editor_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
empty_repo_test.go Move repository model into models/repo (#17933) 3 years ago
eventsource_test.go format with gofumpt (#18184) 2 years ago
explore_repos_test.go Fix "data race" in testlogger (#9159) 5 years ago
git_clone_wiki_test.go Unexport git.GlobalCommandArgs (#18376) 2 years ago
git_helper_for_declarative_test.go Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280) 2 years ago
git_smart_http_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
git_test.go Auto merge pull requests when all checks succeeded via API (#9307) 2 years ago
goget_test.go Refactor legacy `unknwon/com` package, improve golangci lint (#19284) 2 years ago
gpg_git_test.go format with gofumpt (#18184) 2 years ago
html_helper.go Frontend refactor, PascalCase to camelCase, remove unused code (#17365) 3 years ago
integration_test.go Unset git author/committer variables when running integration tests (#19512) 2 years ago
issue_test.go Remove dependent on session auth for api/v1 routers (#19321) 2 years ago
lfs_getobject_test.go Move repository model into models/repo (#17933) 3 years ago
lfs_local_endpoint_test.go format with gofumpt (#18184) 2 years ago
links_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
migrate_test.go Move user related model into models/user (#17781) 3 years ago
mirror_pull_test.go A pull-mirror repo should be marked as such on creation (#19295) 2 years ago
mirror_push_test.go Make git.OpenRepository accept Context (#19260) 2 years ago
mssql.ini.tmpl Ensure git tag tests and others create test repos in tmpdir (#18447) 2 years ago
mysql.ini.tmpl Ensure git tag tests and others create test repos in tmpdir (#18447) 2 years ago
mysql8.ini.tmpl Ensure git tag tests and others create test repos in tmpdir (#18447) 2 years ago
nonascii_branches_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
oauth_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
org_count_test.go Move organization related structs into sub package (#18518) 2 years ago
org_test.go Never use /api/v1 from Gitea UI Pages (#19318) 2 years ago
pgsql.ini.tmpl Ensure git tag tests and others create test repos in tmpdir (#18447) 2 years ago
private-testing.key Use non-expiring key. (#17984) 3 years ago
privateactivity_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
pull_compare_test.go Fix "data race" in testlogger (#9159) 5 years ago
pull_create_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
pull_merge_test.go Use for a repo action one database transaction (#19576) 2 years ago
pull_review_test.go Fix "data race" in testlogger (#9159) 5 years ago
pull_status_test.go Auto merge pull requests when all checks succeeded via API (#9307) 2 years ago
pull_update_test.go Make git.OpenRepository accept Context (#19260) 2 years ago
release_test.go Remove legacy unmaintained packages, refactor to support change default locale (#19308) 2 years ago
rename_branch_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
repo_activity_test.go format with gofumpt (#18184) 2 years ago
repo_branch_test.go Remove legacy unmaintained packages, refactor to support change default locale (#19308) 2 years ago
repo_commits_search_test.go Make TestCreateBranch and TestRepoCommitsSearch less noisy (#13471) 4 years ago
repo_commits_test.go Auto merge pull requests when all checks succeeded via API (#9307) 2 years ago
repo_fork_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
repo_generate_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
repo_migrate_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
repo_search_test.go Automatically pause queue if index service is unavailable (#15066) 2 years ago
repo_tag_test.go Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280) 2 years ago
repo_test.go Update JS dependencies (#19281) 2 years ago
repo_topic_test.go Refactor CSRF protection modules, make sure CSRF tokens can be up-to-date. (#19337) 2 years ago
repo_watch_test.go Some repository refactors (#17950) 3 years ago
repofiles_delete_test.go Renamed ctx.User to ctx.Doer. (#19161) 2 years ago
repofiles_update_test.go Make git.OpenRepository accept Context (#19260) 2 years ago
setting_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
signin_test.go Remove legacy unmaintained packages, refactor to support change default locale (#19308) 2 years ago
signout_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
signup_test.go Remove legacy unmaintained packages, refactor to support change default locale (#19308) 2 years ago
sqlite.ini.tmpl Ensure git tag tests and others create test repos in tmpdir (#18447) 2 years ago
ssh_key_test.go format with gofumpt (#18184) 2 years ago
testlogger.go migrations: add test for importing pull requests in gitea uploader (#18752) 2 years ago
timetracking_test.go format with gofumpt (#18184) 2 years ago
user_avatar_test.go Update HTTP status codes to modern codes (#18063) 2 years ago
user_test.go Never use /api/v1 from Gitea UI Pages (#19318) 2 years ago
version_test.go Fix "data race" in testlogger (#9159) 5 years ago
view_test.go Display SVG files as images instead of text (#14101) 4 years ago
xss_test.go Update HTTP status codes to modern codes (#18063) 2 years ago

README.md

Integrations tests

Integration tests can be run with make commands for the appropriate backends, namely:

make test-mysql
make test-pgsql
make test-sqlite

Make sure to perform a clean build before running tests:

make clean build

Run all tests via local drone

drone exec --local --build-event "pull_request"

Run sqlite integrations tests

Start tests

make test-sqlite

Run MySQL integrations tests

Setup a MySQL database inside docker

docker run -e "MYSQL_DATABASE=test" -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -p 3306:3306 --rm --name mysql mysql:latest #(just ctrl-c to stop db and clean the container)
docker run -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" --rm --name elasticsearch elasticsearch:7.6.0 #(in a second terminal, just ctrl-c to stop db and clean the container)

Start tests based on the database container

TEST_MYSQL_HOST=localhost:3306 TEST_MYSQL_DBNAME=test TEST_MYSQL_USERNAME=root TEST_MYSQL_PASSWORD='' make test-mysql

Run pgsql integrations tests

Setup a pgsql database inside docker

docker run -e "POSTGRES_DB=test" -p 5432:5432 --rm --name pgsql postgres:latest #(just ctrl-c to stop db and clean the container)

Start tests based on the database container

TEST_PGSQL_HOST=localhost:5432 TEST_PGSQL_DBNAME=test TEST_PGSQL_USERNAME=postgres TEST_PGSQL_PASSWORD=postgres make test-pgsql

Run mssql integrations tests

Setup a mssql database inside docker

docker run -e "ACCEPT_EULA=Y" -e "MSSQL_PID=Standard" -e "SA_PASSWORD=MwantsaSecurePassword1" -p 1433:1433 --rm --name mssql microsoft/mssql-server-linux:latest #(just ctrl-c to stop db and clean the container)

Start tests based on the database container

TEST_MSSQL_HOST=localhost:1433 TEST_MSSQL_DBNAME=gitea_test TEST_MSSQL_USERNAME=sa TEST_MSSQL_PASSWORD=MwantsaSecurePassword1 make test-mssql

Running individual tests

Example command to run GPG test:

For SQLite:

make test-sqlite#GPG

For other databases(replace mssql to mysql, mysql8 or pgsql):

TEST_MSSQL_HOST=localhost:1433 TEST_MSSQL_DBNAME=test TEST_MSSQL_USERNAME=sa TEST_MSSQL_PASSWORD=MwantsaSecurePassword1 make test-mssql#GPG

Setting timeouts for declaring long-tests and long-flushes

We appreciate that some testing machines may not be very powerful and the default timeouts for declaring a slow test or a slow clean-up flush may not be appropriate.

You can either:

  • Within the test ini file set the following section:
[integration-tests]
SLOW_TEST = 10s ; 10s is the default value
SLOW_FLUSH = 5S ; 5s is the default value
  • Set the following environment variables:
GITEA_SLOW_TEST_TIME="10s" GITEA_SLOW_FLUSH_TIME="5s" make test-sqlite