Merge pull request #59005 from neesingh-rh/wip-67300-squid

kotreshhr · web-flow · commit 2d28e14c059c · 2025-06-17T12:27:27.000+05:30
squid: pybind/ceph_argparse: Fix error message for ceph tell command
diff --git a/qa/tasks/cephfs/test_misc.py b/qa/tasks/cephfs/test_misc.py
@@ -522,6 +522,11 @@ def test_session_ls(self):
     def test_client_ls(self):
         self._session_client_ls(['client', 'ls'])
 
+    def test_ceph_tell_for_unknown_cephname_type(self):
+        with self.assertRaises(CommandFailedError) as ce:
+            self.run_ceph_cmd('tell', 'cephfs.c', 'something')
+        self.assertEqual(ce.exception.exitstatus, 1)
+
 
 @classhook('_add_session_client_evictions')
 class TestSessionClientEvict(CephFSTestCase):
@@ -601,7 +606,7 @@ def test(self):
             setattr(cls, 'test_session' + t, create_test(t, ['session']))
             setattr(cls, 'test_client' + t, create_test(t, ['client']))
 
-        
+
 class TestCacheDrop(CephFSTestCase):
     CLIENTS_REQUIRED = 1
 
diff --git a/src/pybind/ceph_argparse.py b/src/pybind/ceph_argparse.py
@@ -502,13 +502,13 @@ def valid(self, s, partial=False):
         try:
             poolid = int(poolid_s)
         except ValueError:
-            raise ArgumentFormat('pool {0} not integer'.format(poolid))
+            raise ArgumentFormat('pool {0} not integer'.format(poolid_s))
         if poolid < 0:
             raise ArgumentFormat('pool {0} < 0'.format(poolid))
         try:
             pgnum = int(pgnum_s, 16)
         except ValueError:
-            raise ArgumentFormat('pgnum {0} not hex integer'.format(pgnum))
+            raise ArgumentFormat('pgnum {0} not hex integer'.format(pgnum_s))
         self.val = s
 
     def __str__(self):
