Merge lp:~rvb/maas/valid-bug-1304408-1.5 into lp:maas/1.5

[Raphaël Badin]

Backport revision 2247: Fix the 'invalid_choice' error message for 'commissioning_distro_series' fields.

[Raphaël Badin (rvb)]

review: Approve

=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2014-04-02 04:21:39 +0000
+++ src/maasserver/forms.py	2014-04-09 13:39:35 +0000
@@ -825,7 +825,9 @@
     commissioning_distro_series = forms.ChoiceField(
         choices=COMMISSIONING_DISTRO_SERIES_CHOICES, required=False,
         label="Default distro series used for commissioning",
-        error_messages={'invalid_choice': INVALID_DISTRO_SERIES_MESSAGE})
+        error_messages={'invalid_choice': compose_invalid_choice_text(
+            'commissioning_distro_series',
+            COMMISSIONING_DISTRO_SERIES_CHOICES)})
 
 
 class UbuntuForm(ConfigForm):
 
=== modified file 'src/maasserver/forms_settings.py'
--- src/maasserver/forms_settings.py	2014-04-01 06:53:12 +0000
+++ src/maasserver/forms_settings.py	2014-04-09 13:39:35 +0000
@@ -158,7 +158,9 @@
             'choices': COMMISSIONING_DISTRO_SERIES_CHOICES,
             'required': False,
             'error_messages': {
-                'invalid_choice': INVALID_DISTRO_SERIES_MESSAGE},
+                'invalid_choice': compose_invalid_choice_text(
+                    'commissioning_distro_series',
+                    COMMISSIONING_DISTRO_SERIES_CHOICES)},
         }
     },
 }
 
=== modified file 'src/maasserver/tests/test_forms.py'
--- src/maasserver/tests/test_forms.py	2014-04-01 10:04:21 +0000
+++ src/maasserver/tests/test_forms.py	2014-04-09 13:39:35 +0000
@@ -34,6 +34,7 @@
     AdminNodeWithMACAddressesForm,
     BLANK_CHOICE,
     BulkNodeActionForm,
+    CommissioningForm,
     CommissioningScriptForm,
     ConfigForm,
     DownloadProgressForm,
@@ -90,6 +91,7 @@
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from maasserver.utils import map_enum
+from maasserver.utils.forms import compose_invalid_choice_text
 from metadataserver.models import CommissioningScript
 from netaddr import IPNetwork
 from provisioningserver import tasks
@@ -1270,6 +1272,17 @@
         self.assertEqual(data['name'], reload_object(nodegroup).name)
 
 
+class TestCommissioningFormForm(MAASServerTestCase):
+
+    def test_commissioningform_error_msg_lists_series_choices(self):
+        form = CommissioningForm()
+        field = form.fields['commissioning_distro_series']
+        self.assertEqual(
+            compose_invalid_choice_text(
+                'commissioning_distro_series', field.choices),
+            field.error_messages['invalid_choice'])
+
+
 class TestCommissioningScriptForm(MAASServerTestCase):
 
     def test_creates_commissioning_script(self):
 
=== modified file 'src/maasserver/tests/test_forms_settings.py'
--- src/maasserver/tests/test_forms_settings.py	2013-10-07 09:12:40 +0000
+++ src/maasserver/tests/test_forms_settings.py	2014-04-09 13:39:35 +0000
@@ -24,6 +24,7 @@
 from maasserver.models import Config
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
+from maasserver.utils.forms import compose_invalid_choice_text
 
 
 class TestGetConfigField(MAASServerTestCase):
@@ -59,3 +60,13 @@
         doc = get_config_doc()
         # Just make sure that the doc looks okay.
         self.assertIn('maas_name', doc)
+
+
+class TestSpecificConfigSettings(MAASServerTestCase):
+
+    def test_commissioning_distro_series_config(self):
+        field = get_config_field('commissioning_distro_series')
+        self.assertEqual(
+            compose_invalid_choice_text(
+                'commissioning_distro_series', field.choices),
+            field.error_messages['invalid_choice'])