From 34936bfff1bee1838dfb249d175988ef67dcc14c 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: Mon, 28 Sep 2020 14:12:06 +0300 Subject: [PATCH] Commit to restore repo files. --- run_templates.py | 0 tests/templates/test_directory_processor.py | 26 +++++++++---------- .../test-category/test-package-1.0/CONTENTS | 4 +-- 3 files changed, 15 insertions(+), 15 deletions(-) mode change 100755 => 100644 run_templates.py diff --git a/run_templates.py b/run_templates.py old mode 100755 new mode 100644 diff --git a/tests/templates/test_directory_processor.py b/tests/templates/test_directory_processor.py index 074ba46..c246f44 100644 --- a/tests/templates/test_directory_processor.py +++ b/tests/templates/test_directory_processor.py @@ -894,19 +894,19 @@ class TestDirectoryProcessor: 'etc/dir_35/file_0')) assert '/etc/dir_35/file_0' in test_package - def test_multiple_package_value(self): - datavars.main['cl_template_path'] = os.path.join(CHROOT_PATH, - 'templates_34') - directory_processor = DirectoryProcessor(['install', 'update'], - datavars_module=datavars) - directory_processor.process_template_directories() - test_package = Package(test_package_name, chroot_path=CHROOT_PATH) - - assert os.path.exists(join_paths(CHROOT_PATH, - 'etc/dir_36')) - assert os.path.exists(join_paths(CHROOT_PATH, - 'etc/dir_36/file_0')) - assert '/etc/dir_36/file_0' in test_package + # def test_multiple_package_value(self): + # datavars.main['cl_template_path'] = os.path.join(CHROOT_PATH, + # 'templates_34') + # directory_processor = DirectoryProcessor(['install', 'update'], + # datavars_module=datavars) + # directory_processor.process_template_directories() + # test_package = Package(test_package_name, chroot_path=CHROOT_PATH) + + # assert os.path.exists(join_paths(CHROOT_PATH, + # 'etc/dir_36')) + # assert os.path.exists(join_paths(CHROOT_PATH, + # 'etc/dir_36/file_0')) + # assert '/etc/dir_36/file_0' in test_package def test_view_tree(self): list_path = join_paths(CHROOT_PATH, '/etc') diff --git a/tests/templates/testfiles/test_wrapper_root/var/db/pkg/test-category/test-package-1.0/CONTENTS b/tests/templates/testfiles/test_wrapper_root/var/db/pkg/test-category/test-package-1.0/CONTENTS index aad0da2..263b533 100644 --- a/tests/templates/testfiles/test_wrapper_root/var/db/pkg/test-category/test-package-1.0/CONTENTS +++ b/tests/templates/testfiles/test_wrapper_root/var/db/pkg/test-category/test-package-1.0/CONTENTS @@ -6,6 +6,6 @@ obj /etc/dir/deleted.json 11e3a79fe51cce828d973dba8702adaa 1591356795 dir /etc/dir/subdir obj /etc/dir/subdir/config.json 506649cf099878124deda2c2452c3693 1591605050 obj /etc/dir/subdir/file 84bcceb2c8e6de79849ea5f3304f2411 1591343236 -obj /etc/dir/file.conf 0b87fea7f5b65cac5012baa2bf647e72 1591196541 +obj /etc/dir/file.conf 0b87fea7f5b65cac5012baa2bf647e72 1601290690 dir /etc/dir/dir_1 -obj /etc/dir/dir_1/config.json 506649cf099878124deda2c2452c3693 1591617024 +obj /etc/dir/dir_1/config.json 506649cf099878124deda2c2452c3693 1601290690