From 649f1b1b616a316d9554e0fec33e26e301c421d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Mon, 23 Nov 2020 11:50:23 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20system.env=5Forder=20=D0=B8=20system.env?= =?UTF-8?q?=5Fpath=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B5=D1=81=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B2=20main.cl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calculate/variables/loader.py | 10 +++++----- calculate/vars/{ => main/cl}/system/__init__.py | 0 .../variables/{ => main/cl}/system/__init__.py | 0 .../variables/{ => main/cl}/system/__init__.py | 0 .../variables/{ => main/cl}/system/__init__.py | 0 .../variables/{ => main/cl}/system/__init__.py | 0 tests/variables/test_datavars.py | 10 +++++----- .../variables_10/{ => main/cl}/system/__init__.py | 0 .../variables_11/{ => main/cl}/system/__init__.py | 0 .../variables_12/{ => main/cl}/system/__init__.py | 0 .../variables_13/{ => main/cl}/system/__init__.py | 0 .../variables_15/{ => main/cl}/system/__init__.py | 0 .../variables_16/{ => main/cl}/system/__init__.py | 0 .../variables_17/{ => main/cl}/system/__init__.py | 0 .../variables_5/{ => main/cl}/system/__init__.py | 0 .../variables_6/{ => main/cl}/system/__init__.py | 0 .../variables_7/{ => main/cl}/system/__init__.py | 0 .../variables_8/{ => main/cl}/system/__init__.py | 0 .../variables_9/{ => main/cl}/system/__init__.py | 0 19 files changed, 10 insertions(+), 10 deletions(-) rename calculate/vars/{ => main/cl}/system/__init__.py (100%) rename tests/commands/testfiles/variables/{ => main/cl}/system/__init__.py (100%) rename tests/parameters/testfiles/variables/{ => main/cl}/system/__init__.py (100%) rename tests/scripts/testfiles/variables/{ => main/cl}/system/__init__.py (100%) rename tests/server/testfiles/variables/{ => main/cl}/system/__init__.py (100%) rename tests/variables/testfiles/variables_10/{ => main/cl}/system/__init__.py (100%) rename tests/variables/testfiles/variables_11/{ => main/cl}/system/__init__.py (100%) rename tests/variables/testfiles/variables_12/{ => main/cl}/system/__init__.py (100%) rename tests/variables/testfiles/variables_13/{ => main/cl}/system/__init__.py (100%) rename tests/variables/testfiles/variables_15/{ => main/cl}/system/__init__.py (100%) rename tests/variables/testfiles/variables_16/{ => main/cl}/system/__init__.py (100%) rename tests/variables/testfiles/variables_17/{ => main/cl}/system/__init__.py (100%) rename tests/variables/testfiles/variables_5/{ => main/cl}/system/__init__.py (100%) rename tests/variables/testfiles/variables_6/{ => main/cl}/system/__init__.py (100%) rename tests/variables/testfiles/variables_7/{ => main/cl}/system/__init__.py (100%) rename tests/variables/testfiles/variables_8/{ => main/cl}/system/__init__.py (100%) rename tests/variables/testfiles/variables_9/{ => main/cl}/system/__init__.py (100%) diff --git a/calculate/variables/loader.py b/calculate/variables/loader.py index 86386d1..823b12a 100644 --- a/calculate/variables/loader.py +++ b/calculate/variables/loader.py @@ -565,8 +565,8 @@ class VariableLoader: '''Метод для загрузки переменных из calculate.ini указанных в переменных env_order и env_path.''' try: - env_order = self.datavars.system.env_order - env_path = self.datavars.system.env_path + env_order = self.datavars.main.cl.system.env_order + env_path = self.datavars.main.cl.system.env_path except VariableNotFoundError as error: self.logger.warning("Can not load additional variables: {}". format(str(error))) @@ -752,8 +752,8 @@ class Datavars: # ini-файлах. try: self.variables_to_save = {target: dict() for target in - self.system.env_order if target in - self.system.env_path} + self.main.cl.system.env_order if target in + self.main.cl.system.env_path} except VariableNotFoundError: self.variables_to_save = dict() @@ -864,7 +864,7 @@ class Datavars: def save_variables(self): '''Метод для сохранения значений переменных в calculate.ini файлах.''' - target_paths = self.system.env_path + target_paths = self.main.cl.system.env_path saver = CalculateIniSaver() for target in self.variables_to_save: diff --git a/calculate/vars/system/__init__.py b/calculate/vars/main/cl/system/__init__.py similarity index 100% rename from calculate/vars/system/__init__.py rename to calculate/vars/main/cl/system/__init__.py diff --git a/tests/commands/testfiles/variables/system/__init__.py b/tests/commands/testfiles/variables/main/cl/system/__init__.py similarity index 100% rename from tests/commands/testfiles/variables/system/__init__.py rename to tests/commands/testfiles/variables/main/cl/system/__init__.py diff --git a/tests/parameters/testfiles/variables/system/__init__.py b/tests/parameters/testfiles/variables/main/cl/system/__init__.py similarity index 100% rename from tests/parameters/testfiles/variables/system/__init__.py rename to tests/parameters/testfiles/variables/main/cl/system/__init__.py diff --git a/tests/scripts/testfiles/variables/system/__init__.py b/tests/scripts/testfiles/variables/main/cl/system/__init__.py similarity index 100% rename from tests/scripts/testfiles/variables/system/__init__.py rename to tests/scripts/testfiles/variables/main/cl/system/__init__.py diff --git a/tests/server/testfiles/variables/system/__init__.py b/tests/server/testfiles/variables/main/cl/system/__init__.py similarity index 100% rename from tests/server/testfiles/variables/system/__init__.py rename to tests/server/testfiles/variables/main/cl/system/__init__.py diff --git a/tests/variables/test_datavars.py b/tests/variables/test_datavars.py index 03f10ab..7109fc1 100644 --- a/tests/variables/test_datavars.py +++ b/tests/variables/test_datavars.py @@ -1290,8 +1290,8 @@ value = another_value def test_test_if_Datavars_object_is_created_with_a_specific_variables_path_and_the_repository_map_the_current_profile_path_and_some_ini_files_paths_is_set_in_the_variables__the_Datavars_object_finds_all_variables_packages_and_ini_files_from_a_profile_using_the_profile_path_variable_and_the_repositories_variable_and_loads_variables_from_ini_files_from_the_env_order_and_the_env_path_variables(self): datavars = Datavars( variables_path=os.path.join(TESTFILES_PATH, 'variables_5')) - assert datavars.system.env_order == ['system', 'local'] - assert datavars.system.env_path.get_hash() == { + assert datavars.main.cl.system.env_order == ['system', 'local'] + assert datavars.main.cl.system.env_path.get_hash() == { 'system': os.path.join( TESTFILES_PATH, @@ -1502,9 +1502,9 @@ test = new value''' datavars.save_variables() assert local_ini_result == read_file( - datavars.system.env_path['local'].value) + datavars.main.cl.system.env_path['local'].value) assert system_ini_result == read_file( - datavars.system.env_path['system'].value) + datavars.main.cl.system.env_path['system'].value) def test_if_Datavars_object_is_set_as_the_datavars_for_the_TemplateEngine_object_and_save_tag_is_used_for_changing_some_hash_variable_s_values_and_target_file_is_set_for_the_save_tag__the_Datavars_object_modifies_hash_variables_and_saves_them_to_the_target_files_as_namespaces(self): datavars = Datavars( @@ -1535,7 +1535,7 @@ id_2 = 1349''' template_engine.process_template_from_string(input_template_1, FILE) datavars.save_variables() assert system_ini_result ==\ - read_file(datavars.system.env_path['system'].value) + read_file(datavars.main.cl.system.env_path['system'].value) # Теперь тестируем обработку ошибок. def test_if_calculate_ini_file_has_some_syntax_errors_in_its_text__loader_skips_incorrect_lines_and_puts_some_error_messages_in_the_output(self): diff --git a/tests/variables/testfiles/variables_10/system/__init__.py b/tests/variables/testfiles/variables_10/main/cl/system/__init__.py similarity index 100% rename from tests/variables/testfiles/variables_10/system/__init__.py rename to tests/variables/testfiles/variables_10/main/cl/system/__init__.py diff --git a/tests/variables/testfiles/variables_11/system/__init__.py b/tests/variables/testfiles/variables_11/main/cl/system/__init__.py similarity index 100% rename from tests/variables/testfiles/variables_11/system/__init__.py rename to tests/variables/testfiles/variables_11/main/cl/system/__init__.py diff --git a/tests/variables/testfiles/variables_12/system/__init__.py b/tests/variables/testfiles/variables_12/main/cl/system/__init__.py similarity index 100% rename from tests/variables/testfiles/variables_12/system/__init__.py rename to tests/variables/testfiles/variables_12/main/cl/system/__init__.py diff --git a/tests/variables/testfiles/variables_13/system/__init__.py b/tests/variables/testfiles/variables_13/main/cl/system/__init__.py similarity index 100% rename from tests/variables/testfiles/variables_13/system/__init__.py rename to tests/variables/testfiles/variables_13/main/cl/system/__init__.py diff --git a/tests/variables/testfiles/variables_15/system/__init__.py b/tests/variables/testfiles/variables_15/main/cl/system/__init__.py similarity index 100% rename from tests/variables/testfiles/variables_15/system/__init__.py rename to tests/variables/testfiles/variables_15/main/cl/system/__init__.py diff --git a/tests/variables/testfiles/variables_16/system/__init__.py b/tests/variables/testfiles/variables_16/main/cl/system/__init__.py similarity index 100% rename from tests/variables/testfiles/variables_16/system/__init__.py rename to tests/variables/testfiles/variables_16/main/cl/system/__init__.py diff --git a/tests/variables/testfiles/variables_17/system/__init__.py b/tests/variables/testfiles/variables_17/main/cl/system/__init__.py similarity index 100% rename from tests/variables/testfiles/variables_17/system/__init__.py rename to tests/variables/testfiles/variables_17/main/cl/system/__init__.py diff --git a/tests/variables/testfiles/variables_5/system/__init__.py b/tests/variables/testfiles/variables_5/main/cl/system/__init__.py similarity index 100% rename from tests/variables/testfiles/variables_5/system/__init__.py rename to tests/variables/testfiles/variables_5/main/cl/system/__init__.py diff --git a/tests/variables/testfiles/variables_6/system/__init__.py b/tests/variables/testfiles/variables_6/main/cl/system/__init__.py similarity index 100% rename from tests/variables/testfiles/variables_6/system/__init__.py rename to tests/variables/testfiles/variables_6/main/cl/system/__init__.py diff --git a/tests/variables/testfiles/variables_7/system/__init__.py b/tests/variables/testfiles/variables_7/main/cl/system/__init__.py similarity index 100% rename from tests/variables/testfiles/variables_7/system/__init__.py rename to tests/variables/testfiles/variables_7/main/cl/system/__init__.py diff --git a/tests/variables/testfiles/variables_8/system/__init__.py b/tests/variables/testfiles/variables_8/main/cl/system/__init__.py similarity index 100% rename from tests/variables/testfiles/variables_8/system/__init__.py rename to tests/variables/testfiles/variables_8/main/cl/system/__init__.py diff --git a/tests/variables/testfiles/variables_9/system/__init__.py b/tests/variables/testfiles/variables_9/main/cl/system/__init__.py similarity index 100% rename from tests/variables/testfiles/variables_9/system/__init__.py rename to tests/variables/testfiles/variables_9/main/cl/system/__init__.py