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

update: fix crash when liberapay: or open_collective: not in FUNDING.yml

Browse Source 
closes #799
This commit is contained in:
Hans-Christoph Steiner 2020-06-24 20:54:16 +02:00 committed by Marcus Hoffmann
parent 82eceebd13
commit 238f048257
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdroidserver/update.py
View File

@ -936,7 +936,9 @@ def insert_funding_yml_donation_links(apps):
if s: if s:
app['OpenCollective'] = s app['OpenCollective'] = s
if not app.get('Donate'): if not app.get('Donate'):
if 'liberapay' in data:
del(data['liberapay']) del(data['liberapay'])
if 'open_collective' in data:
del(data['open_collective']) del(data['open_collective'])
# this tuple provides a preference ordering # this tuple provides a preference ordering
for k in ('custom', 'github', 'patreon', 'community_bridge', 'ko_fi', 'issuehunt'): for k in ('custom', 'github', 'patreon', 'community_bridge', 'ko_fi', 'issuehunt'):

41
tests/update.TestCase
View File

@ -1019,6 +1019,47 @@ class UpdateTest(unittest.TestCase):
for field in DONATION_FIELDS: for field in DONATION_FIELDS:
self.assertEqual('keepme', app.get(field)) self.assertEqual('keepme', app.get(field))
def test_insert_funding_yml_donation_links_one_at_a_time(self):
"""Exercise the FUNDING.yml code one entry at a time"""
testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
os.chdir(testdir)
os.mkdir('build')
app = fdroidserver.metadata.App()
app.id = 'fake.app.id'
apps = {app.id: app}
os.mkdir(os.path.join('build', app.id))
fdroidserver.update.insert_funding_yml_donation_links(apps)
for field in DONATION_FIELDS:
self.assertIsNone(app.get(field))
content = textwrap.dedent("""
community_bridge: 'blah-de-blah'
github: USERNAME
issuehunt: USERNAME
ko_fi: USERNAME
liberapay: USERNAME
open_collective: USERNAME
patreon: USERNAME
""")
for line in content.split('\n'):
if not line:
continue
app = fdroidserver.metadata.App()
app.id = 'fake.app.id'
apps = {app.id: app}
with open(os.path.join('build', app.id, 'FUNDING.yml'), 'w') as fp:
fp.write(line)
data = yaml.load(line)
fdroidserver.update.insert_funding_yml_donation_links(apps)
if 'liberapay' in data:
self.assertEqual(data['liberapay'], app.get('Liberapay'))
elif 'open_collective' in data:
self.assertEqual(data['open_collective'], app.get('OpenCollective'))
else:
for v in data.values():
self.assertEqual(app.get('Donate', '').split('/')[-1], v)
def test_insert_funding_yml_donation_links_with_corrupt_file(self): def test_insert_funding_yml_donation_links_with_corrupt_file(self):
testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir) testdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir)
os.chdir(testdir) os.chdir(testdir)