mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
Merge branch '1240-fixups' into 'master'
!1240 fixups See merge request fdroid/fdroidserver!1242
This commit is contained in:
commit
10c1089eba
@ -596,6 +596,7 @@ include tests/metadata/info.guardianproject.checkey/en-US/summary.txt
|
|||||||
include tests/metadata/info.guardianproject.checkey/ja-JP/name.txt
|
include tests/metadata/info.guardianproject.checkey/ja-JP/name.txt
|
||||||
include tests/metadata/info.guardianproject.checkey.yml
|
include tests/metadata/info.guardianproject.checkey.yml
|
||||||
include tests/metadata/info.guardianproject.urzip/en-US/changelogs/100.txt
|
include tests/metadata/info.guardianproject.urzip/en-US/changelogs/100.txt
|
||||||
|
include tests/metadata/info.guardianproject.urzip/en-US/changelogs/default.txt
|
||||||
include tests/metadata/info.guardianproject.urzip/en-US/full_description.txt
|
include tests/metadata/info.guardianproject.urzip/en-US/full_description.txt
|
||||||
include tests/metadata/info.guardianproject.urzip/en-US/images/featureGraphic.png
|
include tests/metadata/info.guardianproject.urzip/en-US/images/featureGraphic.png
|
||||||
include tests/metadata/info.guardianproject.urzip/en-US/images/icon.png
|
include tests/metadata/info.guardianproject.urzip/en-US/images/icon.png
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[tool.black]
|
[tool.black]
|
||||||
skip-string-normalization = true
|
skip-string-normalization = true
|
||||||
target-version = ["py39"]
|
target-version = ["py38"]
|
||||||
|
|
||||||
|
|
||||||
[tool.mypy]
|
[tool.mypy]
|
||||||
|
@ -221,7 +221,8 @@
|
|||||||
"icon": "icon_NJXNzMcyf-v9i5a1ElJi0j9X1LvllibCa48xXYPlOqQ=.png",
|
"icon": "icon_NJXNzMcyf-v9i5a1ElJi0j9X1LvllibCa48xXYPlOqQ=.png",
|
||||||
"name": "title",
|
"name": "title",
|
||||||
"summary": "short description",
|
"summary": "short description",
|
||||||
"video": "video"
|
"video": "video",
|
||||||
|
"whatsNew": "default"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -106,8 +106,7 @@ class UpdateTest(unittest.TestCase):
|
|||||||
'org.videolan.vlc',
|
'org.videolan.vlc',
|
||||||
):
|
):
|
||||||
shutil.copytree(
|
shutil.copytree(
|
||||||
os.path.join(repo_dir, packageName),
|
os.path.join(repo_dir, packageName), os.path.join('repo', packageName)
|
||||||
os.path.join('repo', packageName)
|
|
||||||
)
|
)
|
||||||
for packageName in (
|
for packageName in (
|
||||||
'info.guardianproject.checkey',
|
'info.guardianproject.checkey',
|
||||||
@ -118,7 +117,7 @@ class UpdateTest(unittest.TestCase):
|
|||||||
os.mkdir('metadata')
|
os.mkdir('metadata')
|
||||||
shutil.copytree(
|
shutil.copytree(
|
||||||
os.path.join(self.basedir, 'metadata', packageName),
|
os.path.join(self.basedir, 'metadata', packageName),
|
||||||
os.path.join('metadata', packageName)
|
os.path.join('metadata', packageName),
|
||||||
)
|
)
|
||||||
for packageName in (
|
for packageName in (
|
||||||
'com.nextcloud.client',
|
'com.nextcloud.client',
|
||||||
@ -255,7 +254,6 @@ class UpdateTest(unittest.TestCase):
|
|||||||
fdroidserver.update.insert_localized_app_metadata(apps)
|
fdroidserver.update.insert_localized_app_metadata(apps)
|
||||||
self.assertEqual('42', apps[app.id]['localized']['en-US']['whatsNew'])
|
self.assertEqual('42', apps[app.id]['localized']['en-US']['whatsNew'])
|
||||||
|
|
||||||
|
|
||||||
def test_name_title_scraping(self):
|
def test_name_title_scraping(self):
|
||||||
"""metadata file --> fdroiddata localized files --> fastlane/triple-t in app source --> APK"""
|
"""metadata file --> fdroiddata localized files --> fastlane/triple-t in app source --> APK"""
|
||||||
config = dict()
|
config = dict()
|
||||||
@ -360,7 +358,7 @@ class UpdateTest(unittest.TestCase):
|
|||||||
appid = 'info.guardianproject.checkey'
|
appid = 'info.guardianproject.checkey'
|
||||||
testapps = {appid: copy.copy(apps[appid])}
|
testapps = {appid: copy.copy(apps[appid])}
|
||||||
self.assertEqual('Checkey the app!', testapps[appid]['Name'])
|
self.assertEqual('Checkey the app!', testapps[appid]['Name'])
|
||||||
del (testapps[appid]['Name'])
|
del testapps[appid]['Name']
|
||||||
fdroidserver.update.insert_missing_app_names_from_apks(testapps, apks)
|
fdroidserver.update.insert_missing_app_names_from_apks(testapps, apks)
|
||||||
self.assertIsNone(testapps[appid].get('Name'))
|
self.assertIsNone(testapps[appid].get('Name'))
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user