]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/mgr/dashboard: test_cluster_conf: restore original value of mon_allow_pool_d...
authorRicardo Dias <rdias@suse.com>
Fri, 22 Jun 2018 11:04:34 +0000 (12:04 +0100)
committerRicardo Dias <rdias@suse.com>
Tue, 26 Jun 2018 11:28:54 +0000 (12:28 +0100)
Signed-off-by: Ricardo Dias <rdias@suse.com>
qa/tasks/mgr/dashboard/test_cluster_configuration.py

index 8728b59c48f1f1c605d990b740874f003bd7233f..7aa94badc3925f8af4dfa2662ca5e339e10c1bd0 100644 (file)
@@ -27,7 +27,11 @@ class ClusterConfigurationTest(DashboardTestCase):
     def test_get_specific_db_config_option(self):
         def _get_mon_allow_pool_delete_config():
             data = self._get('/api/cluster_conf/mon_allow_pool_delete')
-            return data['value'][0]
+            if 'value' in data:
+                return data['value'][0]
+            return None
+
+        orig_value = _get_mon_allow_pool_delete_config()
 
         self._ceph_cmd(['config', 'set', 'mon', 'mon_allow_pool_delete', 'true'])
         result = self._wait_for_expected_get_result(_get_mon_allow_pool_delete_config,
@@ -39,6 +43,11 @@ class ClusterConfigurationTest(DashboardTestCase):
                                                     {'section': 'mon', 'value': 'false'})
         self.assertEqual(result, {'section': 'mon', 'value': 'false'})
 
+        # restore value
+        if orig_value:
+            self._ceph_cmd(['config', 'set', 'mon', 'mon_allow_pool_delete',
+                           orig_value['value']])
+
     def _validate_single(self, data):
         self.assertIn('name', data)
         self.assertIn('daemon_default', data)