From cac785ec0e1322b02fcd49bfdac9620bcd31d3de Mon Sep 17 00:00:00 2001 From: Wing Lian Date: Mon, 2 Dec 2024 20:14:40 -0500 Subject: [PATCH] use pytest sugar and verbose for more info during ci (#2112) [skip ci] * use pytest sugar and verbose for more info during ci * also run test suite when test requirements or cicd.sh changes * also on PR too --- .github/workflows/tests.yml | 4 ++++ cicd/cicd.sh | 6 +++--- requirements-tests.txt | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5b380c784..249dfd9e4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,11 +8,15 @@ on: - '**.py' - 'requirements.txt' - '.github/workflows/*.yml' + - 'requirements-tests.txt' + - 'cicd/cicd.sh' pull_request: paths: - '**.py' - 'requirements.txt' - '.github/workflows/*.yml' + - 'requirements-tests.txt' + - 'cicd/cicd.sh' workflow_dispatch: # Cancel jobs on the same ref if a new one is triggered diff --git a/cicd/cicd.sh b/cicd/cicd.sh index 7a4a31504..68c40bb78 100755 --- a/cicd/cicd.sh +++ b/cicd/cicd.sh @@ -1,6 +1,6 @@ #!/bin/bash set -e -pytest --durations=10 -n8 --ignore=tests/e2e/ /workspace/axolotl/tests/ -pytest --durations=10 -n1 --dist loadfile -v /workspace/axolotl/tests/e2e/patched/ /workspace/axolotl/tests/e2e/integrations/ -pytest --durations=10 --ignore=tests/e2e/patched/ --ignore=tests/e2e/multigpu/ --ignore=tests/e2e/integrations/ /workspace/axolotl/tests/e2e/ +pytest -v --durations=10 -n8 --ignore=tests/e2e/ /workspace/axolotl/tests/ +pytest -v --durations=10 -n1 --dist loadfile -v /workspace/axolotl/tests/e2e/patched/ /workspace/axolotl/tests/e2e/integrations/ +pytest -v --durations=10 --ignore=tests/e2e/patched/ --ignore=tests/e2e/multigpu/ --ignore=tests/e2e/integrations/ /workspace/axolotl/tests/e2e/ diff --git a/requirements-tests.txt b/requirements-tests.txt index 7a34809da..0022980e9 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -1,3 +1,4 @@ pytest pytest-xdist pytest-retry +pytest-sugar