This repository has been archived on 2024-01-04. You can view files and clone it, but cannot push or open issues or pull requests.
forgejo/integrations
zeripath a97c8a8966
Attempt to prevent intermittent failure TestGit/xxx/BranchProtectMerge/MergePR (#18451) (#18619)
Backport #18451

One of the repeated intermittent failures we see in testing is a failure due to
branches not being ready to merge.

Prior to the immediate queue implementation we would attempt to flush all the queues
and this would prevent the issue. However, the immediate queue is not flushable so
the flushall is not successful at preventing this.

This PR proposes an alternative solution - wait some time and try again up to 5 times.

If this fails then there is a genuine issue and we should fail.

Related #17719

Signed-off-by: Andrew Thornton <art27@cantab.net>
2022-02-05 20:49:53 +00:00
..
gitea-repositories-meta
migration-test
admin_user_test.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
api_admin_org_test.go
api_admin_test.go
api_branch_test.go Fix Benchmark tests, remove a broken one & add two new (#15250) 2021-04-16 20:30:16 +02:00
api_comment_test.go Add API to get issue/pull comments and events (timeline) (#17403) 2022-01-01 22:12:25 +08:00
api_fork_test.go
api_gpg_keys_test.go
api_helper_for_declarative_test.go Attempt to prevent intermittent failure TestGit/xxx/BranchProtectMerge/MergePR (#18451) (#18619) 2022-02-05 20:49:53 +00:00
api_issue_label_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
api_issue_milestone_test.go
api_issue_reaction_test.go
api_issue_stopwatch_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
api_issue_subscription_test.go
api_issue_test.go
api_issue_tracked_time_test.go
api_keys_test.go
api_nodeinfo_test.go
api_notification_test.go
api_oauth2_apps_test.go
api_org_test.go
api_private_serv_test.go
api_pull_commits_test.go
api_pull_review_test.go
api_pull_test.go
api_releases_test.go
api_repo_archive_test.go
api_repo_edit_test.go
api_repo_file_create_test.go
api_repo_file_delete_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
api_repo_file_helpers.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
api_repo_file_update_test.go
api_repo_get_contents_list_test.go
api_repo_get_contents_test.go
api_repo_git_blobs_test.go
api_repo_git_commits_test.go Add API to get file commit history (#17652) 2021-12-22 06:17:33 +00:00
api_repo_git_hook_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
api_repo_git_notes_test.go
api_repo_git_ref_test.go
api_repo_git_tags_test.go
api_repo_git_trees_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
api_repo_languages_test.go
api_repo_lfs_locks_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
api_repo_lfs_migrate_test.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
api_repo_lfs_test.go Fix continuance tests (#18027) 2021-12-20 22:12:27 -05:00
api_repo_raw_test.go
api_repo_tags_test.go
api_repo_teams_test.go
api_repo_test.go
api_repo_topic_test.go
api_settings_test.go
api_team_test.go
api_team_user_test.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
api_token_test.go
api_user_email_test.go
api_user_heatmap_test.go
api_user_org_perm_test.go
api_user_orgs_test.go
api_user_search_test.go
api_wiki_test.go
attachment_test.go
auth_ldap_test.go
benchmarks_test.go
branches_test.go
change_default_branch_test.go
cmd_keys_test.go
compare_test.go
cors_test.go
create_no_session_test.go
delete_user_test.go Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
download_test.go
dump_restore_test.go
editor_test.go
empty_repo_test.go
eventsource_test.go
explore_repos_test.go
git_clone_wiki_test.go
git_helper_for_declarative_test.go
git_smart_http_test.go
git_test.go
goget_test.go A better go code formatter, and now make fmt can run in Windows (#17684) 2021-11-17 20:34:35 +08:00
gpg_git_test.go
html_helper.go
integration_test.go
issue_test.go
lfs_getobject_test.go
lfs_local_endpoint_test.go
links_test.go Instead of using routerCtx just escape the url before routing (#18086) 2021-12-25 00:50:49 +08:00
migrate_test.go
mirror_pull_test.go
mirror_push_test.go
mssql.ini.tmpl
mysql.ini.tmpl Use immediate queues in integration tests and ensure that immediate (#16927) 2021-09-03 11:20:57 +01:00
mysql8.ini.tmpl
nonascii_branches_test.go
oauth_test.go
org_count_test.go
org_test.go Team permission allow different unit has different permission (#17811) 2022-01-05 11:37:00 +08:00
pgsql.ini.tmpl Use immediate queues in integration tests and ensure that immediate (#16927) 2021-09-03 11:20:57 +01:00
private-testing.key
privateactivity_test.go
pull_compare_test.go
pull_create_test.go Frontend refactor, PascalCase to camelCase, remove unused code (#17365) 2021-10-21 15:37:43 +08:00
pull_merge_test.go
pull_review_test.go
pull_status_test.go
pull_update_test.go
README.md
README_ZH.md
release_test.go
rename_branch_test.go
repo_activity_test.go
repo_branch_test.go
repo_commits_search_test.go
repo_commits_test.go
repo_fork_test.go
repo_generate_test.go
repo_migrate_test.go
repo_search_test.go
repo_tag_test.go
repo_test.go
repo_watch_test.go
repofiles_delete_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
repofiles_update_test.go
setting_test.go
signin_test.go
signout_test.go
signup_test.go
sqlite.ini.tmpl
ssh_key_test.go
testlogger.go
timetracking_test.go
user_avatar_test.go
user_test.go
version_test.go
view_test.go
xss_test.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00

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