qa: fix api test failures

"device_health_metrics" pool is gone -- .mgr pool is in.

I don't think the pool removal code in some test cases is necessary any
longer with recent changes to remove those warnings; so that code is
gone too.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/qa/tasks/mgr/dashboard/test_pool.py b/qa/tasks/mgr/dashboard/test_pool.py
index cbf920b91897ba87601dd5621999ab2833b44cb7..330f7c42b051300f44ce620e6357557b80f26697 100644 (file)
--- a/qa/tasks/mgr/dashboard/test_pool.py
+++ b/qa/tasks/mgr/dashboard/test_pool.py
@@ -163,7 +163,7 @@ class PoolTest(DashboardTestCase):
         self.assertStatus(403)
 
     def test_pool_configuration(self):
-        pool_name = 'device_health_metrics'
+        pool_name = '.mgr'
         data = self._get('/api/pool/{}/configuration'.format(pool_name))
         self.assertStatus(200)
         self.assertSchema(data, JList(JObj({

diff --git a/qa/tasks/mgr/test_module_selftest.py b/qa/tasks/mgr/test_module_selftest.py
index b054642dbd48e8e7ead6d01ac73d021de98aafe4..523a59f38bd9272e771df9e8d35c12acf0a9a6f1 100644 (file)
--- a/qa/tasks/mgr/test_module_selftest.py
+++ b/qa/tasks/mgr/test_module_selftest.py
@@ -68,12 +68,6 @@ class TestModuleSelftest(MgrTestCase):
 
     def test_devicehealth(self):
         self._selftest_plugin("devicehealth")
-        # Clean up the pool that the module creates, because otherwise
-        # it's low PG count causes test failures.
-        pool_name = "device_health_metrics"
-        self.mgr_cluster.mon_manager.raw_cluster_cmd(
-                "osd", "pool", "delete", pool_name, pool_name,
-                "--yes-i-really-really-mean-it")
 
     def test_selftest_run(self):
         self._load_module("selftest")

diff --git a/qa/workunits/cephadm/test_dashboard_e2e.sh b/qa/workunits/cephadm/test_dashboard_e2e.sh
index bd37154d9b879e298669a4ae907085cfea63ad46..3d9a79839818798e0c724c3295a282fc5d7253ec 100755 (executable)
--- a/qa/workunits/cephadm/test_dashboard_e2e.sh
+++ b/qa/workunits/cephadm/test_dashboard_e2e.sh
@@ -68,12 +68,6 @@ npm ci --unsafe-perm
 npx cypress verify
 npx cypress info
 
-# Remove device_health_metrics pool
-# Low pg count causes OSD removal failure.
-ceph device monitoring off
-ceph tell mon.\* injectargs '--mon-allow-pool-delete=true'
-ceph osd pool rm device_health_metrics device_health_metrics --yes-i-really-really-mean-it
-
 # Take `orch device ls` and `orch ps` as ground truth.
 ceph orch device ls --refresh
 ceph orch ps --refresh

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/mgr-modules.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/mgr-modules.e2e-spec.ts
index 82c6878969935e787186961d320a55c4545a6536..e3b7ce3599fb3dfd21a050738d678182064bf99c 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/mgr-modules.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/mgr-modules.e2e-spec.ts
@@ -53,7 +53,7 @@ describe('Manager modules page', () => {
         {
           id: 'pool_name',
           newValue: 'sox',
-          oldValue: 'device_health_metrics'
+          oldValue: '.mgr'
         },
         {
           id: 'retention_period',