diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 27455c75..87036d60 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -183,21 +183,6 @@ ubuntu_jammy_pip: - LANGUAGE='de' fdroid --help | grep 'Gültige Befehle sind' -# test installation process on a bleeding edge distro with pip -arch_pip_install: - image: archlinux - only: - - master@fdroid/fdroidserver - script: - - pacman --sync --sysupgrade --refresh --noconfirm gcc git grep python-pip python-virtualenv python-wheel tar - - python -m venv venv - - source venv/bin/activate - - pip install -e .[test] - - fdroid - - fdroid readmeta - - fdroid update --help - - # The gradlew-fdroid tests are isolated from the rest of the test # suite, so they run as their own job. gradlew-fdroid: diff --git a/tests/test_checkupdates.py b/tests/test_checkupdates.py index 87420d2b..fcd6f642 100755 --- a/tests/test_checkupdates.py +++ b/tests/test_checkupdates.py @@ -2,6 +2,7 @@ import git import os +import platform import shutil import tempfile import time @@ -490,6 +491,10 @@ class CheckupdatesTest(unittest.TestCase): fdroidserver.checkupdates.main() sys_exit.assert_not_called() + @unittest.skipIf( + platform.system() == 'Darwin', + 'It is difficult to configure the base system for this test.', + ) def test_get_upstream_main_branch(self): os.chdir(self.testdir.name) testvalue = 'foo'