From: Sage Weil <sage@redhat.com>
Date: Mon, 16 Dec 2019 17:49:20 +0000 (-0600)
Subject: qa/workunits: use nose 3
X-Git-Tag: v15.1.0~448^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=889446a5155ad2aa2de86ac90737025797a38cb0;p=ceph.git

qa/workunits: use nose 3

Ubuntu is /usr/bin/nosetests3, el is /usr/bin/nosetests-3, so do neither.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/workunits/fs/test_python.sh b/qa/workunits/fs/test_python.sh
index 656d89f066b..74dbfa3218e 100755
--- a/qa/workunits/fs/test_python.sh
+++ b/qa/workunits/fs/test_python.sh
@@ -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
diff --git a/qa/workunits/rbd/test_librbd_python.sh b/qa/workunits/rbd/test_librbd_python.sh
index 656a5bd1657..88bfb810a78 100755
--- a/qa/workunits/rbd/test_librbd_python.sh
+++ b/qa/workunits/rbd/test_librbd_python.sh
@@ -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