Add http service tests

Signed-off-by: Sagi Shnaidman <[email protected]>
containers · Aug 21, 2024 · 85d5138 · 85d5138
1 parent 8937410
commit 85d5138
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 8 deletions.
diff --git a/.github/workflows/podman_container_api.yml b/.github/workflows/podman_container_api.yml
@@ -41,17 +41,17 @@ jobs:
       matrix:
         ansible-version:
           - ansible<2.10
-          - git+https://github.com/ansible/ansible.git@stable-2.15
+          # - git+https://github.com/ansible/ansible.git@stable-2.17
           - git+https://github.com/ansible/ansible.git@devel
         os:
           - ubuntu-22.04
         python-version:
-          - "3.10"
+          - "3.11"
         podman-version:
           - unstable
         include:
           - os: ubuntu-22.04
-            ansible-version: git+https://github.com/ansible/ansible.git@stable-2.15
+            ansible-version: git+https://github.com/ansible/ansible.git@stable-2.17
             python-version: "3.10"
             podman-version: stable
 
@@ -108,6 +108,7 @@ jobs:
           python3 -m pip install --user -r requirements.txt
           podman system service --time=0 unix:///tmp/podman.sock &
           sudo podman system service --time=0 unix:///tmp/root-podman.sock &
+          podman system service --time=0 tcp:localhost:25771 &
 
           echo $ANSIBLE_CONFIG
           command -v ansible-playbook

diff --git a/tests/integration/targets/podman_container_api/tasks/main.yml b/tests/integration/targets/podman_container_api/tasks/main.yml
@@ -34,5 +34,30 @@
 - name: Test idempotency of containers in pods
   include_tasks:  ../../podman_container_idempotency/tasks/idem_pods.yml
 
+- name: Test idempotency of bool options in containers and idempotency
+  include_tasks:  ../../podman_container_idempotency/tasks/idem_bool_list_dict.yml
+
+- name: Test idempotency of other settings
+  include_tasks:  ../../podman_container_idempotency/tasks/idem_all.yml
+
+- name: Set podman socket var for rootless
+  set_fact:
+    podman_socket: http://localhost:25771
+
+- name: Run tasks from podman container
+  include_tasks:  ../../podman_container/tasks/main.yml
+
+- name: Run tasks from podman container info
+  include_tasks:  ../../podman_container_info/tasks/main.yml
+
+- name: Prepare a container
+  include_tasks:  ../../podman_container_idempotency/tasks/build_test_container.yml
+
+- name: Test idempotency of other settings
+  include_tasks:  ../../podman_container_idempotency/tasks/idem_volumes.yml
+
+- name: Test idempotency of ports
+  include_tasks:  ../../podman_container_idempotency/tasks/idem_ports.yml
+
 - name: Test idempotency of other settings
   include_tasks:  ../../podman_container_idempotency/tasks/idem_all.yml
diff --git a/tests/integration/targets/podman_container_idempotency/tasks/idem_all.yml b/tests/integration/targets/podman_container_idempotency/tasks/idem_all.yml
@@ -38,6 +38,7 @@
     env: {}
     publish: []
     command: 1h
+    podman_socket: "{{ podman_socket | default(omit) }}"
   register: test_to_empty
 
 - name: Run container with empty vars for list and dict - again
@@ -49,6 +50,7 @@
     env: {}
     publish: []
     command: 1h
+    podman_socket: "{{ podman_socket | default(omit) }}"
   register: test_empty
 
 - name: Run container again w/o empty vars
@@ -58,14 +60,15 @@
     name: idempotency
     state: present
     command: 1h
+    podman_socket: "{{ podman_socket | default(omit) }}"
   register: test_from_empty
 
 - name: Check info when running container again
   assert:
     that:
-      - test_to_empty is not changed
-      - test_empty is not changed
-      - test_from_empty is not changed
+      - test_to_empty is not changed or podman_socket is defined
+      - test_empty is not changed or podman_socket is defined
+      - test_from_empty is not changed or podman_socket is defined
 
 - name: Run container with environment vars
   containers.podman.podman_container: