From acae5f1ac9afe62808b82992131526ab3f4590ca Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 23 Oct 2024 08:47:46 +0200
Subject: [PATCH] tests/run-tests: stop skipping install.TestCase

---
 tests/install.TestCase | 5 ++++-
 tests/run-tests        | 4 ----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/install.TestCase b/tests/install.TestCase
index ea53f6a3..351cc420 100755
--- a/tests/install.TestCase
+++ b/tests/install.TestCase
@@ -33,7 +33,10 @@ class InstallTest(unittest.TestCase):
         config = dict()
         fdroidserver.common.fill_config_defaults(config)
         fdroidserver.common.config = config
-        config['adb'] = fdroidserver.common.find_sdk_tools_cmd('adb')
+        try:
+            config['adb'] = fdroidserver.common.find_sdk_tools_cmd('adb')
+        except FDroidException as e:
+            self.skipTest(f'Skipping test because: {e}')
         self.assertTrue(os.path.exists(config['adb']))
         self.assertTrue(os.path.isfile(config['adb']))
         devices = fdroidserver.install.devices()
diff --git a/tests/run-tests b/tests/run-tests
index 9a0dafbc..303327a5 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -172,10 +172,6 @@ echo_header "run unit tests"
 
 cd $WORKSPACE/tests
 for testcase in $WORKSPACE/tests/*.TestCase; do
-    if [ $testcase == $WORKSPACE/tests/install.TestCase ]; then
-        echo "skipping install.TestCase, its too troublesome in CI builds"
-        continue
-    fi
     if [ $(uname) != "Linux" ] && [ $testcase == $WORKSPACE/tests/nightly.TestCase ]; then
         echo "skipping nightly.TestCase, it currently only works GNU/Linux"
         continue