kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-18 20:50:10 +01:00
Code Activity

Skip nightly test on Fedora with pip in $HOME

Browse Source
This commit is contained in:
Jochen Sprickerhof 2022-11-30 12:49:21 +01:00 committed by Hans-Christoph Steiner
parent b293252029
commit 6118925387
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -274,6 +274,7 @@ fedora_latest:
git git
gnupg gnupg
java-17-openjdk-devel java-17-openjdk-devel
openssl
python3 python3
python3-babel python3-babel
python3-matplotlib python3-matplotlib

14
tests/nightly.TestCase
View File

@ -246,7 +246,14 @@ class NightlyTest(unittest.TestCase):
): ):
self.assertTrue(self.testroot == Path.home().parent) self.assertTrue(self.testroot == Path.home().parent)
with patch('subprocess.check_call', _subprocess_check_call): with patch('subprocess.check_call', _subprocess_check_call):
try:
nightly.main() nightly.main()
except exception.BuildException as e:
if "apksigner not found" in e.value:
self.skipTest("skipping, apksigner not found due to fake $HOME")
else:
raise
self.assertEqual(called, [['ssh', '-Tvi'], ['fdroid', 'deploy']]) self.assertEqual(called, [['ssh', '-Tvi'], ['fdroid', 'deploy']])
self.assertFalse(os.path.exists('config.py')) self.assertFalse(os.path.exists('config.py'))
git_url = 'git@github.com:f-droid/test-nightly' git_url = 'git@github.com:f-droid/test-nightly'
@ -314,7 +321,14 @@ class NightlyTest(unittest.TestCase):
): ):
self.assertTrue(self.testroot == Path.home().parent) self.assertTrue(self.testroot == Path.home().parent)
with patch('subprocess.check_call', _subprocess_check_call): with patch('subprocess.check_call', _subprocess_check_call):
try:
nightly.main() nightly.main()
except exception.BuildException as e:
if "apksigner not found" in e.value:
self.skipTest("skipping, apksigner not found due to fake $HOME")
else:
raise
self.assertEqual(called, [['ssh', '-Tvi'], ['fdroid', 'deploy']]) self.assertEqual(called, [['ssh', '-Tvi'], ['fdroid', 'deploy']])
self.assertFalse(os.path.exists('config.py')) self.assertFalse(os.path.exists('config.py'))
expected = { expected = {