1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-22 08:42:32 -05:00
forgejo/integrations
zeripath 2ad74a503d
Attempt to prevent intermittent failure TestGit/xxx/BranchProtectMerge/MergePR (#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-01-29 15:35:36 +00:00
..
gitea-repositories-meta Prevent double decoding of % in url params (#17997) 2021-12-16 17:40:18 +00:00
migration-test format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
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 format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
api_admin_test.go Move keys to models/asymkey (#17917) 2021-12-10 16:14:24 +08:00
api_branch_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
api_comment_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
api_fork_test.go Fix "data race" in testlogger (#9159) 2019-11-26 01:21:37 +02:00
api_gpg_keys_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
api_helper_for_declarative_test.go Attempt to prevent intermittent failure TestGit/xxx/BranchProtectMerge/MergePR (#18451) 2022-01-29 15:35:36 +00:00
api_issue_label_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
api_issue_milestone_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
api_issue_reaction_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
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 format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
api_issue_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
api_issue_tracked_time_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
api_keys_test.go Move keys to models/asymkey (#17917) 2021-12-10 16:14:24 +08:00
api_nodeinfo_test.go api: integration test for nodeinfo (#17346) 2021-10-18 01:36:56 -04:00
api_notification_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
api_oauth2_apps_test.go Refactor auth package (#17962) 2022-01-02 21:12:35 +08:00
api_org_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
api_private_serv_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
api_pull_commits_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
api_pull_review_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
api_pull_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
api_releases_test.go Handle invalid issues (#18111) 2021-12-28 21:28:27 +08:00
api_repo_archive_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
api_repo_edit_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
api_repo_file_create_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
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 Propagate context and ensure git commands run in request context (#17868) 2022-01-19 23:26:57 +00:00
api_repo_file_update_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
api_repo_get_contents_list_test.go Propagate context and ensure git commands run in request context (#17868) 2022-01-19 23:26:57 +00:00
api_repo_get_contents_test.go Propagate context and ensure git commands run in request context (#17868) 2022-01-19 23:26:57 +00:00
api_repo_git_blobs_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
api_repo_git_commits_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01: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 Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
api_repo_git_ref_test.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
api_repo_git_tags_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
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 give gitea time to calculate language stats (#11812) 2020-06-08 20:15:45 -04:00
api_repo_lfs_locks_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01: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 Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
api_repo_tags_test.go Simplify parameter types (#18006) 2021-12-20 04:41:31 +00:00
api_repo_teams_test.go Team permission allow different unit has different permission (#17811) 2022-01-05 11:37:00 +08:00
api_repo_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
api_repo_topic_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
api_settings_test.go Make mirror feature more configurable (#16957) 2021-09-07 17:49:36 +02:00
api_team_test.go Team permission allow different unit has different permission (#17811) 2022-01-05 11:37:00 +08:00
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 Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
api_user_email_test.go Always store primary email address into email_address table and also the state (#15956) 2021-06-08 11:52:51 +08:00
api_user_heatmap_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
api_user_org_perm_test.go A better go code formatter, and now make fmt can run in Windows (#17684) 2021-11-17 20:34:35 +08:00
api_user_orgs_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
api_user_search_test.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
api_wiki_test.go Add API to get/edit wiki (#17278) 2021-10-25 11:43:40 +08:00
attachment_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
auth_ldap_test.go Refactor: Move login out of models (#16199) 2021-07-24 11:16:34 +01:00
benchmarks_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
branches_test.go Frontend refactor, PascalCase to camelCase, remove unused code (#17365) 2021-10-21 15:37:43 +08:00
change_default_branch_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
cmd_keys_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
compare_test.go Allow default branch to be inferred on compare page (#17908) 2021-12-06 11:04:07 -06:00
cors_test.go Fix "data race" in testlogger (#9159) 2019-11-26 01:21:37 +02:00
create_no_session_test.go refactor: move from io/ioutil to io and os package (#17109) 2021-09-22 13:38:34 +08:00
delete_user_test.go Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
download_test.go A better go code formatter, and now make fmt can run in Windows (#17684) 2021-11-17 20:34:35 +08:00
dump_restore_test.go Validate migration files (#18203) 2022-01-26 10:45:51 +01:00
editor_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
empty_repo_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
eventsource_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
explore_repos_test.go Fix "data race" in testlogger (#9159) 2019-11-26 01:21:37 +02:00
git_clone_wiki_test.go Unexport git.GlobalCommandArgs (#18376) 2022-01-25 18:15:58 +00:00
git_helper_for_declarative_test.go Unexport git.GlobalCommandArgs (#18376) 2022-01-25 18:15:58 +00:00
git_smart_http_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
git_test.go Unexport git.GlobalCommandArgs (#18376) 2022-01-25 18:15:58 +00:00
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 format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
html_helper.go Frontend refactor, PascalCase to camelCase, remove unused code (#17365) 2021-10-21 15:37:43 +08:00
integration_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
issue_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
lfs_getobject_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
lfs_local_endpoint_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
links_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
migrate_test.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
mirror_pull_test.go Propagate context and ensure git commands run in request context (#17868) 2022-01-19 23:26:57 +00:00
mirror_push_test.go Fix continuance tests (#18027) 2021-12-20 22:12:27 -05:00
mssql.ini.tmpl Ensure git tag tests and others create test repos in tmpdir (#18447) 2022-01-29 12:41:44 +00:00
mysql.ini.tmpl Ensure git tag tests and others create test repos in tmpdir (#18447) 2022-01-29 12:41:44 +00:00
mysql8.ini.tmpl Ensure git tag tests and others create test repos in tmpdir (#18447) 2022-01-29 12:41:44 +00:00
nonascii_branches_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
oauth_test.go refactor: move from io/ioutil to io and os package (#17109) 2021-09-22 13:38:34 +08:00
org_count_test.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
org_test.go Team permission allow different unit has different permission (#17811) 2022-01-05 11:37:00 +08:00
pgsql.ini.tmpl Ensure git tag tests and others create test repos in tmpdir (#18447) 2022-01-29 12:41:44 +00:00
private-testing.key Use non-expiring key. (#17984) 2021-12-14 15:02:20 -05:00
privateactivity_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
pull_compare_test.go Fix "data race" in testlogger (#9159) 2019-11-26 01:21:37 +02:00
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 format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
pull_review_test.go Fix "data race" in testlogger (#9159) 2019-11-26 01:21:37 +02:00
pull_status_test.go Remove unnecessary variable assignments (#17695) 2021-11-18 09:33:06 +08:00
pull_update_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
README.md Fix various typos of software names (#18083) 2021-12-24 11:56:57 +08:00
README_ZH.md Bump postgres and mysql versions (#15710) 2021-05-21 18:11:48 -04:00
release_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
rename_branch_test.go Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
repo_activity_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
repo_branch_test.go Handle invalid issues (#18111) 2021-12-28 21:28:27 +08:00
repo_commits_search_test.go Make TestCreateBranch and TestRepoCommitsSearch less noisy (#13471) 2020-11-08 16:24:54 -05:00
repo_commits_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
repo_fork_test.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
repo_generate_test.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
repo_migrate_test.go A better go code formatter, and now make fmt can run in Windows (#17684) 2021-11-17 20:34:35 +08:00
repo_search_test.go Automatically pause queue if index service is unavailable (#15066) 2022-01-27 10:30:51 +02:00
repo_tag_test.go Propagate context and ensure git commands run in request context (#17868) 2022-01-19 23:26:57 +00:00
repo_test.go Fixed assert statements. (#16089) 2021-06-07 07:27:09 +02:00
repo_watch_test.go Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
repofiles_delete_test.go Propagate context and ensure git commands run in request context (#17868) 2022-01-19 23:26:57 +00:00
repofiles_update_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
setting_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
signin_test.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
signout_test.go Add NotFound handler (#18062) 2021-12-22 10:39:28 +00:00
signup_test.go Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
sqlite.ini.tmpl Ensure git tag tests and others create test repos in tmpdir (#18447) 2022-01-29 12:41:44 +00:00
ssh_key_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
testlogger.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
timetracking_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
user_avatar_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
user_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
version_test.go Fix "data race" in testlogger (#9159) 2019-11-26 01:21:37 +02:00
view_test.go Display SVG files as images instead of text (#14101) 2021-01-12 22:45:19 -05:00
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