Merge lp:~stevanr/linaro-license-protection/howto_refined_search into lp:~linaro-automation/linaro-license-protection/trunk

[Stevan Radaković]

Add support for howto/HOWTO_* files and target/product/*/howto/HOWTO_* files.

[Данило Шеган (danilo)]

Looks good, thanks for the fix: please make new test methods though.

review: Needs Fixing

[lp:~stevanr/linaro-license-protection/howto_refined_search]

150. By Stevan Radaković on 2012-11-21

Remove redundant tests. Add test method instead.

151. By Stevan Radaković on 2012-11-21

Split test method.

[Данило Шеган (danilo)]

Excellent, looks great. Thanks again.

review: Approve

=== modified file 'license_protected_downloads/render_text_files.py'
--- license_protected_downloads/render_text_files.py	2012-10-24 16:08:44 +0000
+++ license_protected_downloads/render_text_files.py	2012-11-21 18:00:29 +0000
@@ -4,6 +4,10 @@
 from django.conf import settings
 
 
+HOWTO_PATH = "howto"
+HOWTO_PRODUCT_PATH = "target/product"
+
+
 class MultipleFilesException(Exception):
     pass
 
@@ -61,6 +65,14 @@
         # LINUX_FILES exist in the same dir.
 
         androidpaths = cls.dirEntries(path, files_list=settings.ANDROID_FILES)
+
+        howto_path = os.path.join(path, HOWTO_PATH)
+        howto_product_path = cls.getHowtoProductPath(path)
+        androidpaths += cls.dirEntries(howto_path,
+                                       files_list=settings.ANDROID_FILES)
+        androidpaths += cls.dirEntries(howto_product_path,
+                                       files_list=settings.ANDROID_FILES)
+
         ubuntupaths = cls.dirEntries(path, files_list=settings.LINUX_FILES)
         if len(androidpaths) > 0 and len(ubuntupaths) > 0:
             # Files from ANDROID_FILES and LINUX_FILES exist in the same dir
@@ -127,3 +139,20 @@
             # hence there is an out of range exception
             except IndexError:
                 return indices
+
+    @classmethod
+    def getHowtoProductPath(cls, path):
+        """ Return the 'target/product/*/howto/ path.
+
+        In case there is no such folder, return empty string.
+        """
+        howto_path = ""
+        path = os.path.join(path, HOWTO_PRODUCT_PATH)
+        if os.path.exists(path):
+            for file in os.listdir(path):
+                product_path = os.path.join(path, file)
+                if os.path.isdir(product_path):
+                    howto_path = os.path.join(product_path, HOWTO_PATH)
+                    break
+
+        return howto_path

=== modified file 'license_protected_downloads/tests/test_views.py'
--- license_protected_downloads/tests/test_views.py	2012-11-07 18:13:07 +0000
+++ license_protected_downloads/tests/test_views.py	2012-11-21 18:00:29 +0000
@@ -730,6 +730,29 @@
             self.assertEqual(response.status_code, 200)
             self.assertContains(response, 'howto')
 
+    def test_howtos_howto_dir(self):
+        with temporary_directory() as serve_root:
+            settings.SERVED_PATHS = [serve_root.root]
+            serve_root.make_file(
+                "build/9/build.tar.bz2", with_buildinfo=True)
+            serve_root.make_file(
+                "build/9/howto/HOWTO_releasenotes.txt", data=".h1 HowTo Test")
+            response = self.client.get('/build/9/howto/')
+            self.assertEqual(response.status_code, 200)
+            self.assertContains(response, 'HowTo Test')
+
+    def test_howtos_product_dir(self):
+        with temporary_directory() as serve_root:
+            settings.SERVED_PATHS = [serve_root.root]
+            serve_root.make_file(
+                "build/9/build.tar.bz2", with_buildinfo=True)
+            serve_root.make_file(
+                "build/9/target/product/panda/howto/HOWTO_releasenotes.txt",
+                data=".h1 HowTo Test")
+            response = self.client.get('/build/9/target/product/panda/howto/')
+            self.assertEqual(response.status_code, 200)
+            self.assertContains(response, 'HowTo Test')
+
 
 if __name__ == '__main__':
     unittest.main()