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

checkupdates: only update app branches if metadata file changed

Browse source
This commit is contained in:
Hans-Christoph Steiner 2024-11-19 09:49:45 +01:00
parent e3f724681a
commit 0ec9cd6921
2 changed files with 58 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

37
tests/test_checkupdates.py
View file

@ -324,6 +324,9 @@ class CheckupdatesTest(unittest.TestCase):
for f in (basedir / 'metadata').glob('*.yml'):
shutil.copy(f, 'metadata')
git_repo = git.Repo.init(testdir)
with git_repo.config_writer() as cw:
cw.set_value('user', 'name', 'Foo Bar')
cw.set_value('user', 'email', 'foo@bar.com')
git_repo.git.add(all=True)
git_repo.index.commit("all metadata files")
@ -341,6 +344,40 @@ class CheckupdatesTest(unittest.TestCase):
return git_repo, origin_repo, upstream_repo
def test_get_changes_versus_ref(self):
def _make_commit_new_app(git_repo, metadata_file):
app = fdroidserver.metadata.App()
fdroidserver.metadata.write_metadata(metadata_file, app)
git_repo.git.add(metadata_file)
git_repo.git.commit(metadata_file, message=f'changed {metadata_file}')
git_repo, origin_repo, upstream_repo = self._get_test_git_repos()
for remote in git_repo.remotes:
remote.push(git_repo.active_branch)
appid = 'com.testvalue'
metadata_file = f'metadata/{appid}.yml'
# set up remote branch with change to app
git_repo.git.checkout('-b', appid)
_make_commit_new_app(git_repo, metadata_file)
git_repo.remotes.origin.push(appid)
# reset local branch and there should be differences
upstream_main = fdroidserver.checkupdates.get_upstream_main_branch(git_repo)
git_repo.git.reset(upstream_main)
self.assertTrue(
fdroidserver.checkupdates.get_changes_versus_ref(
git_repo, f'origin/{appid}', metadata_file
)
)
# make new commit that matches the previous, different commit, no diff
_make_commit_new_app(git_repo, metadata_file)
self.assertFalse(
fdroidserver.checkupdates.get_changes_versus_ref(
git_repo, f'origin/{appid}', metadata_file
)
)
def test_push_commits(self):
git_repo, origin_repo, upstream_repo = self._get_test_git_repos()
for remote in git_repo.remotes: