RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 10:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
test: No direct use of nose

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2022-05-11 12:28:48 -04:00 committed by GitHub
commit f0e30f67ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 698 additions and 702 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ceph.spec.in
View File

@ -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

1
debian/control vendored
View File

@ -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>,

4
src/test/pybind/CMakeLists.txt
View File

@ -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)

1380
src/test/pybind/test_ceph_argparse.py
View File

File diff suppressed because it is too large Load Diff

14
src/test/pybind/test_ceph_daemon.py
View File

@ -11,7 +11,7 @@ License version 2, as published by the Free Software
Foundation. See file COPYING.
"""
from unittest import TestCase
import unittest
from ceph_daemon import DaemonWatcher
@ -21,7 +21,7 @@ except ImportError:
from io import StringIO
class TestDaemonWatcher(TestCase):
class TestDaemonWatcher(unittest.TestCase):
def test_format(self):
dw = DaemonWatcher(None)
@ -39,10 +39,14 @@ class TestDaemonWatcher(TestCase):
def test_supports_color(self):
dw = DaemonWatcher(None)
# Can't count on having a tty available during tests, so only test the false case
self.assertEqual(dw.supports_color(StringIO()), False)
self.assertFalse(dw.supports_color(StringIO()))
if __name__ == '__main__':
unittest.main()
# Local Variables:
# compile-command: "cd ../../..;
# PYTHONPATH=src/pybind nosetests --stop \
# src/test/pybind/test_ceph_daemon.py"
# PYTHONPATH=src/pybind python3 src/test/pybind/test_ceph_daemon.py"
# End: