mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

scanner: remove asLibraryDependency from catalog accessor

Browse source
This commit is contained in:
linsui 2025-08-08 23:14:12 +08:00 • committed by Michael Pöhn
parent 5f6e59c76d
commit 5ded08048b
4 changed files with 88 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

128
tests/test_scanner.py
View file

@ -165,6 +165,9 @@ class ScannerTest(unittest.TestCase):
'com.google.firebase:firebase-crash:1.1.1',
'com.google.firebase:firebase-core:2.2.2',
],
'plugins.androidApplication.asLibraryDependency': [
'com.android.application:8.12.0'
],
}
with open('source-files/catalog.test/gradle/libs.versions.toml', 'rb') as f:
catalog = fdroidserver.scanner.GradleVersionCatalog(tomllib.load(f))
@ -354,11 +357,15 @@ class ScannerTest(unittest.TestCase):
with mock.patch('fdroidserver.common.replace_build_vars', wraps=make_fake_apk):
with mock.patch('fdroidserver.common.get_native_code', return_value='x86'):
with mock.patch(
'fdroidserver.common.get_apk_id',
return_value=(app.id, build.versionCode, build.versionName),
), mock.patch(
'fdroidserver.common.get_source_date_epoch', lambda f: '1234567890'
with (
mock.patch(
'fdroidserver.common.get_apk_id',
return_value=(app.id, build.versionCode, build.versionName),
),
mock.patch(
'fdroidserver.common.get_source_date_epoch',
lambda f: '1234567890',
),
):
with mock.patch(
'fdroidserver.common.is_debuggable_or_testOnly',
@ -672,15 +679,19 @@ class Test_SignatureDataController(unittest.TestCase):
func_lfc = mock.Mock()
func_vd = mock.Mock()
func_clu = mock.Mock()
with mock.patch(
'fdroidserver.scanner.SignatureDataController.load_from_cache',
func_lfc,
), mock.patch(
'fdroidserver.scanner.SignatureDataController.verify_data',
func_vd,
), mock.patch(
'fdroidserver.scanner.SignatureDataController.check_last_updated',
func_clu,
with (
mock.patch(
'fdroidserver.scanner.SignatureDataController.load_from_cache',
func_lfc,
),
mock.patch(
'fdroidserver.scanner.SignatureDataController.verify_data',
func_vd,
),
mock.patch(
'fdroidserver.scanner.SignatureDataController.check_last_updated',
func_clu,
),
):
sdc.load()
func_lfc.assert_called_once_with()
@ -695,12 +706,15 @@ class Test_SignatureDataController(unittest.TestCase):
side_effect=fdroidserver.scanner.SignatureDataCacheMissException
)
func_lfd = mock.Mock()
with mock.patch(
'fdroidserver.scanner.SignatureDataController.load_from_cache',
func_lfc,
), mock.patch(
'fdroidserver.scanner.SignatureDataController.load_from_defaults',
func_lfd,
with (
mock.patch(
'fdroidserver.scanner.SignatureDataController.load_from_cache',
func_lfc,
),
mock.patch(
'fdroidserver.scanner.SignatureDataController.load_from_defaults',
func_lfd,
),
):
sdc.load()
func_lfc.assert_called_once_with()
@ -717,21 +731,27 @@ class Test_SignatureDataController(unittest.TestCase):
)
func_fsfw = mock.Mock()
func_wtc = mock.Mock()
with mock.patch(
'fdroidserver.scanner.SignatureDataController.load_from_cache',
func_lfc,
), mock.patch(
'fdroidserver.scanner.SignatureDataController.verify_data',
func_vd,
), mock.patch(
'fdroidserver.scanner.SignatureDataController.check_last_updated',
func_clu,
), mock.patch(
'fdroidserver.scanner.SignatureDataController.fetch_signatures_from_web',
func_fsfw,
), mock.patch(
'fdroidserver.scanner.SignatureDataController.write_to_cache',
func_wtc,
with (
mock.patch(
'fdroidserver.scanner.SignatureDataController.load_from_cache',
func_lfc,
),
mock.patch(
'fdroidserver.scanner.SignatureDataController.verify_data',
func_vd,
),
mock.patch(
'fdroidserver.scanner.SignatureDataController.check_last_updated',
func_clu,
),
mock.patch(
'fdroidserver.scanner.SignatureDataController.fetch_signatures_from_web',
func_fsfw,
),
mock.patch(
'fdroidserver.scanner.SignatureDataController.write_to_cache',
func_wtc,
),
):
sdc.load()
func_lfc.assert_called_once_with()
@ -752,18 +772,23 @@ class Test_SignatureDataController(unittest.TestCase):
)
func_fsfw = mock.Mock()
func_wtc = mock.Mock()
with mock.patch(
'fdroidserver.scanner.SignatureDataController.load_from_cache',
func_lfc,
), mock.patch(
'fdroidserver.scanner.SignatureDataController.load_from_defaults',
func_lfd,
), mock.patch(
'fdroidserver.scanner.SignatureDataController.fetch_signatures_from_web',
func_fsfw,
), mock.patch(
'fdroidserver.scanner.SignatureDataController.write_to_cache',
func_wtc,
with (
mock.patch(
'fdroidserver.scanner.SignatureDataController.load_from_cache',
func_lfc,
),
mock.patch(
'fdroidserver.scanner.SignatureDataController.load_from_defaults',
func_lfd,
),
mock.patch(
'fdroidserver.scanner.SignatureDataController.fetch_signatures_from_web',
func_fsfw,
),
mock.patch(
'fdroidserver.scanner.SignatureDataController.write_to_cache',
func_wtc,
),
):
sdc.load()
func_lfc.assert_called_once_with()
@ -782,9 +807,12 @@ class Test_SignatureDataController(unittest.TestCase):
)
sdc.data = {"mocked": "data"}
with mock.patch("builtins.open", open_func), mock.patch(
"fdroidserver.scanner._scanner_cachedir",
return_value=pathlib.Path('.'),
with (
mock.patch("builtins.open", open_func),
mock.patch(
"fdroidserver.scanner._scanner_cachedir",
return_value=pathlib.Path('.'),
),
):
sdc.write_to_cache()