Merge lp:~andreserl/maas/lp1592666_2.0 into lp:maas/2.0

[Andres Rodriguez]

Backport rev5213: Strip forward slash in the path of the archive mirror, provided that when composing the whole archive, we add the additional "/".

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2016-07-27 19:16:37 +0000
+++ docs/changelog.rst	2016-07-28 16:30:45 +0000
@@ -3,6 +3,15 @@
 =========
 
 
+2.0.0 (rc4)
+===========
+
+Issues fixed in this release
+----------------------------
+
+LP: #1592666    Mirror URL contains double slash (/) after hostname, impacting proxy cachaility.
+
+
 2.0.0 (rc3)
 ===========
 
 
=== modified file 'src/maasserver/preseed.py'
--- src/maasserver/preseed.py	2016-07-07 21:57:57 +0000
+++ src/maasserver/preseed.py	2016-07-28 16:30:45 +0000
@@ -573,7 +573,7 @@
     and, optionally, the port.
     """
     parsed_url = urlparse(url)
-    return parsed_url.netloc, parsed_url.path
+    return parsed_url.netloc, parsed_url.path.lstrip("/")
 
 
 def get_preseed_context(osystem='', release='', rack_controller=None):
 
=== modified file 'src/maasserver/tests/test_preseed.py'
--- src/maasserver/tests/test_preseed.py	2016-07-07 21:57:57 +0000
+++ src/maasserver/tests/test_preseed.py	2016-07-28 16:30:45 +0000
@@ -120,12 +120,12 @@
 
     def test_get_netloc_and_path(self):
         input_and_results = [
-            ('http://name.domain:66/my/path', ('name.domain:66', '/my/path')),
-            ('http://name.domain:80/my/path', ('name.domain:80', '/my/path')),
-            ('http://name.domain/my/path', ('name.domain', '/my/path')),
-            ('https://domain/path', ('domain', '/path')),
+            ('http://name.domain:66/my/path', ('name.domain:66', 'my/path')),
+            ('http://name.domain:80/my/path', ('name.domain:80', 'my/path')),
+            ('http://name.domain/my/path', ('name.domain', 'my/path')),
+            ('https://domain/path', ('domain', 'path')),
             ('http://domain:12', ('domain:12', '')),
-            ('http://domain/', ('domain', '/')),
+            ('http://domain/', ('domain', '')),
             ('http://domain', ('domain', '')),
             ]
         inputs = [input for input, _ in input_and_results]
@@ -443,9 +443,9 @@
         self.assertEqual(
             (
                 parsed_main_archive.hostname,
-                parsed_main_archive.path,
+                parsed_main_archive.path.lstrip('/'),
                 parsed_ports_archive.hostname,
-                parsed_ports_archive.path,
+                parsed_ports_archive.path.lstrip('/'),
             ),
             (
                 context['main_archive_hostname'],