Merge pull request #877 from p12tic/tests-faster

tests: Optimize speed by using dumb-init to handle SIGTERM signal

tests/__init__.py

@@ -0,0 +1,12 @@
+import os
+import subprocess
+
+
+def create_base_test_image():
+    subprocess.check_call(
+        ['podman', 'build', '-t', 'nopush/podman-compose-test', '.'],
+        cwd=os.path.join(os.path.dirname(__file__), "base_image"),
+    )
+
+
+create_base_test_image()

tests/base_image/Dockerfile

@@ -0,0 +1,6 @@
+FROM docker.io/library/debian:bookworm-slim
+RUN apt-get update \
+    && apt-get install -y \
+        dumb-init \
+        busybox \
+        wget

tests/deps/docker-compose.yaml

@@ -1,22 +1,22 @@
 version: "3.7"
 services:
     web:
-      image: busybox
+      image: nopush/podman-compose-test
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/etc/", "-p", "8000"]
+      command: ["dumb-init", "/bin/busybox", "httpd", "-f", "-h", "/etc/", "-p", "8000"]
       tmpfs:
         - /run
         - /tmp
     sleep:
-      image: busybox
+      image: nopush/podman-compose-test
-      command: ["/bin/busybox", "sh", "-c", "sleep 3600"]
+      command: ["dumb-init", "/bin/busybox", "sh", "-c", "sleep 3600"]
       depends_on:
         - "web"
       tmpfs:
         - /run
         - /tmp
     sleep2:
-      image: busybox
+      image: nopush/podman-compose-test
-      command: ["/bin/busybox", "sh", "-c", "sleep 3600"]
+      command: ["dumb-init", "/bin/busybox", "sh", "-c", "sleep 3600"]
       depends_on:
       - sleep
       tmpfs:

tests/exit-from/docker-compose.yaml

@@ -1,20 +1,20 @@
 version: "3"
 services:
     too_long:
-      image: busybox
+      image: nopush/podman-compose-test
-      command: ["/bin/busybox", "sh", "-c", "sleep 3600; exit 0"]
+      command: ["dumb-init", "/bin/busybox", "sh", "-c", "sleep 3600; exit 0"]
       tmpfs:
         - /run
         - /tmp
     sh1:
-      image: busybox
+      image: nopush/podman-compose-test
-      command: ["/bin/busybox", "sh", "-c", "sleep 5; exit 1"]
+      command: ["dumb-init", "/bin/busybox", "sh", "-c", "sleep 1; exit 1"]
       tmpfs:
         - /run
         - /tmp
     sh2:
-      image: busybox
+      image: nopush/podman-compose-test
-      command: ["/bin/busybox", "sh", "-c", "sleep 5; exit 2"]
+      command: ["dumb-init", "/bin/busybox", "sh", "-c", "sleep 1; exit 2"]
       tmpfs:
         - /run
         - /tmp

tests/extends_w_empty_service/common-services.yml

@@ -2,6 +2,6 @@ services:
   webapp_default:
 
   webapp_special:
-    image: busybox
+    image: nopush/podman-compose-test
     volumes:
       - "/data"

tests/extends_w_empty_service/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3"
 services:
   web:
-    image: busybox
+    image: nopush/podman-compose-test
     extends:
       file: common-services.yml
       service: webapp_default

tests/extends_w_file_subdir/sub/docker/example/Dockerfile

@@ -1 +1 @@
-FROM busybox as base
+FROM nopush/podman-compose-test as base

tests/include/docker-compose.base.yaml

@@ -2,6 +2,6 @@ version: '3.6'
 
 services:
   web:
-    image: busybox
+    image: nopush/podman-compose-test
-    command: ["/bin/busybox", "httpd", "-f", "-h", ".", "-p", "8003"]
+    command: ["dumb-init", "/bin/busybox", "httpd", "-f", "-h", ".", "-p", "8003"]
 

tests/ports/docker-compose.yml

@@ -1,18 +1,18 @@
 version: "3"
 services:
     web1:
-      image: busybox
+      image: nopush/podman-compose-test
       hostname: web1
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8001"]
+      command: ["dumb-init", "/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8001"]
       working_dir: /var/www/html
       ports:
         - 8001:8001
       volumes:
         - ./test1.txt:/var/www/html/index.txt:ro,z
     web2:
-      image: busybox
+      image: nopush/podman-compose-test
       hostname: web2
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8002"]
+      command: ["dumb-init", "/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8002"]
       working_dir: /var/www/html
       ports:
         - 8002:8002

tests/profile/docker-compose.yml

@@ -1,24 +1,24 @@
 version: "3"
 services:
     default-service:
-      image: busybox
+      image: nopush/podman-compose-test
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/etc/", "-p", "8000"]
+      command: ["dumb-init", "/bin/busybox", "httpd", "-f", "-h", "/etc/", "-p", "8000"]
       tmpfs:
         - /run
         - /tmp
     service-1:
-      image: busybox
+      image: nopush/podman-compose-test
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/etc/", "-p", "8000"]
+      command: ["dumb-init", "/bin/busybox", "httpd", "-f", "-h", "/etc/", "-p", "8000"]
       tmpfs:
         - /run
         - /tmp
       profiles:
         - profile-1
     service-2:
-      image: busybox
+      image: nopush/podman-compose-test
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/etc/", "-p", "8000"]
+      command: ["dumb-init", "/bin/busybox", "httpd", "-f", "-h", "/etc/", "-p", "8000"]
       tmpfs:
         - /run
         - /tmp
       profiles:
-        - profile-2
+        - profile-2

tests/test_podman_compose_include.py

@@ -49,7 +49,7 @@ class TestPodmanComposeInclude(unittest.TestCase, RunSubprocessMixin):
 
         self.run_subprocess_assert_returncode(command_up)
         out, _ = self.run_subprocess_assert_returncode(command_check_container)
-        self.assertEqual(out, b'"docker.io/library/busybox:latest"\n')
+        self.assertEqual(out, b'"localhost/nopush/podman-compose-test:latest"\n')
         # Get container ID to remove it
         out, _ = self.run_subprocess_assert_returncode(command_container_id)
         self.assertNotEqual(out, b"")

tests/test_podman_compose_tests.py

@@ -155,7 +155,8 @@ class TestPodmanCompose(unittest.TestCase, RunSubprocessMixin):
             "run",
             "--rm",
             "-d",
-            "busybox",
+            "nopush/podman-compose-test",
+            "dumb-init",
             "/bin/busybox",
             "httpd",
             "-f",

tests/vol/docker-compose.yaml

@@ -1,8 +1,8 @@
 version: "3"
 services:
     web:
-      image: busybox
+      image: nopush/podman-compose-test
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8000"]
+      command: ["dumb-init", "/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8000"]
       working_dir: /var/www/html
       restart: always
       volumes:
@@ -11,21 +11,21 @@ services:
         - /run
         - /tmp
     web1:
-      image: busybox
+      image: nopush/podman-compose-test
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8001"]
+      command: ["dumb-init", "/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8001"]
       restart: unless-stopped
       working_dir: /var/www/html
       volumes:
         - myvol1:/var/www/html:ro,z
     web2:
-      image: busybox
+      image: nopush/podman-compose-test
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8002"]
+      command: ["dumb-init", "/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8002"]
       working_dir: /var/www/html
       volumes:
         - myvol2:/var/www/html:ro
     web3:
-      image: busybox
+      image: nopush/podman-compose-test
-      command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8003"]
+      command: ["dumb-init", "/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8003"]
       working_dir: /var/www/html
       volumes:
         - myvol2:/var/www/html