tests/run-tests: stop skipping install.TestCase

This commit is contained in:
Hans-Christoph Steiner 2024-10-23 08:47:46 +02:00
parent 27e3b5066a
commit acae5f1ac9
2 changed files with 4 additions and 5 deletions

View file

@ -33,7 +33,10 @@ class InstallTest(unittest.TestCase):
config = dict() config = dict()
fdroidserver.common.fill_config_defaults(config) fdroidserver.common.fill_config_defaults(config)
fdroidserver.common.config = 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.exists(config['adb']))
self.assertTrue(os.path.isfile(config['adb'])) self.assertTrue(os.path.isfile(config['adb']))
devices = fdroidserver.install.devices() devices = fdroidserver.install.devices()

View file

@ -172,10 +172,6 @@ echo_header "run unit tests"
cd $WORKSPACE/tests cd $WORKSPACE/tests
for testcase in $WORKSPACE/tests/*.TestCase; do 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 if [ $(uname) != "Linux" ] && [ $testcase == $WORKSPACE/tests/nightly.TestCase ]; then
echo "skipping nightly.TestCase, it currently only works GNU/Linux" echo "skipping nightly.TestCase, it currently only works GNU/Linux"
continue continue