Merge pull request 'clan-vm-manager: Basic pytest framework established' (#1026) from Qubasa-main into main

pkgs/clan-cli/tests/conftest.py

@@ -5,11 +5,13 @@ from pathlib import Path
 
 import pytest
 
+sys.path.append(os.path.join(os.path.dirname(__file__), "helpers"))
+sys.path.append(str(Path(__file__).parent.parent))  # Also add clan_cli to PYTHONPATH
+
+
 from clan_cli.custom_logger import setup_logging
 from clan_cli.nix import nix_shell
 
-sys.path.append(os.path.join(os.path.dirname(__file__), "helpers"))
-
 pytest_plugins = [
     "temporary_dir",
     "root",

pkgs/clan-cli/tests/test_vms_cli.py

@@ -12,8 +12,8 @@ from fixtures_flakes import FlakeForTest, generate_flake
 from root import CLAN_CORE
 
 from clan_cli.dirs import vm_state_dir
-from qemu.qga import QgaSession
-from qemu.qmp import QEMUMonitorProtocol
+from clan_cli.qemu.qga import QgaSession
+from clan_cli.qemu.qmp import QEMUMonitorProtocol
 
 if TYPE_CHECKING:
     from age_keys import KeyPair