Merge pull request #113167 from mweinelt/pytestcheckhook-paths

pytestCheckHook: add support for disabling arbitrary paths
This commit is contained in:
Sandro 2021-02-18 16:59:22 +01:00 committed by GitHub
commit 36ef53d337
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 11 deletions

View file

@ -611,7 +611,7 @@ Using the example above, the analagous pytestCheckHook usage would be:
"update"
];
disabledTestFiles = [
disabledTestPaths = [
"tests/test_failing.py"
];
```

View file

@ -2,7 +2,7 @@
echo "Sourcing pytest-check-hook"
declare -ar disabledTests
declare -ar disabledTestFiles
declare -ar disabledTestPaths
function _concatSep {
local result
@ -37,12 +37,12 @@ function pytestCheckPhase() {
disabledTestsString=$(_pytestComputeDisabledTestsString "${disabledTests[@]}")
args+=" -k \""$disabledTestsString"\""
fi
for file in ${disabledTestFiles[@]}; do
if [ ! -f "$file" ]; then
echo "Disabled test file \"$file\" does not exist. Aborting"
for path in ${disabledTestPaths[@]}; do
if [ ! -e "$path" ]; then
echo "Disabled tests path \"$path\" does not exist. Aborting"
exit 1
fi
args+=" --ignore=\"$file\""
args+=" --ignore=\"$path\""
done
args+=" ${pytestFlagsArray[@]}"
eval "@pythonCheckInterpreter@ $args"

View file

@ -73,7 +73,7 @@ buildPythonPackage rec {
"bind_addr_unix"
];
disabledTestFiles = [
disabledTestPaths = [
# avoid attempting to use 3 packages not available on nixpkgs
# (jaraco.apt, jaraco.context, yg.lockfile)
"cheroot/test/test_wsgi.py"

View file

@ -39,7 +39,7 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook ];
# Exclude live tests
disabledTestFiles = [ "tests/live_test.py" ];
disabledTestPaths = [ "tests/live_test.py" ];
pythonImportsCheck = [ "slixmpp" ];

View file

@ -50,7 +50,7 @@ buildPythonPackage rec {
typing-extensions
];
disabledTestFiles = [ "tests/test_graphql.py" ];
disabledTestPaths = [ "tests/test_graphql.py" ];
# https://github.com/encode/starlette/issues/1131
disabledTests = [ "test_debug_html" ];
pythonImportsCheck = [ "starlette" ];

View file

@ -35,7 +35,7 @@ buildPythonPackage rec {
# the default string formatting of regular expression flags which breaks test assertion
"test_to_json_schema_complex_regular_expression"
];
disabledTestFiles = [
disabledTestPaths = [
# for some reason jinja2 not picking up forms directory (1% of tests)
"tests/test_forms.py"
];

View file

@ -69,7 +69,7 @@ buildPythonPackage rec {
'';
# Ignore tests which require network access
disabledTestFiles = [
disabledTestPaths = [
"tests/unit/create/test_creator.py"
"tests/unit/seed/embed/test_bootstrap_link_via_app_data.py"
];