Revert "Merge pull request canonical#1811 from Chris-Peterson444/lp-2…

…032961-clean-environment-commands"

This reverts commit 85af88e, reversing
changes made to 143d8e3.

subiquity/server/controllers/cmdlist.py

@@ -16,7 +16,6 @@
 import asyncio
 import os
 import shlex
-import shutil
 from typing import List, Sequence, Union
 
 import attr
@@ -26,7 +25,7 @@
 from subiquity.server.controller import NonInteractiveController
 from subiquitycore.async_helpers import run_bg_task
 from subiquitycore.context import with_context
-from subiquitycore.utils import arun_command, orig_environ
+from subiquitycore.utils import arun_command
 
 
 @attr.s(auto_attribs=True)
@@ -79,15 +78,6 @@ async def run(self, context):
         env = self.env()
         for i, cmd in enumerate(tuple(self.builtin_cmds) + tuple(self.cmds)):
             desc = cmd.desc()
-
-            # If the path to the command isn't found on the snap we should
-            # drop the snap specific environment variables.
-            command = shlex.split(desc)[0]
-            path = shutil.which(command)
-            if path is not None:
-                if not path.startswith("/snap"):
-                    env = orig_environ(env)
-
             with context.child("command_{}".format(i), desc):
                 args = cmd.as_args_list()
                 if self.syslog_id:

subiquity/server/controllers/tests/test_filesystem.py

@@ -91,6 +91,8 @@ def setUp(self):
         self.app = make_app()
         self.app.opts.bootloader = "UEFI"
         self.app.command_runner = mock.AsyncMock()
+        self.app.report_start_event = mock.Mock()
+        self.app.report_finish_event = mock.Mock()
         self.app.prober = mock.Mock()
         self.app.prober.get_storage = mock.AsyncMock()
         self.app.block_log_dir = "/inexistent"
@@ -1205,6 +1207,8 @@ def setUp(self):
         self.app = make_app()
         self.app.command_runner = mock.AsyncMock()
         self.app.opts.bootloader = "UEFI"
+        self.app.report_start_event = mock.Mock()
+        self.app.report_finish_event = mock.Mock()
         self.app.prober = mock.Mock()
         self.app.prober.get_storage = mock.AsyncMock()
         self.app.snapdapi = snapdapi.make_api_client(AsyncSnapd(get_fake_connection()))

subiquity/server/controllers/tests/test_install.py

@@ -34,6 +34,8 @@ def setUp(self):
         self.controller = InstallController(make_app())
         self.controller.write_config = unittest.mock.Mock()
         self.controller.app.note_file_for_apport = Mock()
+        self.controller.app.report_start_event = Mock()
+        self.controller.app.report_finish_event = Mock()
 
         self.controller.model.target = "/target"
 
@@ -197,6 +199,8 @@ def test_generic_config(self):
 class TestInstallController(unittest.IsolatedAsyncioTestCase):
     def setUp(self):
         self.controller = InstallController(make_app())
+        self.controller.app.report_start_event = Mock()
+        self.controller.app.report_finish_event = Mock()
         self.controller.model.target = tempfile.mkdtemp()
         os.makedirs(os.path.join(self.controller.model.target, "etc/grub.d"))
         self.addCleanup(shutil.rmtree, self.controller.model.target)

subiquity/server/controllers/tests/test_refresh.py

@@ -26,6 +26,8 @@
 class TestRefreshController(SubiTestCase):
     def setUp(self):
         self.app = make_app()
+        self.app.report_start_event = mock.Mock()
+        self.app.report_finish_event = mock.Mock()
         self.app.note_data_for_apport = mock.Mock()
         self.app.prober = mock.Mock()
         self.app.snapdapi = snapdapi.make_api_client(AsyncSnapd(get_fake_connection()))

subiquity/server/controllers/tests/test_snaplist.py

@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-from unittest.mock import AsyncMock
+from unittest.mock import AsyncMock, Mock
 
 import requests
 
@@ -31,6 +31,8 @@ def setUp(self):
         self.model = SnapListModel()
         self.app = make_app()
         self.app.snapd = AsyncMock()
+        self.app.report_start_event = Mock()
+        self.app.report_finish_event = Mock()
 
         self.loader = SnapdSnapInfoLoader(
             self.model, self.app.snapd, "server", self.app.context

subiquitycore/tests/mocks.py

@@ -43,9 +43,4 @@ def make_app(model=None):
     app.opts = mock.Mock()
     app.opts.dry_run = True
     app.scale_factor = 1000
-    app.echo_syslog_id = None
-    app.log_syslog_id = None
-    app.report_start_event = mock.Mock()
-    app.report_finish_event = mock.Mock()
-
     return app

subiquitycore/utils.py

@@ -19,7 +19,7 @@
 import os
 import random
 import subprocess
-from typing import Any, Dict, List, Optional, Sequence
+from typing import Any, Dict, List, Sequence
 
 log = logging.getLogger("subiquitycore.utils")
 
@@ -35,18 +35,15 @@ def _clean_env(env, *, locale=True):
     return env
 
 
-def orig_environ(env: Optional[Dict[str, str]]) -> Dict[str, str]:
+def orig_environ(env):
     """Generate an environment dict that is suitable for use for running
     programs that live outside the snap."""
-
     if env is None:
-        env: Dict[str, str] = os.environ
-
-    ret: Dict[str, str] = env.copy()
-
+        env = os.environ
+    ret = env.copy()
     for key, val in env.items():
         if key.endswith("_ORIG"):
-            key_to_restore: str = key[: -len("_ORIG")]
+            key_to_restore = key[: -len("_ORIG")]
             if val:
                 ret[key_to_restore] = val
             else: