Merge lp:~allenap/maas/mpontillo--allow-commissioning-non-lts into lp:~maas-committers/maas/trunk

[Gavin Panella]

[MAAS Lander (maas-lander)]

Transitioned to Git.

lp:maas has now moved from Bzr to Git.
Please propose your branches with Launchpad using Git.

git clone https://git.launchpad.net/maas

Unmerged revisions

5462. By Gavin Panella on 2016-10-07

Fix lint.

5461. By Gavin Panella on 2016-10-07

Fix DirectoryString's validation.

5460. By Mike Pontillo on 2016-10-07

Fix tests, address incorrect assumption.

5459. By Mike Pontillo on 2016-10-07

Add configuraiton option for commissioning on a non-LTS release. Drive-by fix for a problem that prevented correct usage of python conversions in rackd.conf.

5458. By Mike Pontillo on 2016-10-07

Add a constant to allow commissioning non-LTS releases.

=== modified file 'src/provisioningserver/config.py'
--- src/provisioningserver/config.py	2016-10-07 09:03:34 +0000
+++ src/provisioningserver/config.py	2016-10-07 09:03:34 +0000
@@ -770,7 +770,7 @@
     tftp_root = ConfigurationOption(
         "tftp_root", "The root directory for TFTP resources.",
         DirectoryString(
-             if_missing=get_tentative_path(
+            if_missing=get_tentative_path(
                 "/var/lib/maas/boot-resources/current")))
 
     allow_commissioning_non_lts = ConfigurationOption(
 
=== modified file 'src/provisioningserver/drivers/osystem/tests/test_ubuntu.py'
--- src/provisioningserver/drivers/osystem/tests/test_ubuntu.py	2016-10-07 09:03:34 +0000
+++ src/provisioningserver/drivers/osystem/tests/test_ubuntu.py	2016-10-07 09:03:34 +0000
@@ -18,7 +18,6 @@
 from testtools.matchers import Contains
 
 
-
 class TestUbuntuOS(MAASTestCase):
 
     def get_lts_release(self):
 
=== modified file 'src/provisioningserver/utils/config.py'
--- src/provisioningserver/utils/config.py	2016-08-19 10:22:29 +0000
+++ src/provisioningserver/utils/config.py	2016-10-07 09:03:34 +0000
@@ -124,11 +124,12 @@
         "notDir": "%(value)r does not exist or is not a directory",
     }
 
-    def _validate_other(self, value, state=None):
+    def from_python(self, value, state=None):
         # Only validate on the way _in_; it's not the store's fault if it
-        # contains a directory which has since been removed.
-        if os.path.isdir(value):
-            return value
+        # contains a directory which has since been removed. Check that the
+        # original as-Python value represents a directory.
+        if self.is_empty(value) or os.path.isdir(value):
+            return super(DirectoryString, self).from_python(value, state)
         else:
             raise formencode.Invalid(
                 self.message("notDir", state, value=value),
 
=== modified file 'src/provisioningserver/utils/tests/test_config.py'
--- src/provisioningserver/utils/tests/test_config.py	2016-08-19 10:22:29 +0000
+++ src/provisioningserver/utils/tests/test_config.py	2016-10-07 09:03:34 +0000
@@ -146,22 +146,39 @@
 class TestDirectory(MAASTestCase):
     """Tests for `DirectoryString`."""
 
-    def test__validation_succeeds_when_directory_exists(self):
+    def test__converting_succeeds_when_directory_exists(self):
         directory = self.make_dir()
-        validator = config.DirectoryString(accept_python=False)
+        validator = config.DirectoryString()
         self.assertEqual(directory, validator.from_python(directory))
         self.assertEqual(directory, validator.to_python(directory))
 
-    def test__validation_fails_when_directory_does_not_exist(self):
+    def test__converting_from_python_fails_when_directory_not_exists(self):
         directory = os.path.join(self.make_dir(), "not-here")
-        validator = config.DirectoryString(accept_python=False)
+        validator = config.DirectoryString()
         expected_exception = ExpectedException(
             formencode.validators.Invalid, "^%s$" % re.escape(
                 "%r does not exist or is not a directory" % directory))
         with expected_exception:
             validator.from_python(directory)
-        with expected_exception:
-            validator.to_python(directory)
+
+    def test__converting_to_python_succeeds_when_directory_not_exists(self):
+        directory = os.path.join(self.make_dir(), "not-here")
+        validator = config.DirectoryString()
+        self.assertEqual(directory, validator.to_python(directory))
+
+    def test__converting_succeeds_when_empty(self):
+        validator = config.DirectoryString()
+        self.assertIsNone(validator.from_python(None))
+        self.assertIsNone(validator.to_python(None))
+
+    def test__converting_fails_when_empty_and_not_empty_set(self):
+        validator = config.DirectoryString(not_empty=True)
+        expected_exception = ExpectedException(
+            formencode.validators.Invalid, "^Please enter a value$")
+        with expected_exception:
+            self.assertIsNone(validator.from_python(None))
+        with expected_exception:
+            self.assertIsNone(validator.to_python(None))
 
 
 class TestExtendedURL(MAASTestCase):