Merge lp:~allenap/maas/remove-make-validation-error-message into lp:~maas-committers/maas/trunk

[Gavin Panella]

Remove the unused make_validation_error_message function and the newly unused dependencies thereof.

[Mike Pontillo (mpontillo)]

Looks good.

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~allenap/maas/remove-make-validation-error-message into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Hit:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease
Hit:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Get:4 http://security.ubuntu.com/ubuntu xenial-security InRelease [94.5 kB]
Fetched 94.5 kB in 0s (204 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind avahi-utils bash bind9 bind9utils build-essential bzr bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common isc-dhcp-server libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-attr python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-netaddr python3-netifaces python3-novaclient python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
archdetect-deb is already the newest version (1.117ubuntu2).
authbind is already the newest version (2.1.1+nmu1).
avahi-utils is already the newest version (0.6.32~rc+dfsg-1ubuntu2).
build-essential is already the newest version (12.1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
freeipmi-tools is already the newest version (1.4.11-1ubuntu1).
git is already the newest version (1:2.7.4-0ubuntu1).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-yui3-full is already the newest version (3.5.1-1ubuntu3).
libjs-yui3-min is already the newest version (3.5.1-1ubuntu3).
make is already the newest version (4.1-6).
postgresql is already the newest version (9.5+173).
pxelinux is already the newest version (3:6.03+dfsg-11ubuntu1).
python-formencode is already the newest version (1.3.0-0ubuntu5).
python-lxml is already the newest version (3.5.0-1build1).
python-netaddr is alrea...

=== modified file 'src/maasserver/utils/__init__.py'
--- src/maasserver/utils/__init__.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/utils/__init__.py	2016-09-01 07:44:11 +0000
@@ -5,12 +5,10 @@
 
 __all__ = [
     'absolute_reverse',
-    'absolute_reverse_url',
     'build_absolute_uri',
     'find_rack_controller',
     'get_local_cluster_UUID',
     'ignore_unused',
-    'make_validation_error_message',
     'strip_domain',
     'synchronised',
     ]
@@ -28,7 +26,6 @@
     ClusterConfiguration,
     UUID_NOT_SET,
 )
-from provisioningserver.utils.text import make_bullet_list
 
 
 def ignore_unused(*args):
@@ -165,24 +162,3 @@
                 return func(*args, **kwargs)
         return call_with_lock
     return synchronise
-
-
-def gen_validation_error_messages(error):
-    """Return massaged messages from a :py:class:`ValidationError`."""
-    message_dict = error.message_dict
-    for field in sorted(message_dict):
-        field_messages = message_dict[field]
-        if field == "__all__":
-            for field_message in field_messages:
-                yield field_message
-        else:
-            for field_message in field_messages:
-                yield "%s: %s" % (field, field_message)
-
-
-def make_validation_error_message(error):
-    """Return a massaged message from a :py:class:`ValidationError`.
-
-    The message takes the form of a textual bullet-list.
-    """
-    return make_bullet_list(gen_validation_error_messages(error))

=== modified file 'src/maasserver/utils/tests/test_utils.py'
--- src/maasserver/utils/tests/test_utils.py	2016-05-12 19:07:37 +0000
+++ src/maasserver/utils/tests/test_utils.py	2016-09-01 07:44:11 +0000
@@ -13,7 +13,6 @@
     urlparse,
 )
 
-from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse
 from django.http import HttpRequest
 from django.test.client import RequestFactory
@@ -26,7 +25,6 @@
     build_absolute_uri,
     find_rack_controller,
     get_local_cluster_UUID,
-    make_validation_error_message,
     strip_domain,
     synchronised,
 )
@@ -254,18 +252,3 @@
         self.assertFalse(lock.locked())
         self.assertEqual(sentinel.called, example_synchronised_function())
         self.assertFalse(lock.locked())
-
-
-class TestMakeValidationErrorMessage(MAASTestCase):
-
-    def test__formats_message_with_all_errors(self):
-        error = ValidationError({
-            "foo": [ValidationError("bar")],
-            "alice": [ValidationError("bob")],
-            "__all__": ["all is lost"],
-        })
-        self.assertEqual(
-            "* all is lost\n"
-            "* alice: bob\n"
-            "* foo: bar",
-            make_validation_error_message(error))

