diff --git a/.gitignore b/.gitignore index 222f9bef..45b863ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .direnv ***/.hypothesis +out.log .coverage.* **/qubeclan **/testdir diff --git a/checks/impure/flake-module.nix b/checks/impure/flake-module.nix index fa1b77c0..18f3e7ad 100644 --- a/checks/impure/flake-module.nix +++ b/checks/impure/flake-module.nix @@ -13,7 +13,7 @@ ]}" ROOT=$(git rev-parse --show-toplevel) cd "$ROOT/pkgs/clan-cli" - nix develop "$ROOT#clan-cli" -c bash -c "TMPDIR=/tmp python -m pytest -m impure -s ./tests $@" + nix develop "$ROOT#clan-cli" -c bash -c "TMPDIR=/tmp python -m pytest -m impure ./tests $@" ''; runMockApi = pkgs.writeShellScriptBin "run-mock-api" '' diff --git a/pkgs/clan-cli/clan_cli/vms/run.py b/pkgs/clan-cli/clan_cli/vms/run.py index b6f6029d..9fbdba79 100644 --- a/pkgs/clan-cli/clan_cli/vms/run.py +++ b/pkgs/clan-cli/clan_cli/vms/run.py @@ -38,8 +38,8 @@ def graphics_options(vm: VmConfig) -> list[str]: common: list[str] = [] # Check if the version is greater than 8.1.3 to enable virtio audio - if get_qemu_version() > [8, 1, 3]: - common = ["-audio", "driver=pa,model=virtio"] + # if get_qemu_version() > [8, 1, 3]: + common = ["-audio", "driver=pa,model=virtio"] if vm.wayland: # fmt: off diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix index 828cdf32..d2d32c71 100644 --- a/pkgs/clan-cli/default.nix +++ b/pkgs/clan-cli/default.nix @@ -133,7 +133,7 @@ python3.pkgs.buildPythonApplication { cd ./src export NIX_STATE_DIR=$TMPDIR/nix IN_NIX_SANDBOX=1 - ${checkPython}/bin/python -m pytest -m "not impure and not with_core" -s ./tests + ${checkPython}/bin/python -m pytest -m "not impure and not with_core" ./tests touch $out ''; # separate the tests that can never be cached @@ -144,7 +144,7 @@ python3.pkgs.buildPythonApplication { export CLAN_CORE=${clan-core-path} export NIX_STATE_DIR=$TMPDIR/nix IN_NIX_SANDBOX=1 - ${checkPython}/bin/python -m pytest -m "not impure and with_core" -s ./tests + ${checkPython}/bin/python -m pytest -m "not impure and with_core" ./tests touch $out ''; diff --git a/pkgs/clan-cli/enter_nix_sandbox.sh b/pkgs/clan-cli/enter_nix_sandbox.sh deleted file mode 100755 index a2ba747a..00000000 --- a/pkgs/clan-cli/enter_nix_sandbox.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -set -xeuo pipefail - -PID_NIX=$(pgrep --full "python -m pytest" | cut -d " " -f2 | head -n1) - -sudo cntr attach "$PID_NIX"