Thanks to visit codestin.com
Credit goes to github.com

Skip to content

test: Cancel pending jobs in RQ tests (backport #32970) #32994

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
Merged
merged 2 commits into from
Jul 8, 2025
Merged

test: Cancel pending jobs in RQ tests (backport #32970) #32994

merged 2 commits into from
Jul 8, 2025

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 18, 2025

This causes flake sometimes when other tests don't cleanup long running pending jobs.

This is an automatic backport of pull request #32970 done by [Mergify](https://mergify.com).

@ankush @mergify
test: Cancel pending jobs in RQ tests (#32970)
c58ad35 
This casues flake sometimes when other tests don't cleanup long running
pending jobs.

(cherry picked from commit 7e2b495)

# Conflicts:
#	frappe/core/doctype/rq_job/test_rq_job.py
@mergify mergify bot added the conflicts label Jun 18, 2025
@mergify mergify bot assigned ankush Jun 18, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jun 18, 2025

Cherry-pick of 7e2b495 has failed:

On branch mergify/bp/version-14-hotfix/pr-32970
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit 7e2b4955f8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/core/doctype/rq_job/rq_job.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/rq_job/test_rq_job.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ankush ankush force-pushed the mergify/bp/version-14-hotfix/pr-32970 branch from a72b8fa to c93844d Compare July 8, 2025 04:25
@ankush ankush merged commit 57fbc9d into version-14-hotfix Jul 8, 2025
8 of 9 checks passed
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-32970 branch July 8, 2025 04:45
@frappe-pr-bot
Copy link
Collaborator

frappe-pr-bot commented Jul 8, 2025

🎉 This PR is included in version 14.96.12 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 23, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

@ankush ankush

Labels

conflicts released

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@frappe-pr-bot @ankush