From 76238db4bbc00e239e1e6ec6eb25551308ed3903 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 4 Aug 2022 19:09:47 +0200 Subject: [PATCH] config_settings.toml -> config_global.toml --- share/{config_settings.toml => config_global.toml} | 0 src/domain.py | 1 - src/tests/test_settings.py | 8 +++----- 3 files changed, 3 insertions(+), 6 deletions(-) rename share/{config_settings.toml => config_global.toml} (100%) diff --git a/share/config_settings.toml b/share/config_global.toml similarity index 100% rename from share/config_settings.toml rename to share/config_global.toml diff --git a/src/domain.py b/src/domain.py index e40b4f03c..d86760e84 100644 --- a/src/domain.py +++ b/src/domain.py @@ -44,7 +44,6 @@ from yunohost.log import is_unit_operation logger = getActionLogger("yunohost.domain") -DOMAIN_CONFIG_PATH = "/usr/share/yunohost/config_domain.toml" DOMAIN_SETTINGS_DIR = "/etc/yunohost/domains" # Lazy dev caching to avoid re-query ldap every time we need the domain list diff --git a/src/tests/test_settings.py b/src/tests/test_settings.py index d65ccc77c..4ce54b5cb 100644 --- a/src/tests/test_settings.py +++ b/src/tests/test_settings.py @@ -6,8 +6,6 @@ import pytest import moulinette from yunohost.utils.error import YunohostError, YunohostValidationError -import yunohost.settings as settings - from yunohost.settings import ( settings_get, settings_list, @@ -45,8 +43,8 @@ def setup_function(function): if os.path.exists(SETTINGS_PATH): os.system(f"mv {SETTINGS_PATH} {SETTINGS_PATH}.saved") # Add example settings to config panel - os.system("cp /usr/share/yunohost/config_settings.toml /usr/share/yunohost/config_settings.toml.saved") - with open("/usr/share/yunohost/config_settings.toml", "a") as file: + os.system("cp /usr/share/yunohost/config_global.toml /usr/share/yunohost/config_global.toml.saved") + with open("/usr/share/yunohost/config_global.toml", "a") as file: file.write(EXAMPLE_SETTINGS) @@ -55,7 +53,7 @@ def teardown_function(function): os.system(f"mv {SETTINGS_PATH}.saved {SETTINGS_PATH}") elif os.path.exists(SETTINGS_PATH): os.remove(SETTINGS_PATH) - os.system("mv /usr/share/yunohost/config_settings.toml.saved /usr/share/yunohost/config_settings.toml") + os.system("mv /usr/share/yunohost/config_global.toml.saved /usr/share/yunohost/config_global.toml") old_translate = moulinette.core.Translator.translate