Merge pull request #25419 from frappe/cust_form_text

fix: allow transitioning to long text

.github/workflows/server-tests.yml

@@ -148,6 +148,10 @@ jobs:
           FRAPPE_SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
           TOTAL_BUILDS: 2
           COVERAGE_RCFILE: /home/runner/frappe-bench/apps/frappe/.coveragerc
+      - name: Setup tmate session
+
+        uses: mxschmitt/action-tmate@v3
+        if: ${{ failure() && contains( github.event.pull_request.labels.*.name, 'debug-gha') }}
 
       - name: Show bench output
         if: ${{ always() }}
@@ -160,9 +164,6 @@ jobs:
             cat $f
           done
 
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
-        if: ${{ contains( github.event.pull_request.labels.*.name, 'debug-gha') }}
 
       - name: Upload coverage data
         uses: actions/upload-artifact@v3

frappe/core/doctype/rq_job/test_rq_job.py

@@ -15,7 +15,7 @@ from frappe.utils import cstr, execute_in_shell
 from frappe.utils.background_jobs import get_job_status, is_job_enqueued
 
 
-@timeout(seconds=20)
+@timeout(seconds=60)
 def wait_for_completion(job: Job):
 	while True:
 		if not (job.is_queued or job.is_started):
@@ -93,7 +93,7 @@ class TestRQJob(FrappeTestCase):
 		with self.assertRaises(rq_exc.NoSuchJobError):
 			job.refresh()
 
-	@timeout(20)
+	@timeout
 	def test_multi_queue_burst_consumption(self):
 		for _ in range(3):
 			for q in ["default", "short"]:
@@ -102,7 +102,7 @@ class TestRQJob(FrappeTestCase):
 		_, stderr = execute_in_shell("bench worker --queue short,default --burst", check_exit_code=True)
 		self.assertIn("quitting", cstr(stderr))
 
-	@timeout(20)
+	@timeout
 	def test_multi_queue_burst_consumption_worker_pool(self):
 		for _ in range(3):
 			for q in ["default", "short"]:
@@ -113,7 +113,6 @@ class TestRQJob(FrappeTestCase):
 		)
 		self.assertIn("quitting", cstr(stderr))
 
-	@timeout(20)
 	def test_job_id_manual_dedup(self):
 		job_id = "test_dedup"
 		job = frappe.enqueue(self.BG_JOB, sleep=5, job_id=job_id)
@@ -121,7 +120,6 @@ class TestRQJob(FrappeTestCase):
 		self.check_status(job, "finished")
 		self.assertFalse(is_job_enqueued(job_id))
 
-	@timeout(20)
 	def test_auto_job_dedup(self):
 		job_id = "test_dedup"
 		job1 = frappe.enqueue(self.BG_JOB, sleep=2, job_id=job_id, deduplicate=True)
@@ -135,7 +133,7 @@ class TestRQJob(FrappeTestCase):
 		job4 = frappe.enqueue(self.BG_JOB, sleep=1, job_id=job_id, deduplicate=True)
 		self.check_status(job4, "finished")
 
-	@timeout(20)
+	@timeout
 	def test_enqueue_after_commit(self):
 		job_id = frappe.generate_hash()
 
@@ -155,7 +153,6 @@ class TestRQJob(FrappeTestCase):
 		frappe.db.commit()
 		self.assertIsNone(get_job_status(job_id))
 
-	@timeout(20)
 	def test_memory_usage(self):
 		if frappe.db.db_type != "mariadb":
 			return
@@ -171,7 +168,6 @@ class TestRQJob(FrappeTestCase):
 		LAST_MEASURED_USAGE = 41
 		self.assertLessEqual(rss, LAST_MEASURED_USAGE * 1.05, msg)
 
-	@timeout(20)
 	def test_clear_failed_jobs(self):
 		limit = 10
 		update_site_config("rq_failed_jobs_limit", limit)

frappe/custom/doctype/customize_form/customize_form.py

@@ -798,7 +798,7 @@ ALLOWED_FIELDTYPE_CHANGE = (
 	("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"),