openstack/rally-openstack
Code Issues Proposed changes

Merge "[cleanup] Restrict "admin_cleanup" to scenario resources only"

Browse Source
This commit is contained in:
Jenkins
2017-03-29 18:09:57 +00:00
committed by Gerrit Code Review
parent f872cb60a8 2bb1d9dd7c
commit 8b30d4f5b8
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rally/plugins/openstack/context/cleanup/admin.py
View File

@@ -19,6 +19,7 @@ from rally.common.i18n import _
from rally.common import logging from rally.common import logging
from rally.plugins.openstack.cleanup import manager from rally.plugins.openstack.cleanup import manager
from rally.plugins.openstack.context.cleanup import base from rally.plugins.openstack.context.cleanup import base
from rally.plugins.openstack import scenario
from rally.task import context from rally.task import context
@@ -50,4 +51,5 @@ class AdminCleanup(base.CleanupMixin, context.Context):
admin=self.context["admin"], admin=self.context["admin"],
users=self.context.get("users", []), users=self.context.get("users", []),
api_versions=self.context["config"].get("api_versions"), api_versions=self.context["config"].get("api_versions"),
superclass=scenario.OpenStackScenario,
task_id=self.context["task"]["uuid"]) task_id=self.context["task"]["uuid"])

3
tests/unit/plugins/openstack/context/cleanup/test_admin.py
View File

@@ -19,6 +19,7 @@ import mock
from rally.common import utils from rally.common import utils
from rally.plugins.openstack.context.cleanup import admin from rally.plugins.openstack.context.cleanup import admin
from rally.plugins.openstack.context.cleanup import base from rally.plugins.openstack.context.cleanup import base
from rally.plugins.openstack import scenario
from tests.unit import test from tests.unit import test
@@ -68,6 +69,7 @@ class AdminCleanupTestCase(test.TestCase):
admin_cleanup.setup() admin_cleanup.setup()
admin_cleanup.cleanup() admin_cleanup.cleanup()
mock_itersubclasses.assert_called_once_with(scenario.OpenStackScenario)
mock_find_resource_managers.assert_called_once_with(("a", "b"), True) mock_find_resource_managers.assert_called_once_with(("a", "b"), True)
mock_seek_and_destroy.assert_has_calls([ mock_seek_and_destroy.assert_has_calls([
mock.call(mock_find_resource_managers.return_value[0], mock.call(mock_find_resource_managers.return_value[0],
@@ -118,6 +120,7 @@ class AdminCleanupTestCase(test.TestCase):
admin_cleanup.setup() admin_cleanup.setup()
admin_cleanup.cleanup() admin_cleanup.cleanup()
mock_itersubclasses.assert_called_once_with(scenario.OpenStackScenario)
mock_find_resource_managers.assert_called_once_with(("a", "b"), True) mock_find_resource_managers.assert_called_once_with(("a", "b"), True)
mock_seek_and_destroy.assert_has_calls([ mock_seek_and_destroy.assert_has_calls([
mock.call(mock_find_resource_managers.return_value[0], mock.call(mock_find_resource_managers.return_value[0],