Merge lp:~jamestait/click-reviewers-tools/readme-not-required-for-squashfs into lp:click-reviewers-tools

[James Tait]

Don't check for the presence of readme.md if the package is a squashfs filesystem. Snappy 2.0 uses squashfs as its file format, and doesn't require readme.md.

[lp:~jamestait/click-reviewers-tools/readme-not-required-for-squashfs]

569. By James Tait on 2016-02-01

Merged origin/trunk into readme-not-required-for-squashfs.

[Jamie Strandboge (jdstrand)]

LGTM. Thanks!

review: Approve

=== modified file 'clickreviews/cr_lint.py'
--- clickreviews/cr_lint.py	2016-02-01 18:13:22 +0000
+++ clickreviews/cr_lint.py	2016-02-01 19:19:13 +0000
@@ -1139,6 +1139,9 @@
         if not self.is_snap:
             return
 
+        if is_squashfs(self.pkg_filename):
+            return
+
         contents = self._extract_readme_md()
 
         t = 'info'

=== modified file 'clickreviews/tests/test_cr_lint.py'
--- clickreviews/tests/test_cr_lint.py	2016-02-01 08:59:56 +0000
+++ clickreviews/tests/test_cr_lint.py	2016-02-01 19:19:13 +0000
@@ -1754,6 +1754,21 @@
         expected_counts = {'info': 2, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
+    def test_check_snappy_readme_md_squashfs(self):
+        '''Test check_snappy_readme_md() - squashfs file'''
+        with patch("clickreviews.cr_lint.is_squashfs") as mock_is_squashfs:
+            mock_is_squashfs.return_value = True
+            with patch("clickreviews.cr_lint.ClickReviewLint."
+                       "_extract_readme_md") as mock_readme_md:
+                mock_readme_md.return_value = "Something suitably long"
+                c = ClickReviewLint(self.test_name)
+                c.unpack_dir = "/nonexistent.nonexec"
+                c.check_snappy_readme_md()
+                r = c.click_report
+                expected_counts = {'info': None, 'warn': 0, 'error': 0}
+                self.check_results(r, expected_counts)
+                self.assertFalse(mock_readme_md.called)
+
     def test_check_snappy_readme_md_bad(self):
         '''Test check_snappy_readme_md() - short'''
         self.set_test_pkg_yaml("name", "prettylong.name")