From 68d2b7fba80e631d3db9b02c042ed511db91d8d7 Mon Sep 17 00:00:00 2001
From: Zhenyu Yao <111329301+zhenyu-ms@users.noreply.github.com>
Date: Wed, 19 Feb 2025 17:57:21 +0800
Subject: [PATCH] Fix/a corner case of remote workspace detection (#1183)

---
 testplan/common/remote/remote_resource.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testplan/common/remote/remote_resource.py b/testplan/common/remote/remote_resource.py
index f1eb5f200..c08a73839 100644
--- a/testplan/common/remote/remote_resource.py
+++ b/testplan/common/remote/remote_resource.py
@@ -276,6 +276,10 @@ def _create_remote_dirs(self) -> None:
                 label="remove remote plan runpath",
             )
 
+            # NOTE: corner case: runpath under workspace
+            # NOTE: should check existence before any mkdir call
+            exist_on_remote = self._check_workspace()
+
             self._execute_cmd_remote(
                 cmd=mkdir_cmd(self._remote_plan_runpath),
                 label="create remote plan runpath",
@@ -290,7 +294,6 @@ def _create_remote_dirs(self) -> None:
             # TODO: testplan_lib will resolved to site-packages under venv,
             # TODO: while rpyc_classic.py under bin isn't included
 
-            exist_on_remote = self._check_workspace()
             self._prepare_workspace(exist_on_remote)
 
             # NOTE: if workspace under testplan_lib (testplan installed in