From 6e865e1b43204e1f1d0b319fef0de5a0cc8efda4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=94=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=81?= Date: Fri, 10 Jul 2020 14:07:56 +0300 Subject: [PATCH] Also some corrections for tests to make it work on different machines. --- tests/templates/test_template_executor.py | 2 ++ .../etc.backup/append_replace_dir_testfiles/dir_2/file | 0 .../etc.backup/append_replace_dir_testfiles/dir_3/file | 0 .../test_executor_root/etc.backup/chmod_testfiles/dir_0/file | 0 .../test_executor_root/etc.backup/chmod_testfiles/dir_2/file | 0 .../test_executor_root/etc.backup/chown_testfiles/dir_0/file | 0 .../test_executor_root/etc.backup/chown_testfiles/dir_2/file | 0 .../etc.backup/clear_dir_testfiles/dir_2/subdir_0/file | 0 .../etc.backup/clear_dir_testfiles/dir_2/subdir_1/file | 0 .../etc.backup/clear_file_testfiles/dir_0/file | 0 .../etc.backup/create_dir_testfiles/dir_0/file | 0 .../etc.backup/create_dir_testfiles/dir_1/file | 0 .../etc.backup/create_dir_testfiles/dir_2/file | 0 .../etc.backup/create_dir_testfiles/dir_3/file | 0 .../etc.backup/create_dir_testfiles/dir_4/file | 0 .../etc.backup/exec_parameter_testfiles/dir_0/file | 0 .../etc.backup/exec_parameter_testfiles/dir_2/file | 0 .../etc.backup/exec_parameter_testfiles/dir_3/file | 0 .../test_executor_root/etc.backup/link_dir_testfiles/dir_0/file | 0 .../test_executor_root/etc.backup/link_dir_testfiles/dir_1/file | 0 .../etc.backup/remove_dir_testfiles/dir_0/file | 0 .../etc.backup/remove_dir_testfiles/dir_1/file | 0 .../etc.backup/run_exec_testfiles/dir_0/file_to_save_directory | 0 .../etc.backup/run_parameter_testfiles/dir_0/file | 0 24 files changed, 2 insertions(+) create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/append_replace_dir_testfiles/dir_2/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/append_replace_dir_testfiles/dir_3/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/chmod_testfiles/dir_0/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/chmod_testfiles/dir_2/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/chown_testfiles/dir_0/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/chown_testfiles/dir_2/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/clear_dir_testfiles/dir_2/subdir_0/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/clear_dir_testfiles/dir_2/subdir_1/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/clear_file_testfiles/dir_0/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/create_dir_testfiles/dir_0/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/create_dir_testfiles/dir_1/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/create_dir_testfiles/dir_2/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/create_dir_testfiles/dir_3/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/create_dir_testfiles/dir_4/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/exec_parameter_testfiles/dir_0/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/exec_parameter_testfiles/dir_2/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/exec_parameter_testfiles/dir_3/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/link_dir_testfiles/dir_0/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/link_dir_testfiles/dir_1/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/remove_dir_testfiles/dir_0/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/remove_dir_testfiles/dir_1/file create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/run_exec_testfiles/dir_0/file_to_save_directory create mode 100644 tests/templates/testfiles/test_executor_root/etc.backup/run_parameter_testfiles/dir_0/file diff --git a/tests/templates/test_template_executor.py b/tests/templates/test_template_executor.py index d079e1c..0bfc6b3 100644 --- a/tests/templates/test_template_executor.py +++ b/tests/templates/test_template_executor.py @@ -576,6 +576,7 @@ class TestTemplateExecutor: def test_if_the_remove_directory_method_s_input_is_a_path_to_an_existing_empty_directory__the_method_will_remove_the_directory(self): target_path = join_paths(CHROOT_PATH, '/etc/remove_dir_testfiles/dir_0') + os.remove(os.path.join(target_path, 'file')) template_executor._remove_directory(target_path) assert not os.path.exists(target_path) @@ -1079,6 +1080,7 @@ class TestTemplateExecutor: target_path = join_paths( CHROOT_PATH, '/etc/append_replace_dir_testfiles/dir_2') + os.remove(os.path.join(target_path, 'file')) parameters_object = ParametersContainer({'package': test_package_name, 'append': 'replace'}) template_wrapper = TemplateWrapper( diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/append_replace_dir_testfiles/dir_2/file b/tests/templates/testfiles/test_executor_root/etc.backup/append_replace_dir_testfiles/dir_2/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/append_replace_dir_testfiles/dir_3/file b/tests/templates/testfiles/test_executor_root/etc.backup/append_replace_dir_testfiles/dir_3/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/chmod_testfiles/dir_0/file b/tests/templates/testfiles/test_executor_root/etc.backup/chmod_testfiles/dir_0/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/chmod_testfiles/dir_2/file b/tests/templates/testfiles/test_executor_root/etc.backup/chmod_testfiles/dir_2/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/chown_testfiles/dir_0/file b/tests/templates/testfiles/test_executor_root/etc.backup/chown_testfiles/dir_0/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/chown_testfiles/dir_2/file b/tests/templates/testfiles/test_executor_root/etc.backup/chown_testfiles/dir_2/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/clear_dir_testfiles/dir_2/subdir_0/file b/tests/templates/testfiles/test_executor_root/etc.backup/clear_dir_testfiles/dir_2/subdir_0/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/clear_dir_testfiles/dir_2/subdir_1/file b/tests/templates/testfiles/test_executor_root/etc.backup/clear_dir_testfiles/dir_2/subdir_1/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/clear_file_testfiles/dir_0/file b/tests/templates/testfiles/test_executor_root/etc.backup/clear_file_testfiles/dir_0/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/create_dir_testfiles/dir_0/file b/tests/templates/testfiles/test_executor_root/etc.backup/create_dir_testfiles/dir_0/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/create_dir_testfiles/dir_1/file b/tests/templates/testfiles/test_executor_root/etc.backup/create_dir_testfiles/dir_1/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/create_dir_testfiles/dir_2/file b/tests/templates/testfiles/test_executor_root/etc.backup/create_dir_testfiles/dir_2/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/create_dir_testfiles/dir_3/file b/tests/templates/testfiles/test_executor_root/etc.backup/create_dir_testfiles/dir_3/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/create_dir_testfiles/dir_4/file b/tests/templates/testfiles/test_executor_root/etc.backup/create_dir_testfiles/dir_4/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/exec_parameter_testfiles/dir_0/file b/tests/templates/testfiles/test_executor_root/etc.backup/exec_parameter_testfiles/dir_0/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/exec_parameter_testfiles/dir_2/file b/tests/templates/testfiles/test_executor_root/etc.backup/exec_parameter_testfiles/dir_2/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/exec_parameter_testfiles/dir_3/file b/tests/templates/testfiles/test_executor_root/etc.backup/exec_parameter_testfiles/dir_3/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/link_dir_testfiles/dir_0/file b/tests/templates/testfiles/test_executor_root/etc.backup/link_dir_testfiles/dir_0/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/link_dir_testfiles/dir_1/file b/tests/templates/testfiles/test_executor_root/etc.backup/link_dir_testfiles/dir_1/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/remove_dir_testfiles/dir_0/file b/tests/templates/testfiles/test_executor_root/etc.backup/remove_dir_testfiles/dir_0/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/remove_dir_testfiles/dir_1/file b/tests/templates/testfiles/test_executor_root/etc.backup/remove_dir_testfiles/dir_1/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/run_exec_testfiles/dir_0/file_to_save_directory b/tests/templates/testfiles/test_executor_root/etc.backup/run_exec_testfiles/dir_0/file_to_save_directory new file mode 100644 index 0000000..e69de29 diff --git a/tests/templates/testfiles/test_executor_root/etc.backup/run_parameter_testfiles/dir_0/file b/tests/templates/testfiles/test_executor_root/etc.backup/run_parameter_testfiles/dir_0/file new file mode 100644 index 0000000..e69de29