From: Sage Weil <sage@redhat.com>
Date: Tue, 17 Dec 2019 18:57:57 +0000 (-0600)
Subject: qa/tasks: nosetests -> python -m nose
X-Git-Tag: v15.1.0~448^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6476517def2376f238cc23fb4d39b649fb74dd96;p=ceph-ci.git

qa/tasks: nosetests -> python -m nose

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

diff --git a/qa/tasks/ragweed.py b/qa/tasks/ragweed.py
index 67b16851b7b..2a0027ab2c7 100644
--- a/qa/tasks/ragweed.py
+++ b/qa/tasks/ragweed.py
@@ -256,7 +256,8 @@ def run_tests(ctx, config, run_stages):
             'RAGWEED_CONF={tdir}/archive/ragweed.{client}.conf'.format(tdir=testdir, client=client),
             'RAGWEED_STAGES={stages}'.format(stages=stages),
             'BOTO_CONFIG={tdir}/boto.cfg'.format(tdir=testdir),
-            '{tdir}/ragweed/virtualenv/bin/nosetests'.format(tdir=testdir),
+            '{tdir}/ragweed/virtualenv/bin/python'.format(tdir=testdir),
+            '-m', 'nose',
             '-w',
             '{tdir}/ragweed'.format(tdir=testdir),
             '-v',
diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py
index 52b7915d9d5..92498dc8df8 100644
--- a/qa/tasks/s3tests.py
+++ b/qa/tasks/s3tests.py
@@ -294,7 +294,8 @@ def run_tests(ctx, config):
         if client_config.get('calling-format') != 'ordinary':
             attrs += ['!fails_with_subdomain']
         args += [
-            '{tdir}/s3-tests/virtualenv/bin/nosetests'.format(tdir=testdir),
+            '{tdir}/s3-tests/virtualenv/bin/python'.format(tdir=testdir),
+            '-m', 'nose',
             '-w',
             '{tdir}/s3-tests'.format(tdir=testdir),
             '-v',
diff --git a/qa/tasks/swift.py b/qa/tasks/swift.py
index e89fcf03e48..c17a9aa5ffc 100644
--- a/qa/tasks/swift.py
+++ b/qa/tasks/swift.py
@@ -152,7 +152,8 @@ def run_tests(ctx, config):
     for client, client_config in config.items():
         args = [
                 'SWIFT_TEST_CONFIG_FILE={tdir}/archive/testswift.{client}.conf'.format(tdir=testdir, client=client),
-                '{tdir}/swift/virtualenv/bin/nosetests'.format(tdir=testdir),
+                '{tdir}/swift/virtualenv/bin/python'.format(tdir=testdir),
+                '-m', 'nose',
                 '-w',
                 '{tdir}/swift/test/functional'.format(tdir=testdir),
                 '-v',
diff --git a/qa/workunits/rgw/run-s3tests.sh b/qa/workunits/rgw/run-s3tests.sh
index 47969c63bee..4f40bbd3152 100755
--- a/qa/workunits/rgw/run-s3tests.sh
+++ b/qa/workunits/rgw/run-s3tests.sh
@@ -32,7 +32,7 @@ cd s3-tests
 git checkout ceph-$branch
 VIRTUALENV_PYTHON=/usr/bin/python3 ./bootstrap
 
-S3TEST_CONF=s3tests.conf.SAMPLE virtualenv/bin/nosetests -a '!fails_on_rgw,!lifecycle_expiration,!fails_strict_rfc2616' -v
+S3TEST_CONF=s3tests.conf.SAMPLE virtualenv/bin/python -m nose -a '!fails_on_rgw,!lifecycle_expiration,!fails_strict_rfc2616' -v
 
 cd ../..
 rm -rf $dir