tests: add Alpine Linux

ddterm · Dec 30, 2024 · 22bdc25 · 22bdc25
1 parent 1f60953
commit 22bdc25
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -49,7 +49,6 @@ jobs:
     env:
       FORCE_COLOR: 1
       PIP_DISABLE_PIP_VERSION_CHECK: 1
-      LOG_STDIO: '["debian-12", "fedora-41"]'
 
     steps:
     - name: Checkout
@@ -108,7 +107,7 @@ jobs:
         --junitxml=junit.xml
         --container ${{ matrix.service }}
         --package ../*.shell-extension.zip
-        ${{ !contains(fromJson(env.LOG_STDIO), matrix.service) && '--journald' || '' }}
+        ${{ !contains(matrix.service, 'alpine') && '--journald' || '' }}
         -n auto
         -vv
       working-directory: test

diff --git a/test/compose.yaml b/test/compose.yaml
@@ -8,6 +8,21 @@
 # Or 'tox -e images pull'.
 
 services:
+  alpine-3.19:
+    image: ghcr.io/ddterm/gnome-shell-image/alpine-3.19:2024.12.29.0
+    profiles:
+      - esm
+
+  alpine-3.20:
+    image: ghcr.io/ddterm/gnome-shell-image/alpine-3.20:2024.12.29.0
+    profiles:
+      - esm
+
+  alpine-3.21:
+    image: ghcr.io/ddterm/gnome-shell-image/alpine-3.21:2024.12.29.0
+    profiles:
+      - esm
+
   fedora-40:
     image: ghcr.io/ddterm/gnome-shell-image/fedora-40:2024.12.29.0
     profiles:

diff --git a/test/conftest.py b/test/conftest.py
@@ -251,7 +251,17 @@ def shutdown():
                 timeout=procutil.DEFAULT_TIMEOUT,
             )
 
-            container_launcher.run('systemctl', 'is-system-running', '--wait')
+            container_launcher.run(
+                'gdbus',
+                'wait',
+                '--system',
+                f'--timeout={procutil.DEFAULT_TIMEOUT // 2}',
+                'org.freedesktop.login1',
+                timeout=procutil.DEFAULT_TIMEOUT,
+            )
+
+            # required for Alpine only
+            container_launcher.run('mkdir', '-p', '-m', '01777', '/tmp/.X11-unix')
 
         yield cid
 

diff --git a/test/test_app.py b/test/test_app.py
@@ -275,6 +275,8 @@ def test_prefs_leak(
 
     def test_dependencies(self, process_launcher):
         process_launcher.run(
+            'gjs',
+            '-m',
             str(SRC_DIR / 'ddterm' / 'app' / 'tools' / 'dependencies-update.js'),
             '--dry-run',
             timeout=60,