tests: Ensure backup/restore preserves file attributes

I noticed some test failures in tests that check ownership/permissions of config files. The tests were recently changed to reuse the same VM, so I suspect config files were not being backed up/restored with the correct file attributes. Use `cp -a` to preserve all file attributes. Signed-off-by: Rich Megginson <[email protected]>
linux-system-roles · Nov 14, 2023 · 39382b4 · 39382b4
1 parent 0858fbf
commit 39382b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/tasks/backup.yml b/tests/tasks/backup.yml
@@ -14,7 +14,7 @@
   shell: >
     if test -f {{ item }}; then
       mkdir -p {{ __ssh_test_backup.path }}/$(dirname {{ item }});
-      cp {{ item }} {{ __ssh_test_backup.path }}/$(dirname {{ item }})
+      cp -a {{ item }} {{ __ssh_test_backup.path }}/$(dirname {{ item }})
     fi
   changed_when: false
   loop: "{{ __ssh_test_backup_files | d([]) }}"

diff --git a/tests/tasks/restore.yml b/tests/tasks/restore.yml
@@ -2,7 +2,7 @@
 - name: Restore backed up files and remove what was not present
   shell: >
     if test -f {{ __ssh_test_backup.path }}/{{ item }}; then
-      cp {{ __ssh_test_backup.path }}/{{ item }} $(dirname {{ item }})
+      cp -a {{ __ssh_test_backup.path }}/{{ item }} $(dirname {{ item }})
     elif test -f {{ item }}; then
       rm {{ item }}
     fi