Merge lp:~allenap/maas/remove-maas-develop into lp:~maas-committers/maas/trunk

[Gavin Panella]

Stop using the MAAS_RACK_DEVELOP environment variable and remove the in_develop_mode function.

The existing is_dev_environment function is used instead.

[Blake Rouse (blake-rouse)]

lgtm

review: Approve

=== modified file 'buildout.cfg'
--- buildout.cfg	2017-02-17 14:23:04 +0000
+++ buildout.cfg	2017-03-31 09:43:49 +0000
@@ -286,7 +286,6 @@
   twistd.rack
 initialization =
   ${common:initialization}
-  environ.setdefault("MAAS_RACK_DEVELOP", "TRUE")
 
 [rack-test]
 recipe = zc.recipe.egg
@@ -325,7 +324,6 @@
 initialization =
   ${common:path-munge}
   from os import environ
-  environ.setdefault("MAAS_RACK_DEVELOP", "TRUE")
   environ.setdefault("MAAS_ROOT", "${buildout:directory}/.run-e2e")
   environ.setdefault("DJANGO_SETTINGS_MODULE", "maasserver.djangosettings.development")
   environ.setdefault("DEV_DB_NAME", "test_maas_e2e")

=== modified file 'src/provisioningserver/import_images/download_resources.py'
--- src/provisioningserver/import_images/download_resources.py	2017-01-28 00:51:47 +0000
+++ src/provisioningserver/import_images/download_resources.py	2017-03-31 09:43:49 +0000
@@ -12,13 +12,13 @@
 import os.path
 import tarfile
 
+from provisioningserver.config import is_dev_environment
 from provisioningserver.import_images.helpers import (
     get_os_from_product,
     get_signing_policy,
     maaslog,
 )
 from provisioningserver.logger import LegacyLogger
-from provisioningserver.utils import in_develop_mode
 from provisioningserver.utils.shell import call_and_check
 from simplestreams.contentsource import FdContentSource
 from simplestreams.mirrors import (
@@ -73,7 +73,7 @@
     :param root_image_path: Input file.
     :param root_tgz_path: Output file.
     """
-    if in_develop_mode():
+    if is_dev_environment():
         # In debug mode this is skipped as it requires the uec2roottar
         # script to have sudo abilities. The root-tgz is created as an
         # empty file so the correct links can be made.

=== modified file 'src/provisioningserver/utils/__init__.py'
--- src/provisioningserver/utils/__init__.py	2016-09-22 02:53:33 +0000
+++ src/provisioningserver/utils/__init__.py	2017-03-31 09:43:49 +0000
@@ -6,7 +6,6 @@
 __all__ = [
     "CircularDependency",
     "flatten",
-    "in_develop_mode",
     "locate_config",
     "locate_template",
     "parse_key_value_file",
@@ -186,20 +185,10 @@
     return value.lower() in ("yes", "true", "t", "1")
 
 
-def in_develop_mode():
-    """Return True if `MAAS_RACK_DEVELOP` environment variable is true.
-
-    Deprecated. Use `is_dev_environment` instead.
-    """
-    return is_true(os.getenv('MAAS_RACK_DEVELOP', None))
-
-
 def sudo(command_args):
     """Wrap the command arguments in a sudo command, if not in debug mode."""
     from provisioningserver.config import is_dev_environment  # Circular.
-    if in_develop_mode():
-        return command_args
-    elif is_dev_environment():
+    if is_dev_environment():
         return command_args
     else:
         return ['sudo', '-n', *command_args]

=== modified file 'src/provisioningserver/utils/tests/test_utils.py'
--- src/provisioningserver/utils/tests/test_utils.py	2017-01-28 00:51:47 +0000
+++ src/provisioningserver/utils/tests/test_utils.py	2017-03-31 09:43:49 +0000
@@ -22,7 +22,6 @@
     CircularDependency,
     classify,
     flatten,
-    in_develop_mode,
     is_instance_or_subclass,
     locate_config,
     locate_template,
@@ -225,47 +224,19 @@
         self.assertItemsEqual("abcdef", flatten("a", "b", "c", "d", "e", "f"))
 
 
-class TestInDebugMode(MAASTestCase):
-
-    def test_in_develop_mode_returns_False(self):
-        self.assertFalse(in_develop_mode())
-
-    def test_in_develop_mode_returns_True(self):
-        self.patch(provisioningserver.utils.os, 'getenv').return_value = "TRUE"
-        self.assertTrue(in_develop_mode())
-
-
 class TestSudo(MAASTestCase):
 
-    def set_in_develop_mode(self, value):
-        self.patch(provisioningserver.utils, 'in_develop_mode')
-        provisioningserver.utils.in_develop_mode.return_value = value
-
     def set_is_dev_environment(self, value):
         self.patch(provisioningserver.config, 'is_dev_environment')
         provisioningserver.config.is_dev_environment.return_value = value
 
-    def test_returns_same_command_when_in_develop_mode(self):
-        cmd = [factory.make_name('cmd') for _ in range(3)]
-        self.set_in_develop_mode(True)
-        self.set_is_dev_environment(False)
-        self.assertEqual(cmd, sudo(cmd))
-
     def test_returns_same_command_when_is_dev_environment(self):
         cmd = [factory.make_name('cmd') for _ in range(3)]
-        self.set_in_develop_mode(False)
-        self.set_is_dev_environment(True)
-        self.assertEqual(cmd, sudo(cmd))
-
-    def test_returns_same_command_when_in_develop_mode_or_is_dev_env(self):
-        cmd = [factory.make_name('cmd') for _ in range(3)]
-        self.set_in_develop_mode(True)
-        self.set_is_dev_environment(True)
-        self.assertEqual(cmd, sudo(cmd))
-
-    def test_returns_sudo_cmd_when_not_in_dev_mode_and_is_not_dev_env(self):
-        cmd = [factory.make_name('cmd') for _ in range(3)]
-        self.set_in_develop_mode(False)
+        self.set_is_dev_environment(True)
+        self.assertEqual(cmd, sudo(cmd))
+
+    def test_returns_sudo_command_when_is_not_dev_environment(self):
+        cmd = [factory.make_name('cmd') for _ in range(3)]
         self.set_is_dev_environment(False)
         self.assertEqual(['sudo', '-n'] + cmd, sudo(cmd))