Move 'docker' homebrew tests into homebrew tests (#8395)

Move 'docker' homebrew tests into homebrew tests.
ansible-collections · May 20, 2024 · 9b0c983 · 9b0c983
1 parent 704a5ac
commit 9b0c983
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 46 deletions.
diff --git a/tests/integration/targets/docker/tasks/main.yml b/tests/integration/targets/docker/tasks/main.yml
diff --git a/...egration/targets/docker/handlers/main.yml → ...ration/targets/homebrew/handlers/main.yml b/...egration/targets/docker/handlers/main.yml → ...ration/targets/homebrew/handlers/main.yml
diff --git a/tests/integration/targets/homebrew/tasks/casks.yml b/tests/integration/targets/homebrew/tasks/casks.yml
@@ -12,13 +12,11 @@
 - name: Find brew binary
   command: which brew
   register: brew_which
-  when: ansible_distribution in ['MacOSX']
 
 - name: Get owner of brew binary
   stat:
     path: "{{ brew_which.stdout }}"
   register: brew_stat
-  when: ansible_distribution in ['MacOSX']
 
 #- name: Use ignored-pinned option while upgrading all
 #  homebrew:

diff --git a/tests/integration/targets/homebrew/tasks/docker.yml b/tests/integration/targets/homebrew/tasks/docker.yml
@@ -0,0 +1,37 @@
+---
+# Copyright (c) Ansible Project
+# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+- name: MACOS | Find brew binary
+  command: which brew
+  register: brew_which
+
+- name: MACOS | Get owner of brew binary
+  stat:
+    path: "{{ brew_which.stdout }}"
+  register: brew_stat
+
+- name: MACOS | Install docker without --formula
+  community.general.homebrew:
+    name: docker
+    state: present
+  become: true
+  become_user: "{{ brew_stat.stat.pw_name }}"
+  ignore_errors: true
+  register: result
+
+- name: Check that installing docker without --formula raises warning
+  assert:
+    that:
+      - result is failed
+
+- name: MACOS | Install docker
+  community.general.homebrew:
+    name: docker
+    state: present
+    force_formula: true
+  become: true
+  become_user: "{{ brew_stat.stat.pw_name }}"
+  notify:
+    - uninstall docker
diff --git a/tests/integration/targets/homebrew/tasks/formulae.yml b/tests/integration/targets/homebrew/tasks/formulae.yml
@@ -12,13 +12,11 @@
 - name: Find brew binary
   command: which brew
   register: brew_which
-  when: ansible_distribution in ['MacOSX']
 
 - name: Get owner of brew binary
   stat:
     path: "{{ brew_which.stdout }}"
   register: brew_stat
-  when: ansible_distribution in ['MacOSX']
 
 #- name: Use ignored-pinned option while upgrading all
 #  homebrew:

diff --git a/tests/integration/targets/homebrew/tasks/main.yml b/tests/integration/targets/homebrew/tasks/main.yml
@@ -9,9 +9,8 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-- block:
-  - include_tasks: 'formulae.yml'
-
 - when: ansible_distribution in ['MacOSX']
   block:
+    - include_tasks: 'formulae.yml'
     - include_tasks: 'casks.yml'
+    - include_tasks: 'docker.yml'