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

fix tests and docstring error

Browse source
This commit is contained in:
Hans-Christoph Steiner 2022-05-23 15:25:05 +02:00
parent 293975d081
commit 2448f070e9
2 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/deploy.py
View file

@ -47,7 +47,7 @@ REMOTE_HOSTNAME_REGEX = re.compile(r'\W*\w+\W+(\w+).*')
def _get_index_excludes(repo_section): def _get_index_excludes(repo_section):
"""The list of files to be synced last, since they finalize the deploy. """Return the list of files to be synced last, since they finalize the deploy.
The process of pushing all the new packages to the various The process of pushing all the new packages to the various
services can take a while. So the index files should be updated services can take a while. So the index files should be updated

32
tests/deploy.TestCase
View file

@ -57,15 +57,27 @@ class DeployTest(unittest.TestCase):
'--safe-links', '--safe-links',
'--quiet', '--quiet',
'--exclude', '--exclude',
'repo/index.xml', 'repo/entry.jar',
'--exclude', '--exclude',
'repo/index.jar', 'repo/entry.json',
'--exclude',
'repo/entry.json.asc',
'--exclude', '--exclude',
'repo/index-v1.jar', 'repo/index-v1.jar',
'--exclude', '--exclude',
'repo/index-v1.json', 'repo/index-v1.json',
'--exclude', '--exclude',
'repo/index-v1.json.asc', 'repo/index-v1.json.asc',
'--exclude',
'repo/index-v2.jar',
'--exclude',
'repo/index-v2.json',
'--exclude',
'repo/index-v2.json.asc',
'--exclude',
'repo/index.jar',
'--exclude',
'repo/index.xml',
'repo', 'repo',
'example.com:/var/www/fdroid', 'example.com:/var/www/fdroid',
], ],
@ -142,15 +154,27 @@ class DeployTest(unittest.TestCase):
'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i ' 'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i '
+ fdroidserver.deploy.config['identity_file'], + fdroidserver.deploy.config['identity_file'],
'--exclude', '--exclude',
'archive/index.xml', 'archive/entry.jar',
'--exclude', '--exclude',
'archive/index.jar', 'archive/entry.json',
'--exclude',
'archive/entry.json.asc',
'--exclude', '--exclude',
'archive/index-v1.jar', 'archive/index-v1.jar',
'--exclude', '--exclude',
'archive/index-v1.json', 'archive/index-v1.json',
'--exclude', '--exclude',
'archive/index-v1.json.asc', 'archive/index-v1.json.asc',
'--exclude',
'archive/index-v2.jar',
'--exclude',
'archive/index-v2.json',
'--exclude',
'archive/index-v2.json.asc',
'--exclude',
'archive/index.jar',
'--exclude',
'archive/index.xml',
'archive', 'archive',
serverwebroot, serverwebroot,
], ],