Deleted everything webui

pkgs/clan-cli/tests/api.py

@@ -1,14 +0,0 @@
-import logging
-
-import pytest
-from fastapi.testclient import TestClient
-
-from clan_cli.webui.app import app
-
-
-# TODO: Why stateful
-@pytest.fixture(scope="session")
-def api() -> TestClient:
-    # logging.getLogger("httpx").setLevel(level=logging.WARNING)
-    logging.getLogger("asyncio").setLevel(logging.INFO)
-    return TestClient(app, raise_server_exceptions=False)

pkgs/clan-cli/tests/conftest.py

@@ -10,7 +10,6 @@ from clan_cli.nix import nix_shell
 sys.path.append(os.path.join(os.path.dirname(__file__), "helpers"))
 
 pytest_plugins = [
-    "api",
     "temporary_dir",
     "root",
     "age_keys",

pkgs/clan-cli/tests/fixtures_flakes.py

@@ -9,8 +9,6 @@ from pathlib import Path
 from typing import NamedTuple
 
 import pytest
-from pydantic import AnyUrl
-from pydantic.tools import parse_obj_as
 from root import CLAN_CORE
 
 from clan_cli.dirs import nixpkgs_source
@@ -136,16 +134,6 @@ def test_local_democlan(
     yield FlakeForTest(democlan_p)
 
 
-@pytest.fixture
-def test_democlan_url(
-    monkeypatch: pytest.MonkeyPatch, temporary_home: Path
-) -> Iterator[AnyUrl]:
-    yield parse_obj_as(
-        AnyUrl,
-        "https://git.clan.lol/clan/democlan/archive/main.tar.gz",
-    )
-
-
 @pytest.fixture
 def test_flake_with_core_and_pass(
     monkeypatch: pytest.MonkeyPatch, temporary_home: Path

pkgs/clan-cli/tests/test_clan_modules.py

@@ -1,16 +0,0 @@
-import pytest
-from api import TestClient
-from fixtures_flakes import FlakeForTest
-
-
-@pytest.mark.with_core
-def test_configure_machine(api: TestClient, test_flake_with_core: FlakeForTest) -> None:
-    # retrieve the list of available clanModules
-    response = api.get(f"/api/clan_modules?flake_dir={test_flake_with_core.path}")
-    assert response.status_code == 200, response.text
-    response_json = response.json()
-    assert isinstance(response_json, dict)
-    assert "clan_modules" in response_json
-    assert len(response_json["clan_modules"]) > 0
-    # ensure all entries are a string
-    assert all(isinstance(x, str) for x in response_json["clan_modules"])

pkgs/clan-cli/tests/test_create_flake.py

@@ -3,35 +3,14 @@ import subprocess
 from pathlib import Path
 
 import pytest
-from api import TestClient
 from cli import Cli
 
-from clan_cli.flakes.create import DEFAULT_URL
-
 
 @pytest.fixture
 def cli() -> Cli:
     return Cli()
 
 
-@pytest.mark.impure
-def test_create_flake_api(
-    monkeypatch: pytest.MonkeyPatch, api: TestClient, temporary_home: Path
-) -> None:
-    flake_dir = temporary_home / "test-flake"
-    response = api.post(
-        f"/api/flake/create?flake_dir={flake_dir}",
-        json=dict(
-            flake_dir=str(flake_dir),
-            url=str(DEFAULT_URL),
-        ),
-    )
-
-    assert response.status_code == 201, f"Failed to create flake {response.text}"
-    assert (flake_dir / ".clan-flake").exists()
-    assert (flake_dir / "flake.nix").exists()
-
-
 @pytest.mark.impure
 def test_create_flake(
     monkeypatch: pytest.MonkeyPatch,

pkgs/clan-cli/tests/test_flake_api.py

@@ -1,54 +0,0 @@
-import json
-import logging
-
-import pytest
-from api import TestClient
-from fixtures_flakes import FlakeForTest
-
-log = logging.getLogger(__name__)
-
-
-@pytest.mark.impure
-def test_inspect_ok(api: TestClient, test_flake_with_core: FlakeForTest) -> None:
-    params = {"url": str(test_flake_with_core.path)}
-    response = api.get(
-        "/api/flake/attrs",
-        params=params,
-    )
-    assert response.status_code == 200, "Failed to inspect vm"
-    data = response.json()
-    print("Data: ", data)
-    assert data.get("flake_attrs") == ["vm1", "vm2"]
-
-
-@pytest.mark.impure
-def test_inspect_err(api: TestClient) -> None:
-    params = {"url": "flake-parts"}
-    response = api.get(
-        "/api/flake/attrs",
-        params=params,
-    )
-    assert response.status_code != 200, "Succeed to inspect vm but expected to fail"
-    data = response.json()
-    print("Data: ", data)
-    assert data.get("detail")
-
-
-@pytest.mark.impure
-def test_inspect_flake(api: TestClient, test_flake_with_core: FlakeForTest) -> None:
-    params = {"url": str(test_flake_with_core.path)}
-    response = api.get(
-        "/api/flake/inspect",
-        params=params,
-    )
-    assert response.status_code == 200, "Failed to inspect vm"
-    data = response.json()
-    print("Data: ", json.dumps(data, indent=2))
-    assert data.get("content") is not None
-    actions = data.get("actions")
-    assert actions is not None
-    assert len(actions) == 2
-    assert actions[0].get("id") == "vms/inspect"
-    assert actions[0].get("uri") == "api/vms/inspect"
-    assert actions[1].get("id") == "vms/create"
-    assert actions[1].get("uri") == "api/vms/create"

pkgs/clan-cli/tests/test_static_files.py

@@ -1,10 +0,0 @@
-import pytest
-from api import TestClient
-
-
-@pytest.mark.impure
-def test_static_files(api: TestClient) -> None:
-    response = api.get("/")
-    assert response.headers["content-type"] == "text/html; charset=utf-8"
-    response = api.get("/does-no-exists.txt")
-    assert response.status_code == 404

pkgs/clan-cli/tests/test_webui.py

@@ -1,64 +0,0 @@
-import os
-import select
-import shutil
-import subprocess
-import sys
-from pathlib import Path
-
-import pytest
-from cli import Cli
-from ports import PortFunction
-
-
-@pytest.mark.timeout(10)
-def test_start_server(unused_tcp_port: PortFunction, temporary_home: Path) -> None:
-    Cli()
-    port = unused_tcp_port()
-
-    fifo = temporary_home / "fifo"
-    os.mkfifo(fifo)
-
-    # Create a script called "firefox" in the temporary home directory that
-    # writes "1" to the fifo. This is used to notify the test that the firefox has been
-    # started.
-    notify_script = temporary_home / "firefox"
-    bash = shutil.which("bash")
-    assert bash is not None
-    notify_script.write_text(
-        f"""#!{bash}
-set -x
-echo "1" > {fifo}
-"""
-    )
-    notify_script.chmod(0o700)
-
-    # Add the temporary home directory to the PATH so that the script is found
-    env = os.environ.copy()
-    env["PATH"] = f"{temporary_home}:{env['PATH']}"
-
-    # Add build/src to PYTHONPATH so that the webui module is found in nix sandbox
-    # TODO: We need a way to make sure things which work in the devshell also work in the sandbox
-    python_path = env.get("PYTHONPATH")
-    if python_path:
-        env["PYTHONPATH"] = f"/build/src:{python_path}"
-
-    # breakpoint_container(
-    #     cmd=[sys.executable, "-m", "clan_cli.webui", "--port", str(port)],
-    #     env=env,
-    #     work_dir=temporary_home,
-    # )
-
-    with subprocess.Popen(
-        [sys.executable, "-m", "clan_cli.webui", "--port", str(port)],
-        env=env,
-        stdout=sys.stderr,
-        stderr=sys.stderr,
-        text=True,
-    ) as p:
-        try:
-            with open(fifo) as f:
-                r, _, _ = select.select([f], [], [], 10)
-                assert f in r
-                assert f.read().strip() == "1"
-        finally:
-            p.kill()