Merge pull request ceph#55725 from neesingh-rh/wip-63699

qa: fixing tests in test_cephfs_shell.TestShellOpts

Reviewed-by: Venky Shankar <[email protected]>

Author: vshankar

qa/tasks/cephfs/test_cephfs_shell.py

@@ -1108,11 +1108,13 @@ def setUp(self):
         # 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')[2]
-        self.editor_val = self.editor_val.split(':')[1]. \
-            replace("'", "", 2).strip()
+            'set editor ?, set editor').split('\n')[4]
+        self.editor_val = self.editor_val.split()[1].strip(). \
+            replace("'", "", 2)
 
     def write_tempconf(self, confcontents):
         self.tempconfpath = self.mount_a.client_remote.mktemp(
@@ -1125,43 +1127,51 @@ def test_reading_conf(self):
 
         # 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(': ')[1]
-        final_editor_val = final_editor_val.replace("'", "", 2)
+        final_editor_val = final_editor_val.split('\n')[2]
+        final_editor_val = final_editor_val.split()[1].strip(). \
+            replace("'", "", 2)
 
         self.assertNotEqual(self.editor_val, final_editor_val)
 
     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(': ')[1]
-        final_editor_val = final_editor_val.replace("'", "", 2)
+        final_editor_val = final_editor_val.split('\n')[2]
+        final_editor_val = final_editor_val.split()[1].strip(). \
+            replace("'", "", 2)
 
         self.assertEqual(self.editor_val, final_editor_val)
 
     def test_setting_opt_after_reading_conf(self):
         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)
-        final_editor_val = final_editor_val.split('\n')[2]
-        final_editor_val = final_editor_val.split(': ')[1]
-        final_editor_val = final_editor_val.replace("'", "", 2)
+        final_editor_val = final_editor_val.split('\n')[4]
+        final_editor_val = final_editor_val.split()[1].strip(). \
+            replace("'", "", 2)
 
         self.assertEqual(self.editor_val, final_editor_val)