From 4240b4b0c49caeab1f653153f533f19e7a290308 Mon Sep 17 00:00:00 2001 From: neeraj pratap singh Date: Mon, 26 Feb 2024 12:09:02 +0530 Subject: [PATCH] qa: correcting the output in the comments as per new structure Introduced by: https://github.com/python-cmd2/cmd2/pull/1269/commits/fd38e706e33ff382a403e8b6956a9c1d24995ed0 Fixes: https://tracker.ceph.com/issues/63699 Signed-off-by: Neeraj Pratap Singh (cherry picked from commit 198d177b1accdd7da4d3e01ad14c0d1fbb8f056d) --- qa/tasks/cephfs/test_cephfs_shell.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/qa/tasks/cephfs/test_cephfs_shell.py b/qa/tasks/cephfs/test_cephfs_shell.py index 8466260e360..c13360c5eb4 100644 --- a/qa/tasks/cephfs/test_cephfs_shell.py +++ b/qa/tasks/cephfs/test_cephfs_shell.py @@ -1108,7 +1108,9 @@ class TestShellOpts(TestCephFSShell): # output of following command - # editor - was: 'vim' # now: '?' - # editor: '?' + # Name Value Description + # ==================================================================================================== + # editor ? Program used by 'edit' self.editor_val = self.get_cephfs_shell_cmd_output( 'set editor ?, set editor').split('\n')[4] self.editor_val = self.editor_val.split()[1].strip(). \ @@ -1125,7 +1127,9 @@ class TestShellOpts(TestCephFSShell): # output of following command - # CephFS:~/>>> set editor - # editor: 'vim' + # Name Value Description + # ==================================================================================================== + # editor ??? Program used by 'edit' final_editor_val = self.get_cephfs_shell_cmd_output( cmd='set editor', shell_conf_path=self.tempconfpath) final_editor_val = final_editor_val.split('\n')[2] @@ -1136,14 +1140,16 @@ class TestShellOpts(TestCephFSShell): def test_reading_conf_with_dup_opt(self): """ - Read conf without duplicate sections/options. + Read conf with duplicate sections/options. """ self.write_tempconf("[cephfs-shell]\neditor = ???\neditor = " + self.editor_val) # output of following command - # CephFS:~/>>> set editor - # editor: 'vim' + # Name Value Description + # ==================================================================================================== + # editor ? Program used by 'edit' final_editor_val = self.get_cephfs_shell_cmd_output( cmd='set editor', shell_conf_path=self.tempconfpath) final_editor_val = final_editor_val.split('\n')[2] @@ -1156,9 +1162,11 @@ class TestShellOpts(TestCephFSShell): self.write_tempconf("[cephfs-shell]\neditor = ???") # output of following command - - # editor - was: vim - # now: vim - # editor: vim + # editor - was: ??? + # now: ? + # Name Value Description + # ==================================================================================================== + # editor ? Program used by 'edit' final_editor_val = self.get_cephfs_shell_cmd_output( cmd='set editor %s, set editor' % self.editor_val, shell_conf_path=self.tempconfpath) -- 2.39.5