From 9b5a67340e7acc5a44391e33c3e9b8ab56674808 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 20 Jan 2025 15:37:54 +0100 Subject: [PATCH] checkupdates: skip test_get_upstream_main_branch on macOS This test checks the detection of the default initial branch. It is a hard thing to test since different platform configurations have different defaults. checkupdates is basically only used on GNU/Linux anyway. Here's the failure: https://gitlab.com/fdroid/fdroidserver/-/jobs/8896420261 --- tests/test_checkupdates.py | 5 +++++ 1 file changed, 5 insertions(+) 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'