Skip to content

Commit

Permalink
fix: allow transitioning to long text (backport #25419) (#25474)
Browse files Browse the repository at this point in the history
* fix: allow transitioning to long text

(cherry picked from commit 02fd017)

* ci: setup ssh if test failed

(cherry picked from commit 0ca0e22)

# Conflicts:
#	.github/workflows/server-tests.yml

* test: fixup timeouts

The tests were failing because they weren't able to complete in 20
seconds. Ugh!

(cherry picked from commit 48c24c7)

# Conflicts:
#	frappe/core/doctype/rq_job/test_rq_job.py

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
  • Loading branch information
mergify[bot] and ankush committed Mar 15, 2024
1 parent f368236 commit 60d8c1c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions frappe/core/doctype/rq_job/test_rq_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
class TestRQJob(FrappeTestCase):
BG_JOB = "frappe.core.doctype.rq_job.test_rq_job.test_func"

@timeout(seconds=20)
@timeout(seconds=60)
def check_status(self, job: Job, status, wait=True):
while wait:
if not (job.is_queued or job.is_started):
Expand Down Expand Up @@ -95,15 +95,14 @@ def test_multi_queue_burst_consumption(self):
_, stderr = execute_in_shell("bench worker --queue short,default --burst", check_exit_code=True)
self.assertIn("quitting", cstr(stderr))

@timeout(20)
def test_job_id_dedup(self):
job_id = "test_dedup"
job = frappe.enqueue(self.BG_JOB, sleep=5, job_id=job_id)
self.assertTrue(is_job_enqueued(job_id))
self.check_status(job, "finished")
self.assertFalse(is_job_enqueued(job_id))

@timeout(20)
@timeout(60)
def test_clear_failed_jobs(self):
limit = 10
update_site_config("rq_failed_jobs_limit", limit)
Expand Down
2 changes: 1 addition & 1 deletion frappe/custom/doctype/customize_form/customize_form.py
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ def is_standard_or_system_generated_field(df):
("Text", "Data"),
("Text", "Text Editor", "Code", "Signature", "HTML Editor"),
("Data", "Select"),
("Text", "Small Text"),
("Text", "Small Text", "Long Text"),
("Text", "Data", "Barcode"),
("Code", "Geolocation"),
("Table", "Table MultiSelect"),
Expand Down

0 comments on commit 60d8c1c

Please sign in to comment.