diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00fd097c..866a2ec8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,6 +99,7 @@ debian_testing: git gnupg ipfs-cid + python3-biplist python3-defusedxml python3-pycountry python3-setuptools @@ -124,7 +125,14 @@ ubuntu_lts_ppa: - echo "deb http://ppa.launchpad.net/fdroid/fdroidserver/ubuntu $RELEASE main" >> /etc/apt/sources.list - apt-get update - apt-get dist-upgrade - - apt-get install --install-recommends dexdump fdroidserver git python3-pycountry python3-setuptools sdkmanager + - apt-get install --install-recommends + dexdump + fdroidserver + git + python3-biplist + python3-pycountry + python3-setuptools + sdkmanager # Test things work with a default branch other than 'master' - git config --global init.defaultBranch thisisnotmasterormain @@ -350,7 +358,7 @@ macOS: - /bin/bash -n gradlew-fdroid tests/run-tests # TODO remove the packages below once they are included in the Homebrew package - - $(brew --prefix fdroidserver)/libexec/bin/python3 -m pip install pycountry + - $(brew --prefix fdroidserver)/libexec/bin/python3 -m pip install biplist pycountry # test fdroidserver from git with current package's dependencies - fdroid="$(brew --prefix fdroidserver)/libexec/bin/python3 $PWD/fdroid" ./tests/run-tests diff --git a/tests/update.TestCase b/tests/update.TestCase index cf8a222a..bebab3f0 100755 --- a/tests/update.TestCase +++ b/tests/update.TestCase @@ -1935,6 +1935,12 @@ class UpdateTest(unittest.TestCase): ) def test_parse_ipa(self): + try: + import biplist # Fedora does not have a biplist package + + biplist # silence the linters + except ImportError as e: + self.skipTest(str(e)) ipa_path = os.path.join( os.path.dirname(os.path.abspath(__file__)), 'com.fake.IpaApp_1000000000001.ipa',