diff --git a/pkgs/clan-cli/tests/test_machines_cli.py b/pkgs/clan-cli/tests/test_machines_cli.py index 325f45e2..de1991d7 100644 --- a/pkgs/clan-cli/tests/test_machines_cli.py +++ b/pkgs/clan-cli/tests/test_machines_cli.py @@ -16,7 +16,10 @@ def test_machine_subcommands( cli.run(["--flake", str(test_flake_with_core.path), "machines", "list"]) out = capsys.readouterr() - assert "machine1\nvm1\nvm2\n" == out.out + + assert "machine1" in out.out + assert "nvm1" in out.out + assert "nvm2" in out.out cli.run( ["--flake", str(test_flake_with_core.path), "machines", "delete", "machine1"] @@ -25,4 +28,7 @@ def test_machine_subcommands( capsys.readouterr() cli.run(["--flake", str(test_flake_with_core.path), "machines", "list"]) out = capsys.readouterr() - assert "vm1\nvm2\n" == out.out + + assert "machine1" not in out.out + assert "nvm1" in out.out + assert "nvm2" in out.out diff --git a/pkgs/clan-vm-manager/clan_vm_manager/views/webview.py b/pkgs/clan-vm-manager/clan_vm_manager/views/webview.py index 246e1a3e..667913ea 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/views/webview.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/views/webview.py @@ -32,7 +32,7 @@ def dataclass_to_dict(obj: Any) -> Any: """ if dataclasses.is_dataclass(obj): return {k: dataclass_to_dict(v) for k, v in dataclasses.asdict(obj).items()} - elif isinstance(obj, (list, tuple)): + elif isinstance(obj, list | tuple): return [dataclass_to_dict(item) for item in obj] elif isinstance(obj, dict): return {k: dataclass_to_dict(v) for k, v in obj.items()} diff --git a/pkgs/webview-ui/app/src/nested.tsx b/pkgs/webview-ui/app/src/nested.tsx index 5a1a8b00..1cb524cd 100644 --- a/pkgs/webview-ui/app/src/nested.tsx +++ b/pkgs/webview-ui/app/src/nested.tsx @@ -28,7 +28,7 @@ export const Nested: Component = () => { {(entry, i) => (
  • {i() + 1}: {entry.machineName}{" "} - {entry.machineDescription || "No description"} + {entry.machine_description || "No description"}
  • )}