vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #28391 from blaggacao/fix/dont-deprecate-json-test-records

Browse source 
fix: revert deprecation of json test records
This commit is contained in:
Akhil Narang 2024-11-13 11:25:06 +05:30 • committed by GitHub
commit a01e779a74
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/deprecation_dumpster.py
View file

@ -822,8 +822,6 @@ def frappe_get_test_records(doctype):
import frappe
from frappe.tests.utils.generators import load_test_records_for
frappe.flags.deprecation_dumpster_invoked = True
records = load_test_records_for(doctype)
if isinstance(records, dict):
_records = []

25
frappe/tests/utils/generators.py
View file

@ -118,21 +118,13 @@ def get_missing_records_module_overrides(module) -> [list, list]:
return to_add, to_remove
def load_test_records_for(index_doctype) -> dict[str, Any] | list:
def load_test_records_for(index_doctype) -> dict[str, Any]:
module_path = get_module_path(get_doctype_module(index_doctype), "doctype", frappe.scrub(index_doctype))
json_path = os.path.join(module_path, "test_records.json")
if os.path.exists(json_path):
if not frappe.flags.deprecation_dumpster_invoked:
from frappe.deprecation_dumpster import deprecation_warning
deprecation_warning(
"2024-10-09",
"v18",
"Use TOML files for test records; migration script: https://github.com/frappe/frappe/pull/28065",
)
with open(json_path) as f:
return json.load(f)
return _transform_legacy_json_records(json.load(f), index_doctype)
toml_path = os.path.join(module_path, "test_records.toml")
if os.path.exists(toml_path):
@ -189,6 +181,8 @@ def _generate_records_for(
# Second Priority: module's test_records attribute
if hasattr(test_module, "test_records"):
test_records = test_module.test_records
if isinstance(test_records, list):
test_records = _transform_legacy_json_records(test_records, index_doctype)
# Third priority: module's test_records.toml
else:
@ -200,9 +194,6 @@ def _generate_records_for(
print_mandatory_fields(index_doctype, initial_doctype)
return
if isinstance(test_records, list):
test_records = _transform_legacy_json_records(test_records, index_doctype)
logger.warning("↺ " + logstr)
testing_logger.info(f" Synced + {index_doctype:<30} via {initial_doctype}")
@ -441,12 +432,12 @@ def make_test_records_for_doctype(doctype, force=False, commit=False):
def make_test_objects(doctype=None, test_records=None, reset=False, commit=False):
"""Generate test objects from provided records, with caching and persistence."""
if test_records is None:
test_records = load_test_records_for(doctype)
# Deprecated JSON import - make it comply
# Legacy JSON import - make it comply
if isinstance(test_records, list):
test_records = _transform_legacy_json_records(test_records, doctype)
if test_records is None:
test_records = load_test_records_for(doctype)
return list(r.name for tag, r in _sync_records(doctype, test_records, reset, commit))