From 70bcf86797e3e64064ae4003af67744677e160a1 Mon Sep 17 00:00:00 2001
From: Sebastian Wick <sebastian.wick@redhat.com>
Date: Wed, 4 Dec 2024 21:54:30 +0100
Subject: [PATCH] FIXME: pytest-tap

---
 .github/workflows/Containerfile | 7 ++++---
 .github/workflows/container.yml | 2 +-
 tests/meson.build               | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/Containerfile b/.github/workflows/Containerfile
index 17fd820e5..e5539baf5 100644
--- a/.github/workflows/Containerfile
+++ b/.github/workflows/Containerfile
@@ -42,6 +42,9 @@ RUN apt install -y --no-install-recommends \
 # Install meson
 RUN apt install -y --no-install-recommends meson
 
+# Install pip
+RUN apt install -y --no-install-recommends python3-pip
+
 # Install pytest
 RUN apt install -y --no-install-recommends \
     python3-pytest \
@@ -52,9 +55,7 @@ RUN apt install -y --no-install-recommends \
     libumockdev-dev \
     umockdev \
     gir1.2-umockdev-1.0
-
-# Install pip
-RUN apt install -y --no-install-recommends python3-pip
+RUN pip install --user --break-system-packages pytest-xdist pytest-tap
 
 # Install doc dependencies
 RUN pip install --user --break-system-packages furo">=2024.04.27" \
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index bc1faba7a..396fd740b 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -1,5 +1,5 @@
 env:
-  IMAGE_TAG: 20241204-1
+  IMAGE_TAG: 20241204-2
 
 on:
   workflow_call:
diff --git a/tests/meson.build b/tests/meson.build
index 53a19d805..4b5dd2981 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -182,7 +182,7 @@ if enable_pytest
     foreach pytest_file : pytest_files
       testname = pytest_file.replace('.py', '')
 
-      exec = [pytest.full_path(), installed_tests_dir / 'tests'] + pytest_args + ['--tap', '-k', testname]
+      exec = [pytest.full_path(), installed_tests_dir / 'tests'] + pytest_args + ['-k', testname]
       exec = ' '.join(exec)
 
       data = configuration_data()