Merge lp:~benji/landscape-charm/bug-1411677-license-parsing-does-not-handle-extra-newline into lp:~landscape/landscape-charm/trunk

[Benji York]

Fix license URL recognition in the face of leading/trailing whitespace.

This is a simple fix for bug 1411677 (license URL with leading/trailing newline is not recognized).

[lp:~benji/landscape-charm/bug-1411677-license-parsing-does-not-handle-extra-newline]

220. By Benji York on 2015-01-20

tweak docstrings

[Björn Tillenius (bjornt)]

Looks good, +1

review: Approve

[David Britton (dpb)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-12-10 22:45:09 +0000
+++ .bzrignore	2015-01-20 18:15:26 +0000
@@ -1,1 +1,2 @@
 _trial_temp
+tags

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-01-19 18:05:58 +0000
+++ hooks/hooks.py	2015-01-20 18:15:26 +0000
@@ -570,6 +570,10 @@
     if not license_file:
         juju.juju_log("No license file given, skipping")
         return
+    else:
+        # Leading or trailing whitespace is nonsensical, so remove it.
+        license_file = license_file.strip()
+
     if re.match(license_file_re, license_file):
         license_file = _download_file(license_file)
 

=== modified file 'hooks/test_hooks.py'
--- hooks/test_hooks.py	2015-01-19 19:29:44 +0000
+++ hooks/test_hooks.py	2015-01-20 18:15:26 +0000
@@ -994,6 +994,26 @@
         self.assertFileContains(
             hooks.LANDSCAPE_LICENSE_DEST, "LICENSE_FILE_TEXT from curl")
 
+    def test__install_license_url_with_trailing_whitespace(self):
+        """Install a license from a url with trailing whitespace."""
+        source = self.makeFile()
+        with open(source, "w") as fp:
+            fp.write("LICENSE_FILE_TEXT from curl")
+        hooks.juju.config["license-file"] = "file:///%s\n\n\n" % source
+        hooks._install_license()
+        self.assertFileContains(
+            hooks.LANDSCAPE_LICENSE_DEST, "LICENSE_FILE_TEXT from curl")
+
+    def test__install_license_url_with_leading_whitespace(self):
+        """Install a license from a url with leading whitespace."""
+        source = self.makeFile()
+        with open(source, "w") as fp:
+            fp.write("LICENSE_FILE_TEXT from curl")
+        hooks.juju.config["license-file"] = "\n\n\nfile:///%s" % source
+        hooks._install_license()
+        self.assertFileContains(
+            hooks.LANDSCAPE_LICENSE_DEST, "LICENSE_FILE_TEXT from curl")
+
     def test_handle_no_license(self):
         """Don't try to install the license when none was given."""
         hooks.juju.config["license-file"] = None