]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: correcting the output in the comments as per new structure 56910/head
authorneeraj pratap singh <neerajpratapsingh@li-ff7f0d4c-3462-11b2-a85c-d4004c0fa1a0.ibm.com>
Mon, 26 Feb 2024 06:39:02 +0000 (12:09 +0530)
committerneeraj pratap singh <neerajpratapsingh@li-ff7f0d4c-3462-11b2-a85c-d4004c0fa1a0.ibm.com>
Tue, 16 Apr 2024 04:28:09 +0000 (09:58 +0530)
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 <neesingh@redhat.com>
(cherry picked from commit 198d177b1accdd7da4d3e01ad14c0d1fbb8f056d)

qa/tasks/cephfs/test_cephfs_shell.py

index 8466260e360ef4a9b4eb042f99a9c010f577d20c..c13360c5eb49ce28b9a100419cea92bffdf56584 100644 (file)
@@ -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)