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

Merge branch 'rsync-buildslogs-to-webroot-repo' into 'master'

Browse source 
build: rsync buildlogs to <webroot>/repo

See merge request fdroid/fdroidserver!651
This commit is contained in:
Hans-Christoph Steiner 2019-07-10 08:55:04 +00:00
commit 26af94974a
3 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/common.TestCase
View file

@ -951,8 +951,8 @@ class CommonTest(unittest.TestCase):
fdroidserver.common.options.quiet = False
fdroidserver.common.config = {}
fdroidserver.common.config['serverwebroot'] = [
'example.com:/var/www/fdroid/repo/',
'example.com:/var/www/fdroid/archive/']
'example.com:/var/www/fdroid/',
'example.com:/var/www/fbot/']
fdroidserver.common.config['deploy_process_logs'] = True
fdroidserver.common.config['identity_file'] = 'ssh/id_rsa'
@ -969,9 +969,9 @@ class CommonTest(unittest.TestCase):
'-e',
'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i ssh/id_rsa',
cmd[6],
'example.com:/var/www/fdroid/repo/buildlogs/'],
'example.com:/var/www/fdroid/repo/'],
cmd)
self.assertTrue(cmd[6].endswith('/com.example.app_4711_1.log.gz'))
self.assertTrue(cmd[6].endswith('/com.example.app_4711.log.gz'))
with gzip.open(cmd[6], 'r') as f:
self.assertTrue(f.read(), mocklogcontent)
elif assert_subprocess_call_iteration == 1:
@ -982,9 +982,9 @@ class CommonTest(unittest.TestCase):
'-e',
'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i ssh/id_rsa',
cmd[6],
'example.com:/var/www/fdroid/archive/buildlogs/'],
'example.com:/var/www/fbot/repo/'],
cmd)
self.assertTrue(cmd[6].endswith('/com.example.app_4711_1.log.gz'))
self.assertTrue(cmd[6].endswith('/com.example.app_4711.log.gz'))
with gzip.open(cmd[6], 'r') as f:
self.assertTrue(f.read(), mocklogcontent)
else:
@ -996,7 +996,7 @@ class CommonTest(unittest.TestCase):
with mock.patch('subprocess.call',
side_effect=assert_subprocess_call):
fdroidserver.common.deploy_build_log_with_rsync(
'com.example.app', '4711', mocklogcontent, 1.1)
'com.example.app', '4711', mocklogcontent)
if __name__ == "__main__":