pytest: Removed -s flag for CI
This commit is contained in:
parent
ca265b0c59
commit
cb06353451
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,5 +1,6 @@
|
||||||
.direnv
|
.direnv
|
||||||
***/.hypothesis
|
***/.hypothesis
|
||||||
|
out.log
|
||||||
.coverage.*
|
.coverage.*
|
||||||
**/qubeclan
|
**/qubeclan
|
||||||
**/testdir
|
**/testdir
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
]}"
|
]}"
|
||||||
ROOT=$(git rev-parse --show-toplevel)
|
ROOT=$(git rev-parse --show-toplevel)
|
||||||
cd "$ROOT/pkgs/clan-cli"
|
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" ''
|
runMockApi = pkgs.writeShellScriptBin "run-mock-api" ''
|
||||||
|
|
|
@ -38,8 +38,8 @@ def graphics_options(vm: VmConfig) -> list[str]:
|
||||||
common: list[str] = []
|
common: list[str] = []
|
||||||
|
|
||||||
# Check if the version is greater than 8.1.3 to enable virtio audio
|
# Check if the version is greater than 8.1.3 to enable virtio audio
|
||||||
if get_qemu_version() > [8, 1, 3]:
|
# if get_qemu_version() > [8, 1, 3]:
|
||||||
common = ["-audio", "driver=pa,model=virtio"]
|
common = ["-audio", "driver=pa,model=virtio"]
|
||||||
|
|
||||||
if vm.wayland:
|
if vm.wayland:
|
||||||
# fmt: off
|
# fmt: off
|
||||||
|
|
|
@ -133,7 +133,7 @@ python3.pkgs.buildPythonApplication {
|
||||||
cd ./src
|
cd ./src
|
||||||
|
|
||||||
export NIX_STATE_DIR=$TMPDIR/nix IN_NIX_SANDBOX=1
|
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
|
touch $out
|
||||||
'';
|
'';
|
||||||
# separate the tests that can never be cached
|
# separate the tests that can never be cached
|
||||||
|
@ -144,7 +144,7 @@ python3.pkgs.buildPythonApplication {
|
||||||
|
|
||||||
export CLAN_CORE=${clan-core-path}
|
export CLAN_CORE=${clan-core-path}
|
||||||
export NIX_STATE_DIR=$TMPDIR/nix IN_NIX_SANDBOX=1
|
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
|
touch $out
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -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"
|
|
Loading…
Reference in New Issue
Block a user