➕ Install xvfb in Jammy image

.github/Dockerfiles/Ubuntu.jammy-non-free.Dockerfile

@@ -56,6 +56,7 @@ RUN groupadd -r c-pac \
       graphviz-dev \
       locales \
       rdfind \
+      xvfb \
     && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \
     && echo $TZ > /etc/timezone \
     && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \

CPAC/surface/tests/test_installation.py

@@ -17,7 +17,7 @@
 """Tests for requisite surface prerequisites"""
 import os
 import pytest
-from CPAC.utils.monitoring.custom_logging import log_subprocess
+from CPAC.utils.tests.test_utils import _installation_check
 
 
 @pytest.mark.parametrize("executable", ["bc", "csh"])
@@ -27,5 +27,4 @@
                            "have FreeSurfer.")
 def test_executable(executable):
     """Make sure executable is installed"""
-    _, exit_code = log_subprocess([executable, "--version"])
-    assert exit_code == 0
+    _installation_check(executable, "--version")

CPAC/utils/tests/test_utils.py

@@ -5,6 +5,7 @@
 from CPAC.func_preproc import get_motion_ref
 from CPAC.pipeline.nodeblock import NodeBlockFunction
 from CPAC.utils.configuration import Configuration
+from CPAC.utils.monitoring.custom_logging import log_subprocess
 from CPAC.utils.utils import check_config_resources, check_system_deps, \
                              try_fetch_parameter
 
@@ -22,6 +23,31 @@
 }
 
 
+def _installation_check(command: str, flag: str) -> None:
+    """Test that command is installed by running specified version or
+    help flag.
+
+    Parameters
+    ----------
+    command : str
+        Command to run.
+
+    flag : str
+        Version or help flag to run.
+
+    Raises
+    ------
+    AssertionError
+        If command is not installed.
+
+    Returns
+    -------
+    None
+    """
+    _, exit_code = log_subprocess([command, flag])
+    assert exit_code == 0
+
+
 def test_check_config_resources():
     """Test check_config_resources function."""
     with mock.patch.object(multiprocessing, 'cpu_count', return_value=2), \
@@ -43,6 +69,12 @@ def test_function():
     assert TR == 2.5
 
 
+@pytest.mark.parametrize("executable", ["Xvfb"])
+def test_executable(executable):
+    """Make sure executable is installed"""
+    _installation_check(executable, "-help")
+
+
 def test_NodeBlock_option_SSOT():  # pylint: disable=invalid-name
     '''Test using NodeBlock dictionaries for SSOT for options'''
     assert isinstance(get_motion_ref, NodeBlockFunction)