8000 test: bg jobs test cleanup (backport #18767) by mergify[bot] · Pull Request #18805 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

test: bg jobs test cleanup (backport #18767) #18805

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
Nov 8, 2022
Merged

test: bg jobs test cleanup (backport #18767) #18805

merged 2 commits into from
Nov 8, 2022

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Nov 8, 2022

This is an automatic backport of pull request #18767 done by Mergify.
Cherry-pick of 032df94 has failed:

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

You are currently cherry-picking commit 032df946be.
  (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
	modified:   frappe/test_runner.py
	modified:   frappe/tests/test_redis.py
	new file:   frappe/tests/test_zbg_job_sanity_test.py
	modified:   pyproject.toml

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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@ankush @mergify
test: bg jobs test cleanup (#18767)
47b02ab 
* test: fix flaky RQ job tests

Sometimes stop_job doesn't succeed and causes tests to timeout. Reduced
sleep time to avoid this in tests. We are still testing all the
important features - monitoring.

* build(deps): Bump RQ to latest version

Minor bugfixes that affect us

ref: https://github.com/rq/rq/releases

* test: sanity tests for scheduled job types

* test(test_runner): dont set bench_id globally

* refactor: stop_job shouldn't throw error

The intention of use here is to stop stuck jobs or long running jobs, if
for some reason they were stopped by the time command gets executed,
there's no need to throw error.

(cherry picked from commit 032df94)

# Conflicts:
#	frappe/core/doctype/rq_job/test_rq_job.py
@mergify mergify bot requested review from a team and removed request for a team November 8, 2022 14:42
@mergify mergify bot added the conflicts label Nov 8, 2022
@mergify mergify bot requested a review from phot0n November 8, 2022 14:42
@mergify mergify bot assigned ankush Nov 8, 2022
@ankush ankush merged commit a2fbe1f into version-14-hotfix Nov 8, 2022
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-18767 branch November 8, 2022 15:10
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.15.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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

@phot0n phot0n Awaiting requested review from phot0n

Assignees

@ankush ankush

Labels
conflicts released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@frappe-pr-bot @ankush
0