Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix queue test #30646

Merged
merged 2 commits into from
Apr 22, 2024
Merged

Fix queue test #30646

merged 2 commits into from
Apr 22, 2024

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Apr 22, 2024 •
edited
Loading

Fix #30643

The old test code is not stable due to the data-race described in the TODO added at that time.

Make it stable, and remove a debug-only field from old test code.

Without the key code, the test fails with:

=== RUN   TestWorkerPoolQueueWorkerIdleReset
    workerqueue_test.go:283: 
        	Error Trace:	/Users/xiaoguang/work/gitea/modules/queue/workerqueue_test.go:283
        	Error:      	Should be false
        	Test:       	TestWorkerPoolQueueWorkerIdleReset
        	Messages:   	a slow handler should not block other workers from starting
--- FAIL: TestWorkerPoolQueueWorkerIdleReset (0.56s)

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 22, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 22, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Apr 22, 2024
@wxiaoguang wxiaoguang mentioned this pull request Apr 22, 2024
Closed
@wxiaoguang wxiaoguang added the backport/v1.21 This PR should be backported to Gitea 1.21 label Apr 22, 2024
@wxiaoguang wxiaoguang added this to the 1.23.0 milestone Apr 22, 2024
@wxiaoguang wxiaoguang added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Apr 22, 2024
@silverwind
Copy link
Member

No 1.22 backport?

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 22, 2024
@wxiaoguang
Copy link
Contributor Author

No 1.22 backport?

1.22 is totally broken, some other backports are also missing like #30417

That's why I have explained many times about restarting the 1.22 release from main branch.

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 22, 2024
@wxiaoguang wxiaoguang enabled auto-merge (squash) April 22, 2024 23:29
@wxiaoguang wxiaoguang merged commit e610395 into go-gitea:main Apr 22, 2024
26 checks passed
@GiteaBot
Copy link
Collaborator

I was unable to create a backport for 1.21. @wxiaoguang, please send one manually. 🍵

go run ./contrib/backport 30646
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Apr 22, 2024
@wxiaoguang wxiaoguang deleted the fix-queue-test branch April 23, 2024 00:09
wxiaoguang added a commit to wxiaoguang/gitea that referenced this pull request Apr 23, 2024
@wxiaoguang
Fix queue test (go-gitea#30646)
a34d77d 
Fix go-gitea#30643

The old test code is not stable due to the data-race described in the
TODO added at that time.

Make it stable, and remove a debug-only field from old test code.
@wxiaoguang wxiaoguang mentioned this pull request Apr 23, 2024
Merged
@wxiaoguang wxiaoguang added the backport/done All backports for this PR have been created label Apr 23, 2024
wxiaoguang added a commit that referenced this pull request Apr 23, 2024
@wxiaoguang
Fix queue test (#30646) (#30650)
32f895f 
Backport #30553 and #30646
silverwind added a commit to silverwind/gitea that referenced this pull request Apr 23, 2024
@silverwind
Merge remote-tracking branch 'origin/main' into notext
453c63d 
* origin/main:
  Interpolate runs-on with variables when scheduling tasks (go-gitea#30640)
  Initial support for colorblindness-friendly themes (go-gitea#30625)
  Fix flash message for flex-container (go-gitea#30657)
  Perform Newest sort type correctly when sorting issues (go-gitea#30644)
  Fix project name wrapping, remove horizontal margin on header (go-gitea#30631)
  Add a db consistency check to remove runners that do not belong to a repository (go-gitea#30614)
  Fix wrong table name (go-gitea#30557)
  Fix compare api swagger (go-gitea#30648)
  [skip ci] Updated translations via Crowdin
  Fix queue test (go-gitea#30646)
  Enable jquery-related eslint rules that have no violations (go-gitea#30632)
  Enable more `revive` linter rules (go-gitea#30608)
  Remove obsolete CSS text classes (go-gitea#30576)
  Hide diff stats on empty PRs (go-gitea#30629)
  [skip ci] Updated licenses and gitignores
  Use correct hash for "git update-index" (go-gitea#30626)
  Fix repo home UI when there is no repo description (go-gitea#30552)
  Fix dropdown text ellipsis (go-gitea#30628)
  fix(api): refactor branch and tag existence checks (go-gitea#30618)
  Add --skip-db option to dump command (go-gitea#30613)
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 24, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
4b88f93 
* giteaofficial/main:
  Fix a panic bug when head repository deleting (go-gitea#30674)
  Fix some bug on migrations (go-gitea#30647)
  Fix checkbox field markup (go-gitea#30666)
  Avoid doubled border for the PR info segment (go-gitea#30663)
  Interpolate runs-on with variables when scheduling tasks (go-gitea#30640)
  Initial support for colorblindness-friendly themes (go-gitea#30625)
  Fix flash message for flex-container (go-gitea#30657)
  Perform Newest sort type correctly when sorting issues (go-gitea#30644)
  Fix project name wrapping, remove horizontal margin on header (go-gitea#30631)
  Add a db consistency check to remove runners that do not belong to a repository (go-gitea#30614)
  Fix wrong table name (go-gitea#30557)
  Fix compare api swagger (go-gitea#30648)
  [skip ci] Updated translations via Crowdin
  Fix queue test (go-gitea#30646)
  Enable jquery-related eslint rules that have no violations (go-gitea#30632)
  Enable more `revive` linter rules (go-gitea#30608)
  Remove obsolete CSS text classes (go-gitea#30576)
  Hide diff stats on empty PRs (go-gitea#30629)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code size/M Denotes a PR that changes 30-99 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.

Flake test: TestWorkerPoolQueueWorkerIdleReset
5 participants
@wxiaoguang @silverwind @GiteaBot @lunny @delvh