fix test bundling bug

backend/scanner.py

@@ -7,7 +7,7 @@ try:
 except ModuleNotFoundError:
     smbclient = None
 
-from db import DEVICE_DUT, DEVICE_REF, mark_tests_completed, mark_overdue_as_rerun
+from db import DEVICE_DUT, DEVICE_REF, mark_tests_completed, mark_overdue_as_rerun, reset_completed_to_pending
 
 _SMB_SESSIONS = set()
 _SCAN_STATE_LOCK = threading.Lock()
@@ -148,19 +148,28 @@ def resolve_runtime_path(path_value):
     if raw_path.startswith("\\\\") or raw_path.startswith("//"):
         return raw_path
 
-    # Map host paths (Windows or Linux) to the container mount point when running in a container.
-    if os.name != "nt":
-        mount_root = os.getenv("HOST_MOUNT_ROOT", "/host").strip() or "/host"
-        host_root = os.getenv("HOST_BROWSE_ROOT", "").strip()
+    mount_root = (os.getenv("HOST_MOUNT_ROOT", "/host") or "/host").strip() or "/host"
+    host_root = (os.getenv("HOST_BROWSE_ROOT", "") or "").strip()
+    raw_norm = raw_path.replace("\\", "/")
 
-        raw_norm = raw_path.replace("\\", "/")
-        if host_root:
-            host_norm = host_root.replace("\\", "/").rstrip("/")
-            if raw_norm.lower() == host_norm.lower() or raw_norm.lower().startswith(host_norm.lower() + "/"):
-                relative = raw_norm[len(host_norm):].lstrip("/")
-                if relative:
-                    return os.path.join(mount_root, *relative.split("/"))
-                return mount_root
+    # In container/Linux runtime, translate host-browse paths into mounted container paths.
+    if os.name != "nt" and host_root:
+        host_norm = host_root.replace("\\", "/").rstrip("/")
+        if raw_norm.lower() == host_norm.lower() or raw_norm.lower().startswith(host_norm.lower() + "/"):
+            relative = raw_norm[len(host_norm):].lstrip("/")
+            if relative:
+                return os.path.join(mount_root, *relative.split("/"))
+            return mount_root
+
+    # In native Windows runtime, accept /host/... paths coming from container-oriented settings
+    # and map them back to HOST_BROWSE_ROOT (for example C:/Users/... ).
+    if os.name == "nt" and host_root:
+        mount_norm = mount_root.replace("\\", "/").rstrip("/")
+        if mount_norm and (raw_norm.lower() == mount_norm.lower() or raw_norm.lower().startswith(mount_norm.lower() + "/")):
+            relative = raw_norm[len(mount_norm):].lstrip("/")
+            if relative:
+                return os.path.join(host_root, *relative.split("/"))
+            return host_root
 
     return raw_path
 
@@ -172,25 +181,36 @@ def _normalize_input_path(path_value):
     path = resolve_runtime_path(path_value)
     path = str(path).strip()
 
-    # Normalize forward slashes to backslashes first
-    path = path.replace("/", "\\")
+    # Accept //server/share style and normalize to UNC for smbclient.
+    if path.startswith("//"):
+        path = path.lstrip("/").replace("/", "\\")
+        return "\\\\" + path
 
-    # Accept \\server\share style UNC paths and ensure proper escaping
+    # Accept \\server\share style UNC paths and ensure proper escaping.
     if path.startswith("\\\\"):
         # Clean up any doubled backslashes from replacement
         while "\\\\\\" in path:
             path = path.replace("\\\\\\", "\\\\")
         return path
 
-    # Accept //server/share style and normalize to UNC for smbclient.
-    if path.startswith("//"):
-        path = path.lstrip("/").replace("/", "\\")
-        return "\\\\" + path
-
     # Accept /<ipv4>/<share>/... and normalize to UNC for Linux-hosted inputs.
-    if re.match(r"^\\?\d{1,3}(?:\\\.\d{1,3}){3}\\[^\\]+", path):
-        if path.startswith("\\"):
-            path = path.lstrip("\\")
+    if re.match(r"^/\d{1,3}(?:\.\d{1,3}){3}/[^/]+", path):
+        return "\\\\" + path.lstrip("/").replace("/", "\\")
+
+    # Preserve existing slash-based local paths such as /host/... that are valid
+    # in the current runtime, so scanner matches watcher behavior.
+    if os.path.exists(path):
+        return path
+
+    # Preserve slash-based local mount paths even if they are temporarily missing.
+    if path.startswith("/"):
+        return path
+
+    # Normalize local paths after UNC checks.
+    path = path.replace("/", "\\")
+
+    # Accept \<ipv4>\<share>\... and normalize to UNC.
+    if re.match(r"^\d{1,3}(?:\.\d{1,3}){3}\\[^\\]+", path):
         return "\\\\" + path
 
     return path
@@ -316,9 +336,13 @@ def scan_results(results_dir_dut, results_dir_ref, smb_credentials=None):
         for test_id, device in completed_batch:
             print(f"  - {test_id} on {device}")
     
+    reset_count = reset_completed_to_pending()
+    if reset_count:
+        print(f"[scanner] reset {reset_count} previously-completed test(s) to pending before resync")
+
     updated_count = mark_tests_completed(completed_batch)
     print(f"[scanner] {updated_count} test(s) actually updated in database")
-    
+
     newly_rerun = mark_overdue_as_rerun()
     if newly_rerun:
         print(f"[scanner] {newly_rerun} test(s) marked as rerun-required (scheduled but not completed)")