From a3d434f4ec3b00ab6f0c37868760ffa72e28a16b Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Mon, 4 Apr 2022 11:55:04 +1000 Subject: [PATCH] test/pybind/ceph_daemon: Switch to bare unittest nose has been unmaintained for a long time, and to work on removing it as a dependency, re-work test_ceph_daemon to use bare unittest. Signed-off-by: Steve Kowalik (cherry picked from commit 34d8fc182eb10eb5003d162bcc4ba6bc91e399b3) --- src/test/pybind/CMakeLists.txt | 2 +- src/test/pybind/test_ceph_daemon.py | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/test/pybind/CMakeLists.txt b/src/test/pybind/CMakeLists.txt index 2f4051abc926d..b2f0552a4ee1e 100644 --- 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} ${CMAKE_CURRENT_SOURCE_DIR}/test_ceph_argparse.py) diff --git a/src/test/pybind/test_ceph_daemon.py b/src/test/pybind/test_ceph_daemon.py index f3a229a8ceec4..df8d4c0b09b91 100755 --- a/src/test/pybind/test_ceph_daemon.py +++ b/src/test/pybind/test_ceph_daemon.py @@ -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: -- 2.39.5