Set env on the Hap instantiation

Author: bmwant

hapless/hap.py

@@ -68,7 +68,7 @@ def set_return_code(self, rc: int):
         with open(self._rc_file, "w") as f:
             f.write(f"{rc}")
 
-    def _set_raw_name(self, raw_name: Optional[str]):
+    def _set_raw_name(self, raw_name: Optional[str]) -> None:
         """
         Set name for the first time on hap creation.
         """
@@ -110,7 +110,7 @@ def _set_pid(self, pid: int):
         if not psutil.pid_exists(pid):
             raise RuntimeError(f"Process with pid {pid} is gone")
 
-    def _set_logfiles(self, redirect_stderr: bool):
+    def _set_logfiles(self, redirect_stderr: bool) -> None:
         if redirect_stderr:
             logger.debug("Process stderr will be redirected to stdout file")
         if not self._stdout_path.exists() and not redirect_stderr:
@@ -127,12 +127,16 @@ def _get_proc_env(self) -> Dict[str, str]:
                 logger.error(f"Cannot get environment: {e}")
         return environ
 
-    def _set_env(self, env: Optional[Dict[str, str]] = None):
-        if env is None:
-            env = dict(os.environ)
+    def _set_env(self, env: Optional[Dict[str, str]] = None) -> None:
+        """
+        Set environment variables for the first time on hap creation.
+        """
+        if self.env is None:
+            if env is None:
+                env = dict(os.environ)
 
-        with open(self._env_file, "w") as env_file:
-            env_file.write(json.dumps(env))
+            with open(self._env_file, "w") as env_file:
+                env_file.write(json.dumps(env))
 
     def bind(self, pid: int):
         """
@@ -247,10 +251,7 @@ def pid(self) -> Optional[int]:
     @property
     @allow_missing
     def env(self) -> Optional[Dict[str, str]]:
-        proc = self.proc
-        environ = {}
-        if proc is not None:
-            environ = proc.environ()
+        environ = self._get_proc_env()
 
         if environ:
             return environ

tests/test_hap_env.py

@@ -29,6 +29,25 @@ def test_empty_env_provided_on_creation(tmp_path):
     assert hap.env == {}
 
 
+def test_correct_env_is_picked_up_on_instance_creation(tmp_path):
+    with patch.dict(os.environ, {"TESTING": "true"}, clear=True):
+        hap = Hap(tmp_path, cmd="true")
+        assert hap.pid is None
+        assert hap.proc is None
+        assert hap.rc is None
+        assert not hap.active
+        assert hap.env == {"TESTING": "true"}
+
+    # Check reread picks up previously saved state
+    with patch.dict(os.environ, {"TESTING": "false"}, clear=True):
+        hap = Hap(tmp_path)
+        assert hap.pid is None
+        assert hap.proc is None
+        assert hap.rc is None
+        assert not hap.active
+        assert hap.env == {"TESTING": "true"}
+
+
 @patch.dict(os.environ, {"ENV_KEY": "TEST_VALUE"}, clear=True)
 def test_env_defaults_to_current_env_if_none(tmp_path):
     hap = Hap(tmp_path, cmd="false")
@@ -66,20 +85,6 @@ def test_proc_env_is_used_as_primaty_source(hap: Hap, write_env_factory):
         assert hap.env == {"ENV_KEY": "ENV_VALUE_FROM_PROC"}
 
 
-# def test_correct_env_is_picked_up():
-#     hapless = Hapless()
-# hap = hapless.create_hap(
-#     cmd="python -c 'import os; print(os.getenv(\"HAPLESS_TEST_ENV_VAR\"))'",
-#     name="hap-env-test",
-#     env={"HAPLESS_TEST_ENV_VAR": "hapless_env_value"},
-# )
-
-# hapless.run_hap(hap, blocking=True)
-# assert hap.rc == 0
-# assert hap.stdout_path.exists()
-# assert hap.stdout_path.read_text().strip() == "hapless_env_value"
-
-
 def test_env_preserved_on_restart(hapless: Hapless):
     env = {"TESTING": "true"}
     # NOTE: providing absolute path as environment got erased for this test