Merge ~adam-collard/maas:config-snap-debug into maas:master

[Adam Collard]

Fix error when enabling debug in the snap

[Alberto Donato (ack)]

+1

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b config-snap-debug lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/9077/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b config-snap-debug lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 767aafc605420afd237ec71c0d81049c5e84e026

review: Approve

diff --git a/src/maascli/snappy.py b/src/maascli/snappy.py
index e58b8ee..48fc267 100644
--- a/src/maascli/snappy.py
+++ b/src/maascli/snappy.py
@@ -819,11 +819,6 @@ class cmd_config(SnappyCommand):
             # Validate the mode and flags.
             self._validate_flags(options, running_mode)
 
-            if options.mode != running_mode:
-                render_supervisord(options.mode)
-                set_current_mode(options.mode)
-                restart_required = True
-
             current_config = config_manager.get()
             # Only update the passed settings.
             for flag in self.setting_flags:
diff --git a/src/maascli/tests/test_snappy.py b/src/maascli/tests/test_snappy.py
index 95458f7..8ef6f5b 100644
--- a/src/maascli/tests/test_snappy.py
+++ b/src/maascli/tests/test_snappy.py
@@ -592,3 +592,35 @@ class TestCmdConfig(MAASTestCase):
         options = self.parser.parse_args([])
         self.assertIsNone(self.cmd(options))
         self.assertEqual(stdout.getvalue(), "Mode: none\n")
+
+    def test_enable_debugging(self):
+        mock_maas_configuration = self.patch(snappy, "MAASConfiguration")
+        mock_sighup_supervisord = self.patch(snappy, "sighup_supervisord")
+        options = self.parser.parse_args(["--enable-debug"])
+        stdout = io.StringIO()
+        self.patch(sys, "stdout", stdout)
+
+        self.cmd(options)
+        mock_maas_configuration().update.assert_called_once_with(
+            {"debug": True}
+        )
+        # After config is changed, services are restarted
+        self.assertEqual(stdout.getvalue(), "Stopping services\n")
+        mock_sighup_supervisord.assert_called_once_with()
+
+    def test_reenable_debugging(self):
+        mock_maas_configuration = self.patch(snappy, "MAASConfiguration")
+        config_manager = mock_maas_configuration()
+        mock_sighup_supervisord = self.patch(snappy, "sighup_supervisord")
+        options = self.parser.parse_args(["--enable-debug"])
+        stdout = io.StringIO()
+        self.patch(sys, "stdout", stdout)
+
+        # Simulate the value already being enabled
+        current_config = config_manager.get()
+        current_config.get.side_effect = {"debug": True}.__getitem__
+
+        self.cmd(options)
+        config_manager.update.assert_not_called()
+        self.assertEqual(stdout.getvalue(), "")
+        mock_sighup_supervisord.assert_not_called()