Merge pull request ceph#45064 from s-t-e-v-e-n-k/no-direct-use-of-nose

test: No direct use of nose Reviewed-by: Casey Bodley <[email protected]>
mitsu-ko · May 11, 2022 · f0e30f6 · f0e30f6
2 parents 3bc0354 + 47fba6f
commit f0e30f6
Show file tree

Hide file tree

Showing 5 changed files with 696 additions and 700 deletions.
diff --git a/ceph.spec.in b/ceph.spec.in
@@ -259,7 +259,6 @@ BuildRequires:  hostname
 BuildRequires:  jq
 BuildRequires:	libuuid-devel
 BuildRequires:	python%{python3_pkgversion}-bcrypt
-BuildRequires:	python%{python3_pkgversion}-nose
 BuildRequires:	python%{python3_pkgversion}-pecan
 BuildRequires:	python%{python3_pkgversion}-requests
 BuildRequires:	python%{python3_pkgversion}-dateutil

diff --git a/debian/control b/debian/control
@@ -87,7 +87,6 @@ Build-Depends: automake,
                python3-cherrypy3,
                python3-natsort,
                python3-jwt <pkg.ceph.check>,
-               python3-nose <pkg.ceph.check>,
                python3-pecan <pkg.ceph.check>,
                python3-bcrypt <pkg.ceph.check>,
                tox <pkg.ceph.check>,

diff --git a/src/test/pybind/CMakeLists.txt b/src/test/pybind/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_ceph_test(test_ceph_daemon.py
-  ${Python3_EXECUTABLE} -m nose ${CMAKE_CURRENT_SOURCE_DIR}/test_ceph_daemon.py)
+  ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_ceph_daemon.py)
 add_ceph_test(test_ceph_argparse.py
-  ${Python3_EXECUTABLE} -m nose ${CMAKE_CURRENT_SOURCE_DIR}/test_ceph_argparse.py)
+  ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test_ceph_argparse.py)