Revert "Doc and test fixes"

diff --git a/src/pybind/mgr/dashboard/HACKING.rst b/src/pybind/mgr/dashboard/HACKING.rst
index 6da428a0d5f833577175dae9e58dbd84c9bd5b45..39c3d6744b91bf2c557bf8241829d81fc7961999 100644 (file)
--- a/src/pybind/mgr/dashboard/HACKING.rst
+++ b/src/pybind/mgr/dashboard/HACKING.rst
@@ -4,7 +4,7 @@ Ceph Dashboard Developer Documentation
 Note: The content of this file has been moved into the Ceph Developer Guide.
 
 If you're interested in helping with the development of the dashboard, please
-see ``/doc/dev/developer_guide/dash-devel.rst`` or the `online version
+see ``/doc/dev/developer_guide/dash_devel.rst`` or the `online version
 <https://ceph.readthedocs.io/en/latest/dev/developer_guide/dash-devel/>`_ for
 details on how to set up a development environment and other development-related
 topics.

diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py
index 630e6046b243d419ac92deb8fe525c3c189c7c6d..3039223abdff1a36b4a1b301236bba93e5f47bbb 100755 (executable)
--- a/src/test/pybind/test_ceph_argparse.py
+++ b/src/test/pybind/test_ceph_argparse.py
@@ -217,7 +217,7 @@ class TestPG(TestArgparse):
     def test_pg_missing_args_output(self):
         ret, _, stderr = self._capture_output(['pg'], stderr=True)
         self.assertEqual({}, ret)
-        self.assertRegex(stderr, re.compile('no valid command found.* closest matches'))
+        self.assertRegexpMatches(stderr, re.compile('no valid command found.* closest matches'))
 
     def test_pg_wrong_arg_output(self):
         ret, _, stderr = self._capture_output(['pg', 'map', 'bad-pgid'],
@@ -416,10 +416,10 @@ class TestMDS(TestArgparse):
 
 
 class TestFS(TestArgparse):
-
+    
     def test_dump(self):
         self.check_0_or_1_natural_arg('fs', 'dump')
-
+    
     def test_fs_new(self):
         self._assert_valid_command(['fs', 'new', 'default', 'metadata', 'data'])
 
@@ -912,7 +912,7 @@ class TestOSD(TestArgparse):
                                         '1.2.3.4/567', '600.40'])
             self._assert_valid_command(['osd', 'blocklist', action,
                                         '1.2.3.4', '600.40'])
-
+            
             self._assert_valid_command(['osd', 'blocklist', action,
                                         'v1:1.2.3.4', '600.40'])
             self._assert_valid_command(['osd', 'blocklist', action,
@@ -925,7 +925,7 @@ class TestOSD(TestArgparse):
                                         'v2:[2607:f298:4:2243::5522]:0/0', '600.40'])
             self._assert_valid_command(['osd', 'blocklist', action,
                                         '[2001:0db8::85a3:0000:8a2e:0370:7334]:0/0', '600.40'])
-
+            
             self.assertEqual({}, validate_command(sigdict, ['osd', 'blocklist',
                                                             action,
                                                             'invalid',

diff --git a/src/tools/cephfs/top/cephfs-top b/src/tools/cephfs/top/cephfs-top
index 45900f9a025b09769a4287b7bfc970bd96885120..9ecc47fc2d5f35f2731b58aacd520e842bee87c9 100755 (executable)
--- a/src/tools/cephfs/top/cephfs-top
+++ b/src/tools/cephfs/top/cephfs-top
@@ -148,7 +148,7 @@ def wrap(s, sl):
     """return a '+' suffixed wrapped string"""
     if len(s) < sl:
         return s
-    return f'{s[0:sl - 1]}+'
+    return f'{s[0:sl-1]}+'
 
 
 class FSTopBase(object):