mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-02 09:10:11 +02:00
index: fix git-mirror size check for GitLab Pages
The test case had the wrong folder setup, this was confirmed on a production repo setup.
This commit is contained in:
parent
83335437b9
commit
f24613b701
@ -1438,7 +1438,8 @@ def get_mirror_service_urls(url):
|
||||
segments.extend([branch, folder])
|
||||
urls.append('/'.join(segments))
|
||||
elif hostname == "gitlab.com":
|
||||
if common.get_dir_size(folder) <= common.GITLAB_COM_PAGES_MAX_SIZE:
|
||||
git_mirror_path = os.path.join('git-mirror', folder)
|
||||
if common.get_dir_size(git_mirror_path) <= common.GITLAB_COM_PAGES_MAX_SIZE:
|
||||
# Gitlab-like Pages segments "https://user.gitlab.io/repo/folder"
|
||||
gitlab_pages = ["https:", "", user + ".gitlab.io", repo, folder]
|
||||
urls.append('/'.join(gitlab_pages))
|
||||
|
@ -416,8 +416,9 @@ class IndexTest(unittest.TestCase):
|
||||
|
||||
def test_gitlab_get_mirror_service_urls(self):
|
||||
with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
|
||||
os.mkdir('fdroid')
|
||||
with Path('fdroid/placeholder').open('w') as fp:
|
||||
git_mirror_path = Path('git-mirror/fdroid')
|
||||
git_mirror_path.mkdir(parents=True)
|
||||
with (git_mirror_path / 'placeholder').open('w') as fp:
|
||||
fp.write(' ')
|
||||
for url in [
|
||||
'git@gitlab.com:group/project',
|
||||
|
Loading…
Reference in New Issue
Block a user