Merge lp:~pfalcon/linaro-license-protection/revamp-buildinfo-tests into lp:~linaro-automation/linaro-license-protection/trunk

[Paul Sokolovsky]

Revamp failure in linaro-license-protection's testsuite. Individual commits has detailed description of changes and reasons behind them.

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

This looks good.

review: Approve

[lp:~pfalcon/linaro-license-protection/revamp-buildinfo-tests]

163. By Paul Sokolovsky on 2013-02-20

Test separately for querying subdir access and access when no BUILD-INFO.txt.

Previous test_readFile_nonFile() was really confusing, there're two separate
cases to test for.

Also, make conclusions from previous wrong test patch due to presence of stray
BUILD-INFO.txt on local system: the real problem is not using actual dirs for
testdata, but trying to (ab)use source files directory as testdata: don't do
that, have each for its own purpose (source directory may contain arbitrary
files during development, but test corpus is just that).

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

review: Needs Fixing

Unmerged revisions

=== modified file 'license_protected_downloads/tests/test_buildinfo.py'
--- license_protected_downloads/tests/test_buildinfo.py	2013-01-30 10:46:11 +0000
+++ license_protected_downloads/tests/test_buildinfo.py	2013-02-20 13:12:27 +0000
@@ -14,15 +14,26 @@
         self.buildinfo_file_path = os.path.join(THIS_DIRECTORY,
                                                 "BUILD-INFO.txt")
 
-    def test_readFile_nonFile(self):
+    def test_no_buildinfo(self):
+        file_path = THIS_DIRECTORY + \
+            '/testserver_root/build-info/no-build-info/file'
         with self.assertRaises(IOError):
-            BuildInfo("license_protected_downloads")
-
-    def test_readFile_nonexistentFile(self):
+            BuildInfo(file_path)
+
+    def test_apply_to_dir(self):
+        dir_path = THIS_DIRECTORY + \
+            '/testserver_root/build-info/subdir'
+        build_info = BuildInfo(dir_path)
+        self.assertEquals(build_info.getInfoForFile(),
+            [{'build-name': 'landing-protected',
+              'license-type': 'protected',
+              'openid-launchpad-teams': 'linaro'}])
+
+    def test_apply_to_nonexistent_file(self):
         with self.assertRaises(IOError):
             BuildInfo("nonexistent.file")
 
-    def test_readFile_File(self):
+    def test_apply_to_file(self):
         build_info = BuildInfo(self.buildinfo_file_path)
 
         self.assertIn("Files-Pattern: *.txt", build_info.lines)

=== added directory 'license_protected_downloads/tests/testserver_root/build-info/no-build-info'
=== added file 'license_protected_downloads/tests/testserver_root/build-info/no-build-info/file'
--- license_protected_downloads/tests/testserver_root/build-info/no-build-info/file	1970-01-01 00:00:00 +0000
+++ license_protected_downloads/tests/testserver_root/build-info/no-build-info/file	2013-02-20 13:12:27 +0000
@@ -0,0 +1,1 @@
+just file