From 7cbee4d725f5da9dc31efdcb6e56ae84858658a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfonso=20Mart=C3=ADnez?= <almartin@redhat.com>
Date: Thu, 20 Feb 2020 10:47:38 +0100
Subject: [PATCH] mgr/dashboard: fix tasks.mgr.dashboard.test_rgw suite
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: https://tracker.ceph.com/issues/44201
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
---
 qa/tasks/mgr/dashboard/test_rgw.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/qa/tasks/mgr/dashboard/test_rgw.py b/qa/tasks/mgr/dashboard/test_rgw.py
index 7976b96acb7..dca9e3cf45c 100644
--- a/qa/tasks/mgr/dashboard/test_rgw.py
+++ b/qa/tasks/mgr/dashboard/test_rgw.py
@@ -25,6 +25,7 @@ class RgwTestCase(DashboardTestCase):
             '--system', '--access-key', 'admin', '--secret', 'admin'
         ])
         # Update the dashboard configuration.
+        cls._ceph_cmd(['dashboard', 'set-rgw-api-user-id', 'admin'])
         cls._ceph_cmd(['dashboard', 'set-rgw-api-secret-key', 'admin'])
         cls._ceph_cmd(['dashboard', 'set-rgw-api-access-key', 'admin'])
         # Create a test user?
@@ -50,6 +51,8 @@ class RgwTestCase(DashboardTestCase):
 
     @classmethod
     def tearDownClass(cls):
+        # Delete administrator account.
+        cls._radosgw_admin_cmd(['user', 'rm', '--uid', 'admin'])
         if cls.create_test_user:
             cls._radosgw_admin_cmd(['user', 'rm', '--uid=teuth-test-user'])
         super(RgwTestCase, cls).tearDownClass()
@@ -304,7 +307,7 @@ class RgwBucketTest(RgwTestCase):
         self.assertEqual(len(data), 0)
 
 
-class RgwDaemonTest(DashboardTestCase):
+class RgwDaemonTest(RgwTestCase):
 
     AUTH_ROLES = ['rgw-manager']
 
@@ -338,14 +341,6 @@ class RgwDaemonTest(DashboardTestCase):
         self.assertTrue(data['rgw_metadata'])
 
     def test_status(self):
-        self._radosgw_admin_cmd([
-            'user', 'create', '--uid=admin', '--display-name=admin',
-            '--system', '--access-key=admin', '--secret=admin'
-        ])
-        self._ceph_cmd(['dashboard', 'set-rgw-api-user-id', 'admin'])
-        self._ceph_cmd(['dashboard', 'set-rgw-api-secret-key', 'admin'])
-        self._ceph_cmd(['dashboard', 'set-rgw-api-access-key', 'admin'])
-
         data = self._get('/api/rgw/status')
         self.assertStatus(200)
         self.assertIn('available', data)