From ca507ff47766e5bc1943fcad4124aa8852727df0 Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Fri, 30 Apr 2021 17:16:30 -0700
Subject: [PATCH] Integration test fixes.

---
 test/integration/targets/async/tasks/main.yml     |  1 +
 test/integration/targets/copy/tasks/main.yml      |  2 ++
 test/integration/targets/git/tasks/archive.yml    |  1 +
 .../targets/setup_cron/defaults/main.yml          |  2 +-
 test/integration/targets/setup_cron/meta/main.yml |  2 ++
 .../targets/unarchive/tasks/test_include.yml      |  3 +++
 .../targets/yum_repository/tasks/main.yml         | 15 ++++++++++++---
 7 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 test/integration/targets/setup_cron/meta/main.yml

diff --git a/test/integration/targets/async/tasks/main.yml b/test/integration/targets/async/tasks/main.yml
index c8c12f6d601cef..255e7104ae23ae 100644
--- a/test/integration/targets/async/tasks/main.yml
+++ b/test/integration/targets/async/tasks/main.yml
@@ -320,6 +320,7 @@
 
 - name: run async poll callback test playbook
   command: ansible-playbook {{ role_path }}/callback_test.yml
+  delegate_to: localhost
   register: callback_output
 
 - assert:
diff --git a/test/integration/targets/copy/tasks/main.yml b/test/integration/targets/copy/tasks/main.yml
index e02c02327f2d80..ae7ef753a6d454 100644
--- a/test/integration/targets/copy/tasks/main.yml
+++ b/test/integration/targets/copy/tasks/main.yml
@@ -27,6 +27,7 @@
         chdir: '{{role_path}}/files/subdir/subdir1'
         warn: no
       with_dict: "{{ symlinks }}"
+      delegate_to: localhost
 
     - name: Create remote unprivileged remote user
       user:
@@ -78,6 +79,7 @@
       when: ansible_os_family == 'RedHat' and ansible_selinux.get('mode') == 'enforcing'
 
     - import_tasks: no_log.yml
+      delegate_to: localhost
 
     - import_tasks: check_mode.yml
 
diff --git a/test/integration/targets/git/tasks/archive.yml b/test/integration/targets/git/tasks/archive.yml
index 574559ef28cb24..18b9dff350a70d 100644
--- a/test/integration/targets/git/tasks/archive.yml
+++ b/test/integration/targets/git/tasks/archive.yml
@@ -119,6 +119,7 @@
   unarchive:
     src: '{{ checkout_dir }}/test_role.{{ item }}'
     dest: '{{ checkout_dir }}/{{ git_archive_prefix }}.{{ item }}'
+    remote_src: yes
   with_items: "{{ git_archive_extensions[ansible_os_family ~ ansible_distribution_major_version | default('default') ] | default(git_archive_extensions.default) }}"
 
 - name: ARCHIVE | Check if prefix directory exists in what's extracted
diff --git a/test/integration/targets/setup_cron/defaults/main.yml b/test/integration/targets/setup_cron/defaults/main.yml
index e4b0123da2ae20..a6d1965fd26391 100644
--- a/test/integration/targets/setup_cron/defaults/main.yml
+++ b/test/integration/targets/setup_cron/defaults/main.yml
@@ -1 +1 @@
-remote_dir: "{{ lookup('env', 'OUTPUT_DIR') }}"
+remote_dir: "{{ remote_tmp_dir }}"
diff --git a/test/integration/targets/setup_cron/meta/main.yml b/test/integration/targets/setup_cron/meta/main.yml
new file mode 100644
index 00000000000000..1810d4bec988cb
--- /dev/null
+++ b/test/integration/targets/setup_cron/meta/main.yml
@@ -0,0 +1,2 @@
+dependencies:
+  - setup_remote_tmp_dir
diff --git a/test/integration/targets/unarchive/tasks/test_include.yml b/test/integration/targets/unarchive/tasks/test_include.yml
index 3ed30fa3f43b37..04842e0ecdb91c 100644
--- a/test/integration/targets/unarchive/tasks/test_include.yml
+++ b/test/integration/targets/unarchive/tasks/test_include.yml
@@ -15,6 +15,7 @@
   unarchive:
     src: "{{ remote_tmp_dir }}/test-unarchive.zip"
     dest: "{{ remote_tmp_dir }}/include-zip"
+    remote_src: yes
     include:
       - FOO-UNAR.TXT
 
@@ -39,6 +40,7 @@
   unarchive:
     src: "{{ remote_tmp_dir }}/test-unarchive-multi.tar"
     dest: "{{ remote_tmp_dir }}/include-tar"
+    remote_src: yes
     include:
       - foo-unarchive-777.txt
 
@@ -61,6 +63,7 @@
   unarchive:
     src: "{{ remote_tmp_dir }}/test-unarchive-multi.tar"
     dest: "{{ remote_tmp_dir }}/include-tar"
+    remote_src: yes
     include:
       - foo-unarchive-777.txt
     exclude:
diff --git a/test/integration/targets/yum_repository/tasks/main.yml b/test/integration/targets/yum_repository/tasks/main.yml
index d81957755c273e..96f7d3f903189d 100644
--- a/test/integration/targets/yum_repository/tasks/main.yml
+++ b/test/integration/targets/yum_repository/tasks/main.yml
@@ -106,6 +106,11 @@
         module_hotfixes: no
       register: test_repo_add1
 
+    - name: Get repo file contents
+      slurp:
+        path: "{{ '/etc/yum.repos.d/' ~ yum_repository_test_repo.name ~ '2.repo' }}"
+      register: slurp
+
     - name: check that options are correctly getting written to the repo file
       assert:
         that:
@@ -116,8 +121,7 @@
           - "'keepalive = 0' in repo_file_contents"
           - "'module_hotfixes = 0' in repo_file_contents"
       vars:
-        repo_file: "{{ '/etc/yum.repos.d/' ~ yum_repository_test_repo.name ~ '2.repo' }}"
-        repo_file_contents: "{{ lookup('file', repo_file) }}"
+        repo_file_contents: "{{ slurp.content | b64decode }}"
 
     - name: check new config doesn't change (Idempotant)
       yum_repository:
@@ -175,6 +179,11 @@
           - ddd
       notify: remove listtest repo
 
+    - name: Get repo file
+      slurp:
+        path: /etc/yum.repos.d/listtest.repo
+      register: slurp
+
     - name: Assert that lists were properly inserted
       assert:
         that:
@@ -185,6 +194,6 @@
           - "'aaa bbb' in repofile"
           - "'ccc ddd' in repofile"
       vars:
-        repofile: "{{ lookup('file', '/etc/yum.repos.d/listtest.repo') }}"
+        repofile: "{{ slurp.content | b64decode }}"
         url_hostname: "{{ yum_repository_test_repo.baseurl | urlsplit('hostname') }}"
         url_hostname2: "{{ url_hostname | replace('download[0-9]?\\.', 'download2\\.', 1) }}"