From 61f08d0aadd7841fc72bdc242d2e11119b093058 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Mon, 8 May 2023 10:50:19 +0000 Subject: [PATCH] qa/suites/crimson: Skip unsupported tests (Crimson) Align with `rbd_api_tests` and skip deep_copy and breaklock tests in Crimson. Signed-off-by: Matan Breizman (cherry picked from commit 5823c04542c2a6870cb038da752e752ea2a3cf9a) --- .../rbd/tasks/rbd_python_api_tests_old_format.yaml | 2 +- qa/workunits/rbd/test_librbd_python.sh | 4 ++-- src/test/pybind/test_rbd.py | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/qa/suites/crimson-rados/rbd/tasks/rbd_python_api_tests_old_format.yaml b/qa/suites/crimson-rados/rbd/tasks/rbd_python_api_tests_old_format.yaml index 441ac97279276..c4c2b8a2bcc9a 100644 --- a/qa/suites/crimson-rados/rbd/tasks/rbd_python_api_tests_old_format.yaml +++ b/qa/suites/crimson-rados/rbd/tasks/rbd_python_api_tests_old_format.yaml @@ -7,4 +7,4 @@ tasks: - workunit: clients: client.0: - - rbd/test_librbd_python.sh + - rbd/test_librbd_python.sh --eval-attr 'not (SKIP_IF_CRIMSON)' diff --git a/qa/workunits/rbd/test_librbd_python.sh b/qa/workunits/rbd/test_librbd_python.sh index 88bfb810a78df..f276986485bdc 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 \ - python3 -m nose -v $relpath/test_rbd.py + python3 -m nose -v $relpath/test_rbd.py "$@" else - python3 -m nose -v $relpath/test_rbd.py + python3 -m nose -v $relpath/test_rbd.py "$@" fi exit 0 diff --git a/src/test/pybind/test_rbd.py b/src/test/pybind/test_rbd.py index a7b74acbb86d1..e42f7f00f0914 100644 --- a/src/test/pybind/test_rbd.py +++ b/src/test/pybind/test_rbd.py @@ -12,6 +12,7 @@ import sys from datetime import datetime, timedelta from nose import with_setup, SkipTest +from nose.plugins.attrib import attr from nose.tools import eq_ as eq, assert_raises, assert_not_equal from rados import (Rados, LIBRADOS_OP_FLAG_FADVISE_DONTNEED, @@ -777,6 +778,7 @@ class TestImage(object): self._test_copy(features, self.image.stat()['order'], self.image.stripe_unit(), self.image.stripe_count()) + @attr('SKIP_IF_CRIMSON') def test_deep_copy(self): global ioctx global features @@ -2029,6 +2031,7 @@ class TestExclusiveLock(object): image.lock_acquire(RBD_LOCK_MODE_EXCLUSIVE) image.lock_release() + @attr('SKIP_IF_CRIMSON') def test_break_lock(self): blocklist_rados = Rados(conffile='') blocklist_rados.connect() -- 2.39.5