From 1f2892df2ddfed3f7e9c27523fe237e2b13db425 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Sun, 30 Jul 2023 22:57:37 +0530 Subject: [PATCH] qa/cephfs: CephFSTestCase.create_client() must keyring Replace call to run_ceph_cmd() by call to get_ceph_cmd_stdout() in method qa.tasks.cephfs.cephfs_test_case.CephFSTestCase.create_client(). run_ceph_cmd() will not return keyring which is wrong. get_ceph_cmd_stdout() will return the stdout of "ceph auth add" command, which is the keyring that is expected to be returned by CephFSTestCase.create_client(). Fixes: https://tracker.ceph.com/issues/62246 Signed-off-by: Rishabh Dave (cherry picked from commit c9058dc7a57530df592b9945d36cf71459946f4f) Conflicts: * qa/tasks/cephfs/cephfs_test_case.py Conflict occurred because class RunCephCmd hasn't been backported. This PR is getting it done - https://github.com/ceph/ceph/pull/54946. --- qa/tasks/cephfs/cephfs_test_case.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/tasks/cephfs/cephfs_test_case.py b/qa/tasks/cephfs/cephfs_test_case.py index f26b598aa09e9..dea8a310e31b0 100644 --- a/qa/tasks/cephfs/cephfs_test_case.py +++ b/qa/tasks/cephfs/cephfs_test_case.py @@ -425,4 +425,4 @@ class CephFSTestCase(CephTestCase): cmd += ['mds', mdscap] self.run_ceph_cmd(*cmd) - return self.run_ceph_cmd(f'auth get {self.client_name}') + return self.get_ceph_cmd_stdout(f'auth get {self.client_name}') -- 2.39.5