mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-21 04:10:37 +02:00
feat(deploy): add index only mode in update_servergitmirrors
This commit is contained in:
proletarius101
parent
e22f7e52a8
commit
cc75f2f9a4
@ -669,10 +669,20 @@ def update_servergitmirrors(servergitmirrors, repo_section):
|
|||||||
archive_path = os.path.join(git_mirror_path, 'fdroid', 'archive')
|
archive_path = os.path.join(git_mirror_path, 'fdroid', 'archive')
|
||||||
shutil.rmtree(archive_path, ignore_errors=True)
|
shutil.rmtree(archive_path, ignore_errors=True)
|
||||||
|
|
||||||
|
if options.index_only:
|
||||||
|
rsyncargs = ['--include', "*/"] + _get_index_includes(repo_section) + ['--exclude', '*']
|
||||||
|
|
||||||
# rsync is very particular about trailing slashes
|
# rsync is very particular about trailing slashes
|
||||||
common.local_rsync(
|
common.local_rsync(common.get_options(),
|
||||||
options, repo_section.rstrip('/') + '/', git_repodir.rstrip('/') + '/'
|
repo_section.rstrip('/') + '/',
|
||||||
)
|
git_repodir.rstrip('/') + '/',
|
||||||
|
args=rsyncargs)
|
||||||
|
else:
|
||||||
|
# trailing slashes have a meaning in rsync which is not needed here, so
|
||||||
|
# make sure both paths have exactly one trailing slash
|
||||||
|
common.local_rsync(common.get_options(),
|
||||||
|
repo_section.rstrip('/') + '/',
|
||||||
|
git_repodir.rstrip('/') + '/')
|
||||||
|
|
||||||
# use custom SSH command if identity_file specified
|
# use custom SSH command if identity_file specified
|
||||||
ssh_cmd = 'ssh -oBatchMode=yes'
|
ssh_cmd = 'ssh -oBatchMode=yes'
|
||||||
|
|||||||
@ -1058,6 +1058,155 @@ class DeployTest(unittest.TestCase):
|
|||||||
)
|
)
|
||||||
assert mock_driver.upload_object_via_stream.call_count == 1
|
assert mock_driver.upload_object_via_stream.call_count == 1
|
||||||
|
|
||||||
|
def test_update_servergitmirrors(self):
|
||||||
|
from libcloud.storage.drivers.s3 import S3StorageDriver
|
||||||
|
from libcloud.storage.base import Container
|
||||||
|
|
||||||
|
# setup parameters for this test run
|
||||||
|
fdroidserver.deploy.options.identity_file = None
|
||||||
|
fdroidserver.deploy.options.no_keep_git_mirror_archive = False
|
||||||
|
fdroidserver.deploy.options.verbose = False
|
||||||
|
fdroidserver.deploy.options.quiet = True
|
||||||
|
fdroidserver.deploy.options.index_only = False
|
||||||
|
|
||||||
|
config = {}
|
||||||
|
fdroidserver.common.fill_config_defaults(config)
|
||||||
|
fdroidserver.deploy.config = config
|
||||||
|
fdroidserver.deploy.config["servergitmirrors"] = []
|
||||||
|
|
||||||
|
repo_section = 'repo'
|
||||||
|
|
||||||
|
# setup function for asserting subprocess.call invocations
|
||||||
|
call_iteration = 0
|
||||||
|
|
||||||
|
os.chdir(self.testdir)
|
||||||
|
repo = Path('repo')
|
||||||
|
repo.mkdir(parents=True)
|
||||||
|
fake_apk = repo / 'Sym.apk'
|
||||||
|
with fake_apk.open('w') as fp:
|
||||||
|
fp.write('not an APK, but has the right filename')
|
||||||
|
fake_index = repo / fdroidserver.deploy.INDEX_FILES[0]
|
||||||
|
with fake_index.open('w') as fp:
|
||||||
|
fp.write('not an index, but has the right filename')
|
||||||
|
|
||||||
|
with tempfile.TemporaryDirectory() as local_copy_dir:
|
||||||
|
|
||||||
|
def update_servergitmirrors_call(cmd):
|
||||||
|
nonlocal call_iteration
|
||||||
|
if call_iteration == 0:
|
||||||
|
self.assertListEqual(
|
||||||
|
cmd,
|
||||||
|
[
|
||||||
|
'rsync',
|
||||||
|
'--recursive',
|
||||||
|
'--safe-links',
|
||||||
|
'--times',
|
||||||
|
'--perms',
|
||||||
|
'--one-file-system',
|
||||||
|
'--delete',
|
||||||
|
'--chmod=Da+rx,Fa-x,a+r,u+w',
|
||||||
|
'--quiet',
|
||||||
|
'repo/',
|
||||||
|
"git-mirror/fdroid/repo/",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
self.fail('unexpected subprocess.call invocation')
|
||||||
|
call_iteration += 1
|
||||||
|
return 0
|
||||||
|
|
||||||
|
with mock.patch(
|
||||||
|
'subprocess.call', side_effect=update_servergitmirrors_call
|
||||||
|
):
|
||||||
|
fdroidserver.deploy.update_servergitmirrors([], repo_section)
|
||||||
|
self.assertEqual(call_iteration, 1, 'expected 1 invocations of subprocess.call')
|
||||||
|
|
||||||
|
def test_update_servergitmirrors_in_index_only_mode(self):
|
||||||
|
from libcloud.storage.base import Container
|
||||||
|
|
||||||
|
# setup parameters for this test run
|
||||||
|
fdroidserver.deploy.options.identity_file = None
|
||||||
|
fdroidserver.deploy.options.no_keep_git_mirror_archive = False
|
||||||
|
fdroidserver.deploy.options.verbose = False
|
||||||
|
fdroidserver.deploy.options.quiet = True
|
||||||
|
fdroidserver.deploy.options.index_only = True
|
||||||
|
|
||||||
|
config = {}
|
||||||
|
fdroidserver.common.fill_config_defaults(config)
|
||||||
|
fdroidserver.deploy.config = config
|
||||||
|
fdroidserver.deploy.config["servergitmirrors"] = []
|
||||||
|
|
||||||
|
repo_section = 'repo'
|
||||||
|
|
||||||
|
# setup function for asserting subprocess.call invocations
|
||||||
|
call_iteration = 0
|
||||||
|
|
||||||
|
os.chdir(self.testdir)
|
||||||
|
repo = Path('repo')
|
||||||
|
repo.mkdir(parents=True)
|
||||||
|
fake_apk = repo / 'Sym.apk'
|
||||||
|
with fake_apk.open('w') as fp:
|
||||||
|
fp.write('not an APK, but has the right filename')
|
||||||
|
fake_index = repo / fdroidserver.deploy.INDEX_FILES[0]
|
||||||
|
with fake_index.open('w') as fp:
|
||||||
|
fp.write('not an index, but has the right filename')
|
||||||
|
|
||||||
|
with tempfile.TemporaryDirectory() as local_copy_dir:
|
||||||
|
|
||||||
|
def update_servergitmirrors_call(cmd):
|
||||||
|
nonlocal call_iteration
|
||||||
|
if call_iteration == 0:
|
||||||
|
self.assertListEqual(
|
||||||
|
cmd,
|
||||||
|
[
|
||||||
|
'rsync',
|
||||||
|
'--recursive',
|
||||||
|
'--safe-links',
|
||||||
|
'--times',
|
||||||
|
'--perms',
|
||||||
|
'--one-file-system',
|
||||||
|
'--delete',
|
||||||
|
'--chmod=Da+rx,Fa-x,a+r,u+w',
|
||||||
|
'--quiet',
|
||||||
|
'--include',
|
||||||
|
"*/",
|
||||||
|
'--include',
|
||||||
|
'repo/entry.jar',
|
||||||
|
'--include',
|
||||||
|
'repo/entry.json',
|
||||||
|
'--include',
|
||||||
|
'repo/entry.json.asc',
|
||||||
|
'--include',
|
||||||
|
'repo/index-v1.jar',
|
||||||
|
'--include',
|
||||||
|
'repo/index-v1.json',
|
||||||
|
'--include',
|
||||||
|
'repo/index-v1.json.asc',
|
||||||
|
'--include',
|
||||||
|
'repo/index-v2.json',
|
||||||
|
'--include',
|
||||||
|
'repo/index-v2.json.asc',
|
||||||
|
'--include',
|
||||||
|
'repo/index.jar',
|
||||||
|
'--include',
|
||||||
|
'repo/index.xml',
|
||||||
|
'--exclude',
|
||||||
|
"*",
|
||||||
|
'repo/',
|
||||||
|
"git-mirror/fdroid/repo/",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
self.fail('unexpected subprocess.call invocation')
|
||||||
|
call_iteration += 1
|
||||||
|
return 0
|
||||||
|
|
||||||
|
with mock.patch(
|
||||||
|
'subprocess.call', side_effect=update_servergitmirrors_call
|
||||||
|
):
|
||||||
|
fdroidserver.deploy.update_servergitmirrors([], repo_section)
|
||||||
|
self.assertEqual(call_iteration, 1, 'expected 1 invocations of subprocess.call')
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
os.chdir(os.path.dirname(__file__))
|
os.chdir(os.path.dirname(__file__))
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user