Merge ~lloydwaltersj/maas:uninformative-cli-error into maas:master

[Jack Lloyd-Walters]

add more informative CLI messages

[MAAS Lander (maas-lander)]

UNIT TESTS
-b uninformative-cli-error lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/115/consoleText
COMMIT: 5b9e7e3da97f065770803c97a03e9b971d6c34af

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b uninformative-cli-error lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 89779d3f3f20157c894483f728197a23034c7433

review: Approve

[Anton Troyanov (troyanov)]

review: Approve

[MAAS Lander (maas-lander)]

UNABLE TO START LANDING

STATUS: MISSING COMMIT MESSAGE

diff --git a/src/maasserver/api/support.py b/src/maasserver/api/support.py
index 24b8642..570bcb3 100644
--- a/src/maasserver/api/support.py
+++ b/src/maasserver/api/support.py
@@ -16,7 +16,7 @@ from abc import ABCMeta, abstractproperty
 from functools import wraps
 
 from django.core.exceptions import PermissionDenied
-from django.http import Http404
+from django.http import Http404, HttpResponse
 from django.shortcuts import get_object_or_404
 from piston3.authentication import NoAuthentication
 from piston3.emitters import Emitter
@@ -61,9 +61,11 @@ class OperationsResource(Resource):
         """
         Override piston's error_handler to fix bug #1228205 and generally
         do not hide exceptions.
+        Also override Djangos default 404 handler to fix bug #1951229 and
+        provide a more informative error message in the cli
         """
         if isinstance(e, Http404):
-            return rc.NOT_FOUND
+            return HttpResponse(str(e), content_type="text/plain", status=404)
         elif isinstance(e, HttpStatusCode):
             return e.response
         else:
diff --git a/src/maasserver/api/tests/test_machine.py b/src/maasserver/api/tests/test_machine.py
index 7c3d591..753750d 100644
--- a/src/maasserver/api/tests/test_machine.py
+++ b/src/maasserver/api/tests/test_machine.py
@@ -275,7 +275,8 @@ class TestMachineAPI(APITestCase.ForUser):
 
         self.assertEqual(http.client.NOT_FOUND, response.status_code)
         self.assertEqual(
-            "Not Found", response.content.decode(settings.DEFAULT_CHARSET)
+            "No Machine matches the given query.",
+            response.content.decode(settings.DEFAULT_CHARSET),
         )
 
     def test_GET_returns_404_if_machine_name_contains_invld_characters(self):
@@ -287,7 +288,8 @@ class TestMachineAPI(APITestCase.ForUser):
 
         self.assertEqual(http.client.NOT_FOUND, response.status_code)
         self.assertEqual(
-            "Not Found", response.content.decode(settings.DEFAULT_CHARSET)
+            "No Machine matches the given query.",
+            response.content.decode(settings.DEFAULT_CHARSET),
         )
 
     def test_GET_returns_owner_name_when_allocated_to_self(self):
diff --git a/src/maasserver/api/tests/test_node.py b/src/maasserver/api/tests/test_node.py
index f6df219..c37b11a 100644
--- a/src/maasserver/api/tests/test_node.py
+++ b/src/maasserver/api/tests/test_node.py
@@ -101,7 +101,8 @@ class TestNodeAPI(APITestCase.ForUser):
 
         self.assertEqual(http.client.NOT_FOUND, response.status_code)
         self.assertEqual(
-            "Not Found", response.content.decode(settings.DEFAULT_CHARSET)
+            "No Node matches the given query.",
+            response.content.decode(settings.DEFAULT_CHARSET),
         )
 
     def test_GET_returns_404_if_node_name_contains_invalid_characters(self):
@@ -113,7 +114,8 @@ class TestNodeAPI(APITestCase.ForUser):
 
         self.assertEqual(http.client.NOT_FOUND, response.status_code)
         self.assertEqual(
-            "Not Found", response.content.decode(settings.DEFAULT_CHARSET)
+            "No Node matches the given query.",
+            response.content.decode(settings.DEFAULT_CHARSET),
         )
 
     def test_resource_uri_points_back_at_machine(self):
diff --git a/src/maasserver/api/tests/test_tag.py b/src/maasserver/api/tests/test_tag.py
index 42d46d6..6795213 100644
--- a/src/maasserver/api/tests/test_tag.py
+++ b/src/maasserver/api/tests/test_tag.py
@@ -598,6 +598,11 @@ class TestTagAPI(APITestCase.ForUser):
             reverse("tag_handler", args=[name]), {"op": "update_nodes"}
         )
         self.assertEqual(http.client.NOT_FOUND, response.status_code)
+        # check we have a verbose output
+        self.assertEqual(
+            "No Tag matches the given query.",
+            response.content.decode(settings.DEFAULT_CHARSET),
+        )
 
     def test_POST_update_nodes_changes_associations(self):
         tag = factory.make_Tag()