test: apply perfected test logic from backup branch

Author: 1minds3t

src/omnipkg/core.py

@@ -127,7 +127,6 @@ def _get_dynamic_omnipkg_version():
 
     if not HAS_TOMLLIB:
         # Can't read TOML, try metadata
-        import requests as http_requests
         try:
             return importlib.metadata.version("omnipkg")
         except (importlib.metadata.PackageNotFoundError, Exception):
@@ -2315,13 +2314,6 @@ def get_actual_current_site_packages(self) -> Path:
         This is more reliable than calculating it from sys.prefix when hotswapping is involved.
         Cross-platform compatible with special handling for Windows.
         """
-        rebuild_cmd = [
-            str(final_config["python_executable"]),
-            "-m",
-            "omnipkg.cli",
-            "reset",
-            "-y",
-        ]
         is_windows = platform.system() == "Windows"
 
         try:
@@ -4163,9 +4155,6 @@ def _heal_corrupt_metadata(self, install_path: Path, expected_package_name: str)
     def create_bubble_for_package(
         self, package_name: str, version: str, python_context_version: str
     ) -> bool:
-        # --- ADD THIS LINE HERE ---
-        import site as site_module
-
         """
         Creates a complete, isolated bubble for a package, including all its dependencies.
         For editable/dev installs, copies directly from the source directory.

src/tests/test_loader_stress_test.py

@@ -18,7 +18,7 @@
 # Import the daemon client
 try:
     from omnipkg.loader import omnipkgLoader
