[med-svn] [Git][med-team/nipype][master] 2 commits: Simplify and fix skipping test on s390x

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / nipype


Commits:
88616a86 by Andreas Tille at 2023-01-27T21:44:06+01:00
Simplify and fix skipping test on s390x

- - - - -
dd048631 by Andreas Tille at 2023-01-27T21:53:06+01:00
Upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/tests/run-unit-test


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+nipype (1.8.5-3) unstable; urgency=medium
+
+  * Team upload.
+  * Simplify and fix skipping test on s390x
+
+ -- Andreas Tille <tille at debian.org>  Fri, 27 Jan 2023 21:44:19 +0100
+
 nipype (1.8.5-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/tests/run-unit-test
=====================================
@@ -16,33 +16,19 @@ cp -a ${CUR_DIR}/nipype "${AUTOPKGTEST_TMP}"
 cp -a ${CUR_DIR}/debian/tests/test_sample.py "${AUTOPKGTEST_TMP}/nipype/tests"
 cd "${AUTOPKGTEST_TMP}"
 
+SKIP_TEST="not nipype.interfaces.io.BIDSDataGrabber"
 arch=$(dpkg-architecture -qDEB_HOST_ARCH)
 # skip tests
 if [ "$arch" = "s390x" ]; then
-    SKIP_TEST_LIST=(${SKIP_TEST_LIST[@]} nipype.interfaces.mixins.fixheader.CopyHeaderInterface)
+    SKIP_TEST=$SKIP_TEST" and not nipype.interfaces.mixins.fixheader.CopyHeaderInterface"
 fi
 
-SKIP_TESTS=""
-list_initialised=0
-for t in ${SKIP_TEST_LIST[@]}; do
-    if [ ${list_initialised} = 0 ]; then
-        SKIP_TESTS=$t
-        list_initialised=1
-    else
-        SKIP_TESTS="${SKIP_TESTS} or $t"
-    fi
-done
-if [ "x${SKIP_TESTS}" != "x" ]; then
-    SKIP_TESTS="not ( ${SKIP_TESTS} )"
-fi
-echo "skipping tests with SKIP_TEST_LIST=${SKIP_TEST_LIST[@]}"
-
-echo "Running Tests"
+echo "Skip following Tests: $SKIP_TEST"
 
 for py in $(py3versions -s 2> /dev/null)
 do
     echo "Testing with $py in $(pwd):"
-    $py -m pytest -v --doctest-modules -k "not nipype.interfaces.io.BIDSDataGrabber" nipype
+    $py -m pytest -v --doctest-modules -k "$SKIP_TEST" nipype
 
 done
 



View it on GitLab: https://salsa.debian.org/med-team/nipype/-/compare/a7bf424dcd6fb53cdbadb7ce67d25c1ac299f70d...dd0486317a2ca4ced8b82fde9e8778f14bd202c9

-- 
View it on GitLab: https://salsa.debian.org/med-team/nipype/-/compare/a7bf424dcd6fb53cdbadb7ce67d25c1ac299f70d...dd0486317a2ca4ced8b82fde9e8778f14bd202c9
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20230127/9e82c8f9/attachment-0001.htm>