]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/cephfs: CephFSTestCase.create_client() must keyring 56837/head
authorRishabh Dave <ridave@redhat.com>
Sun, 30 Jul 2023 17:27:37 +0000 (22:57 +0530)
committerRishabh Dave <ridave@redhat.com>
Fri, 12 Apr 2024 14:26:35 +0000 (19:56 +0530)
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 <ridave@redhat.com>
(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

index f26b598aa09e95de5ec78f1ff901ce1b40e778f2..dea8a310e31b0f476db8147194fb3b0ce55d71e2 100644 (file)
@@ -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}')