RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #33426 into master

Browse Source 
* refs/pull/33426/head:
	mgr/dashboard: fix tasks.mgr.dashboard.test_rgw suite

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2020-02-20 20:01:55 -06:00
commit 24f4094b73
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qa/tasks/mgr/dashboard/test_rgw.py
View File

@ -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)