=== modified file 'src/metadataserver/user_data/snippets.py'
--- src/metadataserver/user_data/snippets.py	2016-08-25 17:30:31 +0000
+++ src/metadataserver/user_data/snippets.py	2016-09-01 07:44:11 +0000
@@ -1,4 +1,4 @@
-# Copyright 2013-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2013-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Low-level routines for access to snippets.

=== modified file 'src/provisioningserver/boot/__init__.py'
--- src/provisioningserver/boot/__init__.py	2016-08-25 20:14:49 +0000
+++ src/provisioningserver/boot/__init__.py	2016-09-01 07:44:11 +0000
@@ -1,4 +1,4 @@
-# Copyright 2012-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Boot Methods."""

=== modified file 'src/provisioningserver/utils/tests/test_text.py'
--- src/provisioningserver/utils/tests/test_text.py	2016-08-09 21:59:28 +0000
+++ src/provisioningserver/utils/tests/test_text.py	2016-09-01 07:44:11 +0000
@@ -6,14 +6,12 @@
 __all__ = []
 
 import string
-from textwrap import dedent
 
 import hypothesis
 import hypothesis.strategies
 from maastesting.factory import factory
 from maastesting.testcase import MAASTestCase
 from provisioningserver.utils.text import (
-    make_bullet_list,
     normalise_to_comma_list,
     normalise_whitespace,
     split_string_list,
@@ -43,39 +41,6 @@
         self.assertEqual(punctuation, normalise_whitespace(punctuation))
 
 
-class TestMakeBulletList(MAASTestCase):
-
-    def test__returns_empty_string_when_there_are_no_messages(self):
-        self.assertEqual("", make_bullet_list([]))
-
-    def test__wraps_at_72_columns(self):
-        lines = make_bullet_list([" -" * 50]).splitlines()
-        self.assertEqual(72, max(len(line) for line in lines))
-
-    def test__fills_and_formats(self):
-        messages = [
-            """Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-            Maecenas a lorem pellentesque, dapibus lorem ut, blandit ex.""",
-            """Nulla tristique quam sed suscipit cursus""",
-            """Integer euismod viverra ipsum, id placerat ante interdum vitae.
-            Mauris fermentum ut nisi vitae tincidunt. Maecenas posuere lacus
-            vel est dignissim vehicula. Vestibulum tristique, massa non
-            facilisis mattis, nisi lacus lacinia neque, nec convallis risus
-            turpis id metus. Aenean semper sapien sed volutpat volutpat.""",
-        ]
-        bullet_list = make_bullet_list(messages)
-        bullet_list_expected = dedent("""\
-        * Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-          Maecenas a lorem pellentesque, dapibus lorem ut, blandit ex.
-        * Nulla tristique quam sed suscipit cursus
-        * Integer euismod viverra ipsum, id placerat ante interdum vitae.
-          Mauris fermentum ut nisi vitae tincidunt. Maecenas posuere lacus
-          vel est dignissim vehicula. Vestibulum tristique, massa non
-          facilisis mattis, nisi lacus lacinia neque, nec convallis risus
-          turpis id metus. Aenean semper sapien sed volutpat volutpat.""")
-        self.assertEqual(bullet_list_expected, bullet_list)
-
-
 class TestNormaliseToCommaList(MAASTestCase):
     """Tests for `normalise_to_comma_list`."""
 

=== modified file 'src/provisioningserver/utils/text.py'
--- src/provisioningserver/utils/text.py	2016-08-09 21:59:28 +0000
+++ src/provisioningserver/utils/text.py	2016-09-01 07:44:11 +0000
@@ -4,14 +4,12 @@
 """Text-processing utilities."""
 
 __all__ = [
-    'make_bullet_list',
     'normalise_whitespace',
     'normalise_to_comma_list',
     'split_string_list',
 ]
 
 import re
-from textwrap import TextWrapper
 
 
 def normalise_whitespace(text):
@@ -19,20 +17,6 @@
     return ' '.join(text.split())
 
 
-def make_bullet_list(messages):
-    """Join `messages` into a bullet list.
-
-    Each message is reformatted to 70 columns wide, indented by 2 columns,
-    making 72 columns in all. The first line of each message is denoted by a
-    asterisk in the first column.
-
-    :type messages: An iterable of strings.
-    :return: A string.
-    """
-    fill = TextWrapper(72, initial_indent="* ", subsequent_indent="  ").fill
-    return "\n".join(fill(message) for message in messages)
-
-
 def normalise_to_comma_list(string):
     """Take a space- or comma-separated list and return a comma-separated list.