Merge lp:~gesha/linaro-license-protection/check-empty-buildinfo into lp:~linaro-automation/linaro-license-protection/trunk

[Georgy Redkozubov]

Recent tests showed that empty BUILD-INFO.txt wasn't handled.
This branch adds check for empty BUILD-INFO.txt

[Paul Sokolovsky (pfalcon)]

Looks good.

review: Approve

=== modified file 'license_protected_downloads/buildinfo.py'
--- license_protected_downloads/buildinfo.py	2012-11-28 12:08:55 +0000
+++ license_protected_downloads/buildinfo.py	2013-01-30 10:48:37 +0000
@@ -106,6 +106,8 @@
             return False
 
     def parseData(self, lines):
+        if not lines:
+            raise IncorrectDataFormatException("Array is empty.")
         if not isinstance(lines, list):
             raise IncorrectDataFormatException("No array provided.")
         format_line = lines.pop(0)

=== modified file 'license_protected_downloads/tests/test_buildinfo.py'
--- license_protected_downloads/tests/test_buildinfo.py	2012-11-28 12:30:30 +0000
+++ license_protected_downloads/tests/test_buildinfo.py	2013-01-30 10:48:37 +0000
@@ -78,6 +78,12 @@
         with self.assertRaises(IncorrectDataFormatException):
             build_info.parseLine(line)
 
+    def test_parseData_empty_fails(self):
+        build_info = BuildInfo(self.buildinfo_file_path)
+
+        with self.assertRaises(IncorrectDataFormatException):
+            build_info.parseData([])
+
     def test_parseData_no_format_version_fails(self):
         build_info = BuildInfo(self.buildinfo_file_path)
 

=== modified file 'license_protected_downloads/tests/test_views.py'
--- license_protected_downloads/tests/test_views.py	2012-11-29 09:36:04 +0000
+++ license_protected_downloads/tests/test_views.py	2013-01-30 10:48:37 +0000
@@ -407,6 +407,14 @@
         # If a build-info file is invalid, we don't allow access
         self.assertEqual(response.status_code, 403)
 
+    def test_empty_build_info_file(self):
+        target_file = "build-info/empty-build-info/test.txt"
+        url = urlparse.urljoin("http://testserver/", target_file)
+        response = self.client.get(url, follow=True)
+
+        # If a build-info file is invalid, we don't allow access
+        self.assertEqual(response.status_code, 403)
+
     def test_unable_to_download_hidden_files(self):
         target_file = '~linaro-android/staging-vexpress-a9/OPEN-EULA.txt'
         url = urlparse.urljoin("http://testserver/", target_file)

=== added directory 'license_protected_downloads/tests/testserver_root/build-info/empty-build-info'
=== added file 'license_protected_downloads/tests/testserver_root/build-info/empty-build-info/BUILD-INFO.txt'
=== added file 'license_protected_downloads/tests/testserver_root/build-info/empty-build-info/test.txt'
--- license_protected_downloads/tests/testserver_root/build-info/empty-build-info/test.txt	1970-01-01 00:00:00 +0000
+++ license_protected_downloads/tests/testserver_root/build-info/empty-build-info/test.txt	2013-01-30 10:48:37 +0000
@@ -0,0 +1,1 @@
+This is protected with click-through Linaro license.

=== added directory 'sampleroot/build-info/empty-build-info'
=== added file 'sampleroot/build-info/empty-build-info/BUILD-INFO.txt'
=== added file 'sampleroot/build-info/empty-build-info/test.txt'
--- sampleroot/build-info/empty-build-info/test.txt	1970-01-01 00:00:00 +0000
+++ sampleroot/build-info/empty-build-info/test.txt	2013-01-30 10:48:37 +0000
@@ -0,0 +1,1 @@
+This is protected with click-through Linaro license.