]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
qa/workunits: use nose 3
authorSage Weil <sage@redhat.com>
Mon, 16 Dec 2019 17:49:20 +0000 (11:49 -0600)
committerSage Weil <sage@redhat.com>
Mon, 16 Dec 2019 23:02:45 +0000 (17:02 -0600)
Ubuntu is /usr/bin/nosetests3, el is /usr/bin/nosetests-3, so do neither.

Signed-off-by: Sage Weil <sage@redhat.com>
qa/workunits/fs/test_python.sh
qa/workunits/rbd/test_librbd_python.sh

index 656d89f066b7629930661fcb97321cdc7912a957..74dbfa3218e9a0741b5fc8c03034744ff1d27239 100755 (executable)
@@ -2,5 +2,5 @@
 
 # Running as root because the filesystem root directory will be
 # owned by uid 0, and that's where we're writing.
-sudo nosetests -v $(dirname $0)/../../../src/test/pybind/test_cephfs.py
+sudo python3 -m nose -v $(dirname $0)/../../../src/test/pybind/test_cephfs.py
 exit 0
index 656a5bd165739d913c4d10529eb4e2ed7c63c639..88bfb810a78df64bfc696388d9adab9c3876b7e3 100755 (executable)
@@ -5,8 +5,8 @@ relpath=$(dirname $0)/../../../src/test/pybind
 if [ -n "${VALGRIND}" ]; then
   valgrind ${VALGRIND} --suppressions=${TESTDIR}/valgrind.supp \
     --errors-for-leak-kinds=definite --error-exitcode=1 \
-    nosetests -v $relpath/test_rbd.py
+    python3 -m nose -v $relpath/test_rbd.py
 else
-  nosetests -v $relpath/test_rbd.py
+    python3 -m nose -v $relpath/test_rbd.py
 fi
 exit 0