-    from omnipkg.isolation.worker_daemon import DaemonClient, WorkerPoolDaemon
+    from omnipkg.isolation.worker_daemon import DaemonClient
 except ImportError:
     sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")))
 """
@@ -93,6 +93,53 @@ def print_chaos_header():
 # have been removed in favor of the imported versions from omnipkg.isolation!
 
 
+
+# ═══════════════════════════════════════════════════════════
+# 🔧 CANONICAL DAEMON START HELPER
+# Never call WorkerPoolDaemon().start(daemonize=True) from inside a running
+# process — that forks and then sys.exit(0)s the parent, killing the test
+# runner. Always use this instead: subprocess + poll.
+# ═══════════════════════════════════════════════════════════
+def ensure_daemon_running(warmup_specs=None, timeout: float = 30.0) -> bool:
+    """
+    Start the daemon if it isn't already running, then poll until it answers.
+    Safe to call from any context — uses subprocess so the current process
+    is never forked/killed.  warmup_specs is accepted but ignored (the daemon
+    picks up its own config on start).
+    """
+    try:
+        from omnipkg.isolation.worker_daemon import DaemonClient
+        client = DaemonClient()
+        if client.status().get("success"):
+            return True
+
+        safe_print("   ⚙️  Starting daemon...")
+        proc = subprocess.Popen(
+            ["8pkg", "daemon", "start"],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        )
+        deadline = time.monotonic() + timeout
+        while time.monotonic() < deadline:
+            time.sleep(0.5)
+            rc = proc.poll()
+            if rc is not None and rc != 0:
+                safe_print(f"   ❌ Daemon launcher exited rc={rc}")
+                return False
+            if client.status().get("success"):
+                safe_print("   ✅ Daemon up")
+                return True
+        proc.kill()
+        safe_print(f"   ❌ Daemon never came up after {timeout:.0f}s")
+        return False
+    except ImportError:
+        safe_print("   ❌ Daemon modules missing.")
+        return False
+    except Exception as e:
+        safe_print(f"   ❌ ensure_daemon_running failed: {e}")
+        return False
+
+
 def chaos_test_1_version_tornado():
     """🌪️ TEST 1: VERSION TORNADO - Compare Legacy vs Daemon WITH WARMUP"""
     safe_print("╔══════════════════════════════════════════════════════════════╗")
@@ -433,14 +480,13 @@ def go_deeper_legacy(level):
         from omnipkg.isolation.worker_daemon import (
             DaemonClient,
             DaemonProxy,
-            WorkerPoolDaemon,
         )
 
         client = DaemonClient()
         if not client.status().get("success"):
             safe_print("   ⚙️  Starting Daemon...")
-            WorkerPoolDaemon().start(daemonize=True)
-            time.sleep(2)
+            if not ensure_daemon_running():
+                return False
     except ImportError:
         safe_print("   ❌ Daemon modules missing.")
         return False
@@ -545,7 +591,7 @@ def chaos_test_3_framework_battle_royale():
 
     # 1. Connect to Daemon and measure startup
     try:
-        from omnipkg.isolation.worker_daemon import DaemonClient, WorkerPoolDaemon
+        from omnipkg.isolation.worker_daemon import DaemonClient
         from concurrent.futures import as_completed
         import numpy as np
 
@@ -562,8 +608,8 @@ def chaos_test_3_framework_battle_royale():
                 "numpy==1.24.3",
                 "numpy==2.3.5",
             ]
-            WorkerPoolDaemon(warmup_specs=vip_specs).start(daemonize=True)
-            time.sleep(3)
+            if not ensure_daemon_running(warmup_specs=vip_specs):
+                return False
             daemon_start = time.perf_counter()
             client = DaemonClient()
             daemon_connect_time = (time.perf_counter() - daemon_start) * 1000
@@ -656,7 +702,7 @@ def execute_fighter(name, spec, code):
 
     # 1. Connect to Daemon
     try:
-        from omnipkg.isolation.worker_daemon import DaemonClient, WorkerPoolDaemon
+        from omnipkg.isolation.worker_daemon import DaemonClient
 
         client = DaemonClient()
         if not client.status().get("success"):
@@ -668,7 +714,8 @@ def execute_fighter(name, spec, code):
                 "numpy==1.24.3",
                 "numpy==2.3.5",
             ]
-            WorkerPoolDaemon(warmup_specs=vip_specs).start(daemonize=True)
+            if not ensure_daemon_running(warmup_specs=vip_specs):
+                return False
             time.sleep(3)  # Give TF time to boot (it's heavy)
 
     except ImportError:
@@ -894,7 +941,7 @@ def chaos_test_5_race_condition_roulette():
     safe_print("╚══════════════════════════════════════════════════════════════╝\n")
 
     import numpy as np
-    from omnipkg.isolation.worker_daemon import DaemonClient, WorkerPoolDaemon
+    from omnipkg.isolation.worker_daemon import DaemonClient
 
     results = {}
     versions = ["numpy==1.24.3", "numpy==1.26.4", "numpy==2.3.5"]
@@ -910,9 +957,8 @@ def chaos_test_5_race_condition_roulette():
     client = DaemonClient()
     if not client.status().get("success"):
         safe_print(" ❌ Daemon not running! Starting...")
-        WorkerPoolDaemon().start(daemonize=True)
-        time.sleep(2)
- 
+        if not ensure_daemon_running():
+            return False
     warmup_data = np.random.rand(500, 500).astype(np.float64)  # same size as benchmark
     for spec in versions:
         t_start = time.perf_counter()
@@ -1374,12 +1420,8 @@ def chaos_test_11_tensorflow_resurrection():
             stderr=subprocess.DEVNULL,
         )
         time.sleep(1)
-        subprocess.run(
-            ["8pkg", "daemon", "start"],
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL,
-        )
-
+        if not ensure_daemon_running():
+            return False
         client = DaemonClient()
         for unused in range(10):
             time.sleep(0.5)
@@ -1442,12 +1484,8 @@ def chaos_test_11_tensorflow_resurrection():
         ["8pkg", "daemon", "stop"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
     )
     time.sleep(1)
-    subprocess.run(
-        ["8pkg", "daemon", "start"],
-        stdout=subprocess.DEVNULL,
-        stderr=subprocess.DEVNULL,
-    )
-    time.sleep(2)
+    if not ensure_daemon_running():
+        return False
     client = DaemonClient()  # Reconnect
 
     safe_print("   🐢 STEP 1: Sequential Spawn (One by one)...")
@@ -1475,12 +1513,8 @@ def chaos_test_11_tensorflow_resurrection():
         ["8pkg", "daemon", "stop"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
     )
     time.sleep(1)
-    subprocess.run(
-        ["8pkg", "daemon", "start"],
-        stdout=subprocess.DEVNULL,
-        stderr=subprocess.DEVNULL,
-    )
-    time.sleep(2)
+    if not ensure_daemon_running():
+        return False
     client = DaemonClient()  # Reconnect
 
     safe_print("   🚀 STEP 2: Concurrent Spawn (All at once)...")
@@ -1609,7 +1643,6 @@ def chaos_test_12_jax_vs_torch_mortal_kombat():
         from omnipkg.isolation.worker_daemon import (
             DaemonClient,
             DaemonProxy,
-            WorkerPoolDaemon,
         )
 
         client = DaemonClient()
@@ -1618,7 +1651,8 @@ def chaos_test_12_jax_vs_torch_mortal_kombat():
         status = client.status()
         if not status.get("success"):
             safe_print("   ⚠️  Daemon not found. Summoning Daemon...")
-            WorkerPoolDaemon().start(daemonize=True)
+            if not ensure_daemon_running():
+                return False
             time.sleep(1)  # Wait for socket
 
     except ImportError:
@@ -1784,12 +1818,9 @@ def chaos_test_13_pytorch_lightning_storm():
         status = client.status()
         if not status.get("success"):
             safe_print("   ⚙️  Starting daemon...")
-            from omnipkg.isolation.worker_daemon import WorkerPoolDaemon
-
-            daemon = WorkerPoolDaemon()
-            daemon.start(daemonize=True)
-            time.sleep(1)
 
+            if not ensure_daemon_running():
+                return False
     except ImportError:
         safe_print("   ❌ Daemon not available, falling back to legacy workers")
         return chaos_test_13_pytorch_lightning_storm()
@@ -2022,13 +2053,13 @@ def chaos_test_14_circular_dependency_hell():
     safe_print("      🔥 Connecting to worker daemon...")
 
     try:
-        from omnipkg.isolation.worker_daemon import DaemonClient, DaemonProxy, WorkerPoolDaemon
+        from omnipkg.isolation.worker_daemon import DaemonClient, DaemonProxy
 
         client = DaemonClient()
         if not client.status().get("success"):
             safe_print("      ⚙️  Daemon not found, starting it...")
-            WorkerPoolDaemon().start(daemonize=True)
-            time.sleep(2)
+            if not ensure_daemon_running():
+                return False
     except ImportError:
         safe_print("      ❌ FATAL: Daemon components not found. Skipping test.")
         return
@@ -2322,16 +2353,14 @@ def chaos_test_15_isolation_strategy_benchmark():
         from omnipkg.isolation.worker_daemon import (
             DaemonClient,
             DaemonProxy,
-            WorkerPoolDaemon,
         )
 
         # Ensure daemon is up
         client = DaemonClient()
         if not client.status().get("success"):
             safe_print("   ⚙️  Starting Daemon...")
-            WorkerPoolDaemon().start(daemonize=True)
-            time.sleep(2)
-
+            if not ensure_daemon_running():
+                return False
         start = time.perf_counter()
         success_count = 0
 
@@ -2578,7 +2607,7 @@ def chaos_test_17_triple_python_multiverse():
 
     # Initialize daemon
     try:
-        from omnipkg.isolation.worker_daemon import DaemonClient, WorkerPoolDaemon
+        from omnipkg.isolation.worker_daemon import DaemonClient
         import numpy as np
 
         client = DaemonClient()
@@ -3161,7 +3190,6 @@ def chaos_test_18_worker_pool_drag_race():
         from omnipkg.isolation.worker_daemon import (
             DaemonClient,
             DaemonProxy,
-            WorkerPoolDaemon,
         )
 
         client = DaemonClient()
@@ -3174,7 +3202,8 @@ def chaos_test_18_worker_pool_drag_race():
                 "numpy==1.24.3",
                 "numpy==1.26.4",
             ]
-            WorkerPoolDaemon(warmup_specs=vip_specs).start(daemonize=True)
+            if not ensure_daemon_running(warmup_specs=vip_specs):
+                return False
             time.sleep(2)  # Give it a moment to boot the fleet
     except ImportError:
         return False
@@ -3381,10 +3410,8 @@ def chaos_test_20_gpu_resident_pipeline():
         client = DaemonClient()
         if not client.status().get("success"):
             safe_print("   ⚙️  Starting daemon...")
-            subprocess.run(
-                [sys.executable, "-m", "omnipkg.isolation.worker_daemon", "start"]
-            )
-            time.sleep(2)
+            if not ensure_daemon_running():
+                return False
     except ImportError as e:
         safe_print(f"   ❌ Failed to import daemon client: {e}")
         return False