From 290a3df68d0d2afb04044ad7653ba68172ad9f9e Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 13 Dec 2022 12:17:57 +0530 Subject: [PATCH] chore!: drop backup.py direct calls + pragma nocov --- .github/helper/ci.py | 6 +++ frappe/utils/background_jobs.py | 2 +- frappe/utils/backups.py | 73 --------------------------------- 3 files changed, 7 insertions(+), 74 deletions(-) diff --git a/.github/helper/ci.py b/.github/helper/ci.py index 2eadd468c1..1f35d0b18d 100644 --- a/.github/helper/ci.py +++ b/.github/helper/ci.py @@ -24,6 +24,9 @@ STANDARD_EXCLUSIONS = [ # 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", @@ -35,10 +38,13 @@ FRAPPE_EXCLUSIONS = [ "*/commands/*", "*/frappe/change_log/*", "*/frappe/exceptions*", + "*/frappe/desk/page/setup_wizard/setup_wizard.py", "*/frappe/coverage.py", "*frappe/setup.py", + "*/frappe/hooks.py", "*/doctype/*/*_dashboard.py", "*/patches/*", + "*/.github/helper/ci.py", ] + TESTED_VIA_CLI diff --git a/frappe/utils/background_jobs.py b/frappe/utils/background_jobs.py index ea7eefc44f..040a57cc11 100755 --- a/frappe/utils/background_jobs.py +++ b/frappe/utils/background_jobs.py @@ -219,7 +219,7 @@ def start_worker( rq_password: str | None = None, burst: bool = False, strategy: Literal["round_robin", "random"] | None = None, -) -> NoReturn | None: +) -> NoReturn | None: # pragma: no cover """Wrapper to start rq worker. Connects to redis and monitors these queues.""" DEQUEUE_STRATEGIES = {"round_robin": RoundRobinWorker, "random": RandomWorker} diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 2a2eeb8efc..1035c111a5 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -710,76 +710,3 @@ def backup( "backup_path_files": odb.backup_path_files, "backup_path_private_files": odb.backup_path_private_files, } - - -if __name__ == "__main__": - import sys - - from frappe.utils.commands import warn - - warn( - "Calling the backup script directly is deprecated. " - "Use the backup command instead. This script will be removed in Frappe v15.", - category=DeprecationWarning, - ) - - cmd = sys.argv[1] - - db_type = "mariadb" - try: - db_type = sys.argv[6] - except IndexError: - pass - - db_port = 3306 - try: - db_port = int(sys.argv[7]) - except IndexError: - pass - - if cmd == "is_file_old": - odb = BackupGenerator( - sys.argv[2], - sys.argv[3], - sys.argv[4], - sys.argv[5] or "localhost", - db_type=db_type, - db_port=db_port, - ) - is_file_old(odb.db_file_name) - - if cmd == "get_backup": - odb = BackupGenerator( - sys.argv[2], - sys.argv[3], - sys.argv[4], - sys.argv[5] or "localhost", - db_type=db_type, - db_port=db_port, - ) - odb.get_backup() - - if cmd == "take_dump": - odb = BackupGenerator( - sys.argv[2], - sys.argv[3], - sys.argv[4], - sys.argv[5] or "localhost", - db_type=db_type, - db_port=db_port, - ) - odb.take_dump() - - if cmd == "send_email": - odb = BackupGenerator( - sys.argv[2], - sys.argv[3], - sys.argv[4], - sys.argv[5] or "localhost", - db_type=db_type, - db_port=db_port, - ) - odb.send_email() - - if cmd == "delete_temp_backups": - delete_temp_backups()