Merge ~adam-collard/maas:docs-index-to-index into maas:master

[Adam Collard]

LP: #1913323 - Redirect docs/ to index

[MAAS Lander (maas-lander)]

UNIT TESTS
-b docs-index-to-index lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/9285/console
COMMIT: d75e205b35abac9296d363b1e140c417f5901645

review: Needs Fixing

[Adam Collard (adam-collard)]

jenkins: !test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b docs-index-to-index lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/9289/console
COMMIT: d75e205b35abac9296d363b1e140c417f5901645

review: Needs Fixing

[Björn Tillenius (bjornt)]

+1

review: Approve

[Adam Collard (adam-collard)]

jenkins: !test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b docs-index-to-index lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: d75e205b35abac9296d363b1e140c417f5901645

review: Approve

diff --git a/src/maasserver/tests/test_webapp.py b/src/maasserver/tests/test_webapp.py
index 3edc12a..8e502b4 100644
--- a/src/maasserver/tests/test_webapp.py
+++ b/src/maasserver/tests/test_webapp.py
@@ -38,30 +38,38 @@ class TestDocsFallbackFile(MAASTestCase):
     def test_html_404(self):
         request = DummyRequest([b"foo.html"])
         resource = self.docs.getChild(b"foo.html", request)
-        self.assertTrue(resource.path.endswith("404.html"))
+        self.assertTrue(resource.path.endswith("404.html"), resource.path)
 
     def test_other_404(self):
         request = DummyRequest([b"foo.jpg"])
         resource = self.docs.getChild(b"foo.jpg", request)
-        self.assertTrue(resource.path.endswith("404.html"))
+        self.assertTrue(resource.path.endswith("404.html"), resource.path)
 
     def test_html_resource(self):
         self.touch_file("foo.html")
         request = DummyRequest([b"foo.html"])
         resource = self.docs.getChild(b"foo.html", request)
-        self.assertTrue(resource.path.endswith("foo.html"))
+        self.assertTrue(resource.path.endswith("foo.html"), resource.path)
 
     def test_other_resource(self):
         self.touch_file("foo.jpg")
         request = DummyRequest([b"foo.jpg"])
         resource = self.docs.getChild(b"foo.jpg", request)
-        self.assertTrue(resource.path.endswith("foo.jpg"))
+        self.assertTrue(resource.path.endswith("foo.jpg"), resource.path)
 
     def test_append_html(self):
         self.touch_file("foo.html")
         request = DummyRequest([b"foo"])
         resource = self.docs.getChild(b"foo", request)
-        self.assertTrue(resource.path.endswith("foo.html"))
+        self.assertTrue(resource.path.endswith("foo.html"), resource.path)
+
+    def test_index(self):
+        self.touch_file("maas-documentation-25.html")
+        request = DummyRequest([b""])
+        resource = self.docs.getChild(b"", request)
+        self.assertTrue(
+            resource.path.endswith("maas-documentation-25.html"), resource.path
+        )
 
 
 class TestCleanPathRequest(MAASTestCase):
diff --git a/src/maasserver/webapp.py b/src/maasserver/webapp.py
index b325bfb..c3ab7b9 100644
--- a/src/maasserver/webapp.py
+++ b/src/maasserver/webapp.py
@@ -181,6 +181,8 @@ class DocsFallbackFile(NoListingFile):
         self.childNotFound = DefaultFile(self.child(fallback).path)
 
     def getChild(self, path, request):
+        if path == b"":
+            return self.getChild("maas-documentation-25.html", request)
         child = super().getChild(path, request)
         if child is self.childNotFound and not path.endswith(b".html"):
             child = super().getChild(path + b".html", request)