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

Merge branch 'fixFlavor' into 'master'

Browse source 
Regex only for flavor blocks: flavor { ... }

See merge request fdroid/fdroidserver!407
This commit is contained in:
Hans-Christoph Steiner 2017-12-14 16:56:01 +01:00
commit 61aac0503a
5 changed files with 159 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/common.TestCase
View file

@ -627,6 +627,7 @@ class CommonTest(unittest.TestCase):
def test_parse_androidmanifests_with_flavor(self):
source_files_dir = os.path.join(os.path.dirname(__file__), 'source-files')
app = fdroidserver.metadata.App()
build = fdroidserver.metadata.Build()
build.gradle = ['devVersion']
@ -641,6 +642,19 @@ class CommonTest(unittest.TestCase):
self.assertEqual(('0.95-dev', '949', 'org.fdroid.fdroid.dev'),
fdroidserver.common.parse_androidmanifests(paths, app))
app = fdroidserver.metadata.App()
build = fdroidserver.metadata.Build()
build.gradle = ['free']
app.builds = [build]
app.id = 'eu.siacs.conversations'
paths = [
os.path.join(source_files_dir, 'eu.siacs.conversations', 'build.gradle'),
]
for path in paths:
self.assertTrue(os.path.isfile(path))
self.assertEqual(('1.23.1', '245', 'eu.siacs.conversations'),
fdroidserver.common.parse_androidmanifests(paths, app))
if __name__ == "__main__":
parser = optparse.OptionParser()