Merge lp:~dholbach/click-reviewers-tools/1395204 into lp:click-reviewers-tools

[Daniel Holbach]

[Martin Albisetti (beuno)]

review: Approve

=== modified file 'clickreviews/cr_lint.py'
--- clickreviews/cr_lint.py	2015-01-13 18:08:32 +0000
+++ clickreviews/cr_lint.py	2015-01-20 16:50:25 +0000
@@ -45,12 +45,13 @@
         #  arm64  - compiled, single arch (not available yet)
         #  ppc64el - compiled, single arch (not available yet)
         #  powerpc - compiled, single arch (not available yet)
+        self.valid_compiled_architectures = ['armhf',
+                                             'i386',
+                                             'amd64',
+                                             ]
         self.valid_control_architectures = ['all',
                                             'multi',
-                                            'armhf',
-                                            'i386',
-                                            'amd64',
-                                            ]
+                                            ] + self.valid_compiled_architectures
         self.vcs_dirs = ['.bzr*', '.git*', '.svn*', '.hg', 'CVS*', 'RCS*']
 
         if 'maintainer' in self.manifest:
@@ -200,7 +201,19 @@
         n = 'control_architecture_match'
         s = 'OK'
         if 'architecture' in self.manifest:
-            if control['Architecture'] != self.manifest['architecture']:
+            if control['Architecture'] == "multi":
+                if not isinstance(self.manifest['architecture'],
+                                  (list, tuple)):
+                    t = 'error'
+                    s = 'If arch=multi, manifest architecture needs to ' + \
+                        'list all the individual architectures.'
+                elif list(filter(lambda a:
+                                 a not in self.valid_compiled_architectures,
+                                 self.manifest['architecture'])):
+                    t = 'error'
+                    s = 'If arch=multi, manifest architecture needs to ' + \
+                        'comprise of only compiled architectures.'
+            elif control['Architecture'] != self.manifest['architecture']:
                 t = 'error'
                 s = "Architecture=%s " % control['Architecture'] + \
                     "does not match manifest architecture=%s" % \

=== modified file 'clickreviews/tests/test_cr_lint.py'
--- clickreviews/tests/test_cr_lint.py	2015-01-13 18:08:32 +0000
+++ clickreviews/tests/test_cr_lint.py	2015-01-20 16:50:25 +0000
@@ -367,6 +367,20 @@
         expected_counts = {'info': 1, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
+    def test_check_manifest_valid_arch_multi2(self):
+        '''Test check_manifest_architecture() (valid multi2)'''
+        arch = "multi"
+        self.set_test_manifest("architecture", ["armhf", "i386"])
+        self.set_test_control("Architecture", arch)
+        test_name = "%s_%s_%s.click" % (self.test_control['Package'],
+                                        self.test_control['Version'],
+                                        arch)
+        c = ClickReviewLint(test_name)
+        c.check_manifest_architecture()
+        r = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     def test_check_manifest_invalid_arch_multi_nonexistent(self):
         '''Test check_manifest_architecture() (invalid multi)'''
         arch = "multi"