Remove actions.config and AnsibleGenerateInventoryAction references
I493ec949e09a1a1a1745f4bf161bc6d3dc185e1e removed tripleo_common.actions.config so these no longer should be mocked. This causes build failures in dlrn. If5053530eeadd277db091d60bc9095aa7f05d67f removed AnsibleGenerateInventoryAction so we don't need to mock it. Closes-Bug: #1884138 Change-Id: I9558f70d333b340bbd81065f014fc207f5ac6563
This commit is contained in:
parent
9806e3908b
commit
adf29a1e70
@ -186,26 +186,6 @@ class FakePlaybookExecution(utils.TestCommand):
|
||||
self.execution.id = "IDID"
|
||||
self.workflow.executions.create.return_value = self.execution
|
||||
|
||||
config_mock = mock.patch(
|
||||
'tripleo_common.actions.config.GetOvercloudConfig',
|
||||
autospec=True
|
||||
)
|
||||
config_mock.start()
|
||||
self.addCleanup(config_mock.stop)
|
||||
|
||||
self.ansible = mock.patch(
|
||||
'tripleo_common.actions.ansible.AnsibleGenerateInventoryAction',
|
||||
autospec=True
|
||||
)
|
||||
self.ansible.start()
|
||||
self.addCleanup(self.ansible.stop)
|
||||
|
||||
self.config_action = mock.patch(
|
||||
'tripleo_common.actions.config.DownloadConfigAction',
|
||||
autospec=True
|
||||
)
|
||||
self.config_action.start()
|
||||
self.addCleanup(self.config_action.stop)
|
||||
get_key = mock.patch('tripleoclient.utils.get_key')
|
||||
get_key.start()
|
||||
get_key.return_value = 'keyfile-path'
|
||||
|
@ -37,24 +37,6 @@ class TestDeploymentWorkflows(utils.TestCommand):
|
||||
tc.create_mistral_context = plugin.ClientWrapper(
|
||||
instance=FakeInstanceData
|
||||
).create_mistral_context
|
||||
self.gcn = mock.patch(
|
||||
'tripleo_common.actions.config.DownloadConfigAction',
|
||||
autospec=True
|
||||
)
|
||||
self.gcn.start()
|
||||
self.addCleanup(self.gcn.stop)
|
||||
self.ansible = mock.patch(
|
||||
'tripleo_common.actions.ansible.AnsibleGenerateInventoryAction',
|
||||
autospec=True
|
||||
)
|
||||
self.ansible.start()
|
||||
self.addCleanup(self.ansible.stop)
|
||||
config_mock = mock.patch(
|
||||
'tripleo_common.actions.config.GetOvercloudConfig',
|
||||
autospec=True
|
||||
)
|
||||
config_mock.start()
|
||||
self.addCleanup(config_mock.stop)
|
||||
self.message_success = iter([{
|
||||
"execution": {"id": "IDID"},
|
||||
"status": "SUCCESS",
|
||||
|
Loading…
Reference in New Issue
Block a user