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

Merge branch 'mode_version' into 'master'

Browse source 
Support AutoUpdateMode: Version without pattern

See merge request fdroid/fdroidserver!931
This commit is contained in:
Jochen Sprickerhof 2021-06-01 12:11:09 +00:00
commit bf4feab877
3 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/metadata.py
View file

@ -447,7 +447,7 @@ valuetypes = {
["AntiFeatures"]),
FieldValidator("Auto Update Mode",
r"^(Version .+|None)$",
r"^(Version.*|None)$",
["AutoUpdateMode"]),
FieldValidator("Update Check Mode",

32
tests/checkupdates.TestCase
View file

@ -106,6 +106,38 @@ class CheckupdatesTest(unittest.TestCase):
fdroidserver.checkupdates.checkupdates_app(app)
wrmock.assert_called_with(app.metadatapath, app)
def test_checkupdates_app_tags(self):
fdroidserver.checkupdates.options = mock.Mock()
fdroidserver.checkupdates.options.auto = 'bleh'
fdroidserver.checkupdates.config = {}
app = fdroidserver.metadata.App()
app.id = 'loop.starts.shooting'
app.metadatapath = 'metadata/' + app.id + '.yml'
app.CurrentVersion = '1.1.8'
app.CurrentVersionCode = 10108
app.UpdateCheckMode = 'Tags'
app.AutoUpdateMode = 'Version'
build = fdroidserver.metadata.Build()
build.versionCode = app.CurrentVersionCode
build.versionName = app.CurrentVersion
app['Builds'].append(build)
with mock.patch('fdroidserver.checkupdates.check_tags', lambda app,
pattern: (None, 'bla', None)):
fdroidserver.checkupdates.checkupdates_app(app)
with mock.patch('fdroidserver.checkupdates.check_tags', lambda app,
pattern: ('1.1.9', 10109, 'v1.1.9')):
with mock.patch('fdroidserver.metadata.write_metadata',
mock.Mock()):
with mock.patch('subprocess.call', lambda cmd: 0):
fdroidserver.checkupdates.checkupdates_app(app)
build = app['Builds'][-1]
self.assertEqual(build.versionName, '1.1.9')
self.assertEqual(build.commit, 'v1.1.9')
def test_check_http(self):
fdroidserver.checkupdates.options = mock.Mock()