Merge branch 'metadataFlavours' into 'master'

Add flavour to metadata

See merge request fdroid/fdroidserver!370

diff --combined tests/update.TestCase
index 966e00e9d8b92c4411dad8e7925ba8479bc35a83,6753c0ca637122b09c8d88524d10a88fc17b9344..8e4ac3196377fbf2c83c8abec643b6f872e15326
--- 1/tests/update.TestCase
--- 2/tests/update.TestCase
+++ b/tests/update.TestCase
@@@ -42,19 -42,37 +42,37 @@@ class UpdateTest(unittest.TestCase)
  
          shutil.rmtree(os.path.join('repo', 'info.guardianproject.urzip'), ignore_errors=True)
  
+         shutil.rmtree(os.path.join('build', 'com.nextcloud.client'), ignore_errors=True)
+         shutil.copytree(os.path.join('source-files', 'com.nextcloud.client'), os.path.join('build', 'com.nextcloud.client'))
+ 
+         shutil.rmtree(os.path.join('build', 'com.nextcloud.client.dev'), ignore_errors=True)
+         shutil.copytree(os.path.join('source-files', 'com.nextcloud.client.dev'),
+                         os.path.join('build', 'com.nextcloud.client.dev'))
+ 
          apps = dict()
-         for packageName in ('info.guardianproject.urzip', 'org.videolan.vlc', 'obb.mainpatch.current'):
-             apps[packageName] = dict()
+         for packageName in ('info.guardianproject.urzip', 'org.videolan.vlc', 'obb.mainpatch.current',
+                             'com.nextcloud.client', 'com.nextcloud.client.dev'):
+             apps[packageName] = fdroidserver.metadata.App()
              apps[packageName]['id'] = packageName
              apps[packageName]['CurrentVersionCode'] = 0xcafebeef
+ 
          apps['info.guardianproject.urzip']['CurrentVersionCode'] = 100
+ 
+         buildnextcloudclient = fdroidserver.metadata.Build()
+         buildnextcloudclient.gradle = ['generic']
+         apps['com.nextcloud.client']['builds'] = [buildnextcloudclient]
+ 
+         buildnextclouddevclient = fdroidserver.metadata.Build()
+         buildnextclouddevclient.gradle = ['versionDev']
+         apps['com.nextcloud.client.dev']['builds'] = [buildnextclouddevclient]
+ 
          fdroidserver.update.insert_localized_app_metadata(apps)
  
          appdir = os.path.join('repo', 'info.guardianproject.urzip', 'en-US')
          self.assertTrue(os.path.isfile(os.path.join(appdir, 'icon.png')))
          self.assertTrue(os.path.isfile(os.path.join(appdir, 'featureGraphic.png')))
  
-         self.assertEqual(3, len(apps))
+         self.assertEqual(5, len(apps))
          for packageName, app in apps.items():
              self.assertTrue('localized' in app)
              self.assertTrue('en-US' in app['localized'])
@@@ -77,6 -95,14 +95,14 @@@
                  self.assertEqual('featureGraphic.png', app['localized']['en-US']['featureGraphic'])
                  self.assertEqual(1, len(app['localized']['en-US']['phoneScreenshots']))
                  self.assertEqual(1, len(app['localized']['en-US']['sevenInchScreenshots']))
+             elif packageName == 'com.nextcloud.client':
+                 self.assertEqual('Nextcloud', app['localized']['en-US']['name'])
+                 self.assertEqual(1073, len(app['localized']['en-US']['description']))
+                 self.assertEqual(78, len(app['localized']['en-US']['summary']))
+             elif packageName == 'com.nextcloud.client.dev':
+                 self.assertEqual('Nextcloud Dev', app['localized']['en-US']['name'])
+                 self.assertEqual(586, len(app['localized']['en-US']['description']))
+                 self.assertEqual(79, len(app['localized']['en-US']['summary']))
  
      def test_insert_triple_t_metadata(self):
          importer = os.path.join(localmodule, 'tests', 'tmp', 'importer')
@@@ -87,7 -113,7 +113,7 @@@
          tmpdir = os.path.join(localmodule, '.testfiles')
          if not os.path.exists(tmpdir):
              os.makedirs(tmpdir)
 -        tmptestsdir = tempfile.mkdtemp(prefix='test_insert_triple_t_metadata-', dir=tmpdir)
 +        tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name, dir=tmpdir)
          packageDir = os.path.join(tmptestsdir, 'build', packageName)
          shutil.copytree(importer, packageDir)
  
@@@ -374,7 -400,7 +400,7 @@@
          tmpdir = os.path.join(localmodule, '.testfiles')
          if not os.path.exists(tmpdir):
              os.makedirs(tmpdir)
 -        tmptestsdir = tempfile.mkdtemp(prefix='test_process_apk_signed_by_disabled_algorithms-',
 +        tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name,
                                         dir=tmpdir)
          print('tmptestsdir', tmptestsdir)
          os.chdir(tmptestsdir)
@@@ -504,7 -530,7 +530,7 @@@
          tmpdir = os.path.join(localmodule, '.testfiles')
          if not os.path.exists(tmpdir):
              os.makedirs(tmpdir)
 -        tmptestsdir = tempfile.mkdtemp(prefix='test_create_metadata_from_template-',
 +        tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name,
                                         dir=tmpdir)
          print('tmptestsdir', tmptestsdir)
          os.chdir(tmptestsdir)