From 5bd2345bc18ffca811c0a804e3089b994d0f6f59 Mon Sep 17 00:00:00 2001 From: Qubasa Date: Wed, 25 Oct 2023 11:30:38 +0200 Subject: [PATCH] Commit only for debugging Container --- pkgs/clan-cli/clan_cli/vms/inspect.py | 3 ++- pkgs/clan-cli/default.nix | 1 + pkgs/clan-cli/pyproject.toml | 2 +- pkgs/clan-cli/tests/test_vms_api.py | 7 ++++++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/vms/inspect.py b/pkgs/clan-cli/clan_cli/vms/inspect.py index e74382d3b..d50e6c6cf 100644 --- a/pkgs/clan-cli/clan_cli/vms/inspect.py +++ b/pkgs/clan-cli/clan_cli/vms/inspect.py @@ -8,7 +8,7 @@ from pydantic import AnyUrl, BaseModel from ..async_cmd import run from ..dirs import specific_flake_dir from ..nix import nix_config, nix_eval - +from ..debug import repro_env_break class VmConfig(BaseModel): flake_url: AnyUrl | Path @@ -22,6 +22,7 @@ class VmConfig(BaseModel): async def inspect_vm(flake_url: AnyUrl | Path, flake_attr: str) -> VmConfig: config = nix_config() system = config["system"] + cmd = nix_eval( [ f'{flake_url}#clanInternals.machines."{system}"."{flake_attr}".config.system.clan.vm.config' diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix index 22031e155..8fcca79de 100644 --- a/pkgs/clan-cli/default.nix +++ b/pkgs/clan-cli/default.nix @@ -34,6 +34,7 @@ , gnupg , e2fsprogs , mypy +, cntr }: let diff --git a/pkgs/clan-cli/pyproject.toml b/pkgs/clan-cli/pyproject.toml index d1e60f618..1781058e3 100644 --- a/pkgs/clan-cli/pyproject.toml +++ b/pkgs/clan-cli/pyproject.toml @@ -21,7 +21,7 @@ testpaths = "tests" faulthandler_timeout = 60 log_level = "DEBUG" log_format = "%(levelname)s: %(message)s" -addopts = "--cov . --cov-report term --cov-report html:.reports/html --no-cov-on-fail --durations 5 --color=yes --maxfail=1 --new-first -nauto" # Add --pdb for debugging +addopts = "--cov . --cov-report term --cov-report html:.reports/html --no-cov-on-fail --durations 5 --color=yes --maxfail=1 --new-first -n0 -s" # Add --pdb for debugging norecursedirs = "tests/helpers" markers = [ "impure" ] diff --git a/pkgs/clan-cli/tests/test_vms_api.py b/pkgs/clan-cli/tests/test_vms_api.py index daa6456d2..13a022278 100644 --- a/pkgs/clan-cli/tests/test_vms_api.py +++ b/pkgs/clan-cli/tests/test_vms_api.py @@ -1,7 +1,9 @@ import pytest from api import TestClient from fixtures_flakes import FlakeForTest - +from clan_cli.debug import repro_env_break +import sys +import time @pytest.mark.impure def test_inspect(api: TestClient, test_flake_with_core: FlakeForTest) -> None: @@ -10,6 +12,9 @@ def test_inspect(api: TestClient, test_flake_with_core: FlakeForTest) -> None: json=dict(flake_url=str(test_flake_with_core.path), flake_attr="vm1"), ) + print(f"SLEEPING FOR EVER: {99999}", file=sys.stderr) + time.sleep(99999) + assert response.status_code == 200, f"Failed to inspect vm: {response.text}" config = response.json()["config"] assert config.get("flake_attr") == "vm1"