Apply Pino's review

Author: spetrosi

tests/tasks/remove_candlepin_container.yml

@@ -3,6 +3,9 @@
 - name: Setup the test data
   import_tasks: setup_test_data.yml
 
+- name: Remove Candlepin container
+  include_tasks: teardown_candlepin.yml
+
 - name: Deploy Candlepin
   when: lsr_rhc_test_data_file | length == 0
   block:
@@ -36,9 +39,6 @@
         use: "{{ __rhc_is_ostree |
                  ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
 
-    - name: Remove Candlepin container
-      include_tasks: remove_candlepin_container.yml
-
     - name: Start Candlepin container
       vars:
         podman_run_cli:

tests/tasks/setup_candlepin.yml

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: MIT
+---
+- name: Teardown Candlepin container
+  when: lsr_rhc_test_data_file | length == 0
+  block:
+    - name: Stop and remove Candlepin container
+      command:
+        argv:
+          - podman
+          - stop
+          - candlepin
+      changed_when: true

tests/tasks/teardown_candlepin.yml

@@ -109,4 +109,4 @@
                 rhc_state: absent
       always:
         - name: Clean up Candlepin container
-          include_tasks: tasks/remove_candlepin_container.yml
+          include_tasks: tasks/teardown_candlepin.yml

tests/tests_environments.yml

@@ -357,7 +357,7 @@
             rhc_state: absent
 
         - name: Clean up Candlepin container
-          include_tasks: tasks/remove_candlepin_container.yml
+          include_tasks: tasks/teardown_candlepin.yml
 
         - name: Remove SELinux policy for proxy ports
           include_role:

tests/tests_proxy.yml

@@ -190,4 +190,4 @@
             rhc_state: absent
 
         - name: Clean up Candlepin container
-          include_tasks: tasks/remove_candlepin_container.yml
+          include_tasks: tasks/teardown_candlepin.yml

tests/tests_register_unregister.yml

@@ -102,4 +102,4 @@
             rhc_state: absent
 
         - name: Clean up Candlepin container
-          include_tasks: tasks/remove_candlepin_container.yml
+          include_tasks: tasks/teardown_candlepin.yml