mark created symlink as dangling fs obj; postpone dangling fs obj on …

…remote cleanup
morganstanley · Feb 17, 2025 · a123cde · a123cde
1 parent 9efdba7
commit a123cde
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/testplan/common/remote/remote_resource.py b/testplan/common/remote/remote_resource.py
@@ -470,15 +470,15 @@ def _prepare_workspace(self, exist_on_remote: bool) -> None:
                 label="imitate local workspace path on remote - ln",
                 check=False,  # just best effort
             ):
-                self._dangling_remote_fs_obj = rmt_non_existing
-                if rmt_non_existing:
-                    self.logger.info(
-                        "%s: on %s, %s and its possible descendants are "
-                        "created to imitate local workspace path",
-                        self,
-                        self.ssh_cfg["host"],
-                        rmt_non_existing,
-                    )
+                # NOTE: we shall always remove created symlink
+                self._dangling_remote_fs_obj = rmt_non_existing or self._workspace_paths.local
+                self.logger.info(
+                    "%s: on %s, %s and its possible descendants are "
+                    "created to imitate local workspace path",
+                    self,
+                    self.ssh_cfg["host"],
+                    self._dangling_remote_fs_obj,
+                )
 
     def _push_files(self) -> None:
         """Push files and directories to remote host."""
@@ -660,10 +660,11 @@ def _clean_remote(self) -> None:
             )
 
             if self._dangling_remote_fs_obj:
-                self._execute_cmd_remote(
-                    cmd=rm_cmd(self._dangling_remote_fs_obj),
-                    label=f"Remove imitated workspace outside runpath",
-                )
+                # TODO: uncomment later
+                # self._execute_cmd_remote(
+                #     cmd=rm_cmd(self._dangling_remote_fs_obj),
+                #     label=f"Remove imitated workspace outside runpath",
+                # )
                 self._dangling_remote_fs_obj = None
 
         if self.cfg.delete_pushed: