[pull] develop from frappe:develop

.github/helper/ci.py

@@ -0,0 +1,119 @@
+"""
+Script to run Python tests while capturing accurte coverage.
+
+Enabling coverage after `frappe` is imported leaves out a lot of lines that are imported by
+default.
+
+This is essentially a copy of `frappe/coverage.py` BUT also triggers test runner with desired
+configuration.
+"""
+
+import json
+import sys
+import os
+from pathlib import Path
+from coverage import Coverage
+
+STANDARD_INCLUSIONS = ["*.py"]
+
+STANDARD_EXCLUSIONS = [
+	"*.js",
+	"*.xml",
+	"*.pyc",
+	"*.css",
+	"*.less",
+	"*.scss",
+	"*.vue",
+	"*.html",
+	"*/test_*/*",
+	"*/node_modules/*",
+	"*/doctype/*/*_dashboard.py",
+	"*/patches/*",
+	".github/*",
+]
+
+# tested via commands' test suite
+TESTED_VIA_CLI = [
+	"*/frappe/installer.py",
+	"*/frappe/utils/install.py",
+	"*/frappe/utils/scheduler.py",
+	"*/frappe/utils/doctor.py",
+	"*/frappe/build.py",
+	"*/frappe/database/__init__.py",
+	"*/frappe/database/db_manager.py",
+	"*/frappe/database/**/setup_db.py",
+]
+
+FRAPPE_EXCLUSIONS = [
+	"*/tests/*",
+	"*/commands/*",
+	"*/frappe/change_log/*",
+	"*/frappe/exceptions*",
+	"*/frappe/desk/page/setup_wizard/setup_wizard.py",
+	"*/frappe/coverage.py",
+	"*frappe/setup.py",
+	"*/doctype/*/*_dashboard.py",
+	"*/patches/*",
+	"*/frappe/database/postgres/*",
+	"*/.github/helper/ci.py",
+	"*/frappe/database/sqlite/*",
+	*TESTED_VIA_CLI,
+]
+
+
+def get_bench_path():
+	"""Get the path to the bench directory."""
+	return Path(__file__).resolve().parents[4]
+
+
+class CodeCoverage:
+	"""
+	Context manager for handling code coverage.
+
+	This class sets up code coverage measurement for a specific app,
+	applying the appropriate inclusion and exclusion patterns.
+	"""
+
+	def __init__(self, with_coverage, app, outfile="coverage.xml"):
+		self.with_coverage = with_coverage
+		self.app = app or "frappe"
+		self.outfile = outfile
+
+	def __enter__(self):
+		if self.with_coverage:
+			# Generate coverage report only for app that is being tested
+			source_path = os.path.join(get_bench_path(), "apps", self.app)
+			omit = STANDARD_EXCLUSIONS[:]
+
+			if self.app == "frappe":
+				omit.extend(FRAPPE_EXCLUSIONS)
+
+			self.coverage = Coverage(source=[source_path], omit=omit, include=STANDARD_INCLUSIONS)
+
+			assert "frappe" not in sys.modules, "frappe already imported, coverage will be inaccurate"
+			self.coverage.start()
+		return self
+
+	def __exit__(self, exc_type, exc_value, traceback):
+		if self.with_coverage:
+			self.coverage.stop()
+			self.coverage.save()
+			self.coverage.xml_report(outfile=self.outfile)
+			print("Saved Coverage")
+
+
+if __name__ == "__main__":
+	app = "frappe"
+	site = os.environ.get("SITE") or "test_site"
+	with_coverage = json.loads(os.environ.get("CAPTURE_COVERAGE", "true").lower())
+
+	# Parse build information from environment variables
+	build_number = int(os.environ.get("BUILD_NUMBER"))
+	total_builds = int(os.environ.get("TOTAL_BUILDS"))
+
+	# Run tests with code coverage
+	with CodeCoverage(with_coverage=with_coverage, app=app):
+		from frappe.parallel_test_runner import ParallelTestRunner
+
+		runner = ParallelTestRunner(app, site=site, build_number=build_number, total_builds=total_builds)
+		runner.setup_and_run()

.github/workflows/_base-server-tests.yml

@@ -107,17 +107,14 @@ jobs:
 
       - name: Run Tests
         run: |
-          bench --site test_site \
-            run-parallel-tests \
-            --with-coverage \
-            --app "${{ github.event.repository.name }}" \
-            --total-builds ${{ inputs.parallel-runs }} \
-            --build-number ${{ matrix.index }}
+          cd sites && ../env/bin/python3 ../apps/frappe/.github/helper/ci.py
 
         env:
           DB: ${{ matrix.db }}
           # consumed by bench run-parallel-tests
           CAPTURE_COVERAGE: ${{ inputs.enable-coverage }}
+          BUILD_NUMBER: ${{ matrix.index }}
+          TOTAL_BUILDS: ${{ inputs.parallel-runs }}
           FRAPPE_SENTRY_DSN: ${{ secrets.SENTRY_DSN || '' }}
 
       - name: Upload coverage data

.github/workflows/server-tests.yml

@@ -18,14 +18,9 @@ permissions:
   contents: read
 
 jobs:
-  typecheck:
-    name: Types
-    uses: ./.github/workflows/_base-type-check.yml
-
   checkrun:
     name: Plan Tests
     runs-on: ubuntu-latest
-    needs: typecheck
     outputs:
       build: ${{ steps.check-build.outputs.build }}
       run_postgres: ${{ steps.check-build.outputs.run_postgres }}

frappe/coverage.py

@@ -47,6 +47,9 @@
 	"*frappe/setup.py",
 	"*/doctype/*/*_dashboard.py",
 	"*/patches/*",
+	"*/frappe/database/postgres/*",
+	"*/.github/helper/ci.py",
+	"*/frappe/database/sqlite/*",
 	*TESTED_VIA_CLI,
 ]
 

frappe/handler.py

@@ -101,6 +101,10 @@ def is_valid_http_method(method):
 	if frappe.flags.in_safe_exec:
 		return
 
+	# Skip HTTP method validation when running in a background job
+	if hasattr(frappe.local, "job"):
+		return
+
 	http_method = frappe.local.request.method
 
 	if http_method not in frappe.allowed_http_methods_for_whitelisted_func[method]: