Ensure files are closed, ensure no ResourceWarning on console
Fixes an issue wich cause warnings such as the one below on the console when using python3. ResourceWarning : unclosed file <_io.TextIOWrapper name='FILENAME' Closes-Bug: #1836379 Change-Id: I4a80a339b2cc0c3fca992cfc456581a91dbf2eef
This commit is contained in:
parent
cd42f44769
commit
317f3cff7d
|
@ -56,7 +56,7 @@ class TestOvercloudExternalUpdateRun(fakes.TestOvercloudExternalUpdateRun):
|
|||
update_ansible.assert_called_once_with(
|
||||
self.app.client_manager,
|
||||
nodes='all',
|
||||
inventory_file=mock_open().read(),
|
||||
inventory_file=mock_open().__enter__().read(),
|
||||
playbook='external_update_steps_playbook.yaml',
|
||||
node_user='tripleo-admin',
|
||||
tags='ceph',
|
||||
|
@ -88,7 +88,7 @@ class TestOvercloudExternalUpdateRun(fakes.TestOvercloudExternalUpdateRun):
|
|||
update_ansible.assert_called_once_with(
|
||||
self.app.client_manager,
|
||||
nodes='all',
|
||||
inventory_file=mock_open().read(),
|
||||
inventory_file=mock_open().__enter__().read(),
|
||||
playbook='external_update_steps_playbook.yaml',
|
||||
node_user='tripleo-admin',
|
||||
tags='',
|
||||
|
|
|
@ -56,7 +56,7 @@ class TestOvercloudExternalUpgradeRun(fakes.TestOvercloudExternalUpgradeRun):
|
|||
update_ansible.assert_called_once_with(
|
||||
self.app.client_manager,
|
||||
nodes='all',
|
||||
inventory_file=mock_open().read(),
|
||||
inventory_file=mock_open().__enter__().read(),
|
||||
playbook='external_upgrade_steps_playbook.yaml',
|
||||
node_user='tripleo-admin',
|
||||
tags='ceph',
|
||||
|
@ -88,7 +88,7 @@ class TestOvercloudExternalUpgradeRun(fakes.TestOvercloudExternalUpgradeRun):
|
|||
update_ansible.assert_called_once_with(
|
||||
self.app.client_manager,
|
||||
nodes='all',
|
||||
inventory_file=mock_open().read(),
|
||||
inventory_file=mock_open().__enter__().read(),
|
||||
playbook='external_upgrade_steps_playbook.yaml',
|
||||
node_user='tripleo-admin',
|
||||
tags='',
|
||||
|
|
|
@ -163,7 +163,7 @@ class TestFFWDUpgradeRun(fakes.TestFFWDUpgradeRun):
|
|||
self.cmd.take_action(parsed_args)
|
||||
upgrade_ansible.assert_called_once_with(
|
||||
self.app.client_manager,
|
||||
inventory_file=mock_open().read(),
|
||||
inventory_file=mock_open().__enter__().read(),
|
||||
nodes='',
|
||||
playbook=constants.FFWD_UPGRADE_PLAYBOOK,
|
||||
node_user='heat-admin',
|
||||
|
@ -190,7 +190,7 @@ class TestFFWDUpgradeRun(fakes.TestFFWDUpgradeRun):
|
|||
self.cmd.take_action(parsed_args)
|
||||
upgrade_ansible.assert_called_once_with(
|
||||
self.app.client_manager,
|
||||
inventory_file=mock_open().read(),
|
||||
inventory_file=mock_open().__enter__().read(),
|
||||
nodes='',
|
||||
playbook=constants.FFWD_UPGRADE_PLAYBOOK,
|
||||
node_user='my-user',
|
||||
|
|
|
@ -146,7 +146,7 @@ class TestOvercloudUpdateRun(fakes.TestOvercloudUpdateRun):
|
|||
update_ansible.assert_called_once_with(
|
||||
self.app.client_manager,
|
||||
nodes='Compute',
|
||||
inventory_file=mock_open().read(),
|
||||
inventory_file=mock_open().__enter__().read(),
|
||||
playbook='fake-playbook.yaml',
|
||||
node_user='tripleo-admin',
|
||||
tags='',
|
||||
|
@ -178,7 +178,7 @@ class TestOvercloudUpdateRun(fakes.TestOvercloudUpdateRun):
|
|||
update_ansible.assert_any_call(
|
||||
self.app.client_manager,
|
||||
nodes='Compute',
|
||||
inventory_file=mock_open().read(),
|
||||
inventory_file=mock_open().__enter__().read(),
|
||||
playbook=book,
|
||||
node_user='tripleo-admin',
|
||||
tags='',
|
||||
|
|
|
@ -177,7 +177,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun):
|
|||
upgrade_ansible.assert_called_once_with(
|
||||
self.app.client_manager,
|
||||
nodes='Compute, Controller',
|
||||
inventory_file=mock_open().read(),
|
||||
inventory_file=mock_open().__enter__().read(),
|
||||
playbook='fake-playbook.yaml',
|
||||
node_user='tripleo-admin',
|
||||
tags='',
|
||||
|
@ -211,7 +211,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun):
|
|||
upgrade_ansible.assert_any_call(
|
||||
self.app.client_manager,
|
||||
nodes='Compute',
|
||||
inventory_file=mock_open().read(),
|
||||
inventory_file=mock_open().__enter__().read(),
|
||||
playbook=book,
|
||||
node_user='tripleo-admin',
|
||||
tags='',
|
||||
|
@ -245,7 +245,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun):
|
|||
upgrade_ansible.assert_any_call(
|
||||
self.app.client_manager,
|
||||
nodes='Compute',
|
||||
inventory_file=mock_open().read(),
|
||||
inventory_file=mock_open().__enter__().read(),
|
||||
playbook=book,
|
||||
node_user='tripleo-admin',
|
||||
tags='validation',
|
||||
|
@ -277,7 +277,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun):
|
|||
upgrade_ansible.assert_called_once_with(
|
||||
self.app.client_manager,
|
||||
nodes='compute-0, compute-1',
|
||||
inventory_file=mock_open().read(),
|
||||
inventory_file=mock_open().__enter__().read(),
|
||||
playbook='fake-playbook.yaml',
|
||||
node_user='tripleo-admin',
|
||||
tags='',
|
||||
|
@ -309,7 +309,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun):
|
|||
upgrade_ansible.assert_any_call(
|
||||
self.app.client_manager,
|
||||
nodes='swift-1',
|
||||
inventory_file=mock_open().read(),
|
||||
inventory_file=mock_open().__enter__().read(),
|
||||
playbook=book,
|
||||
node_user='tripleo-admin',
|
||||
tags='',
|
||||
|
@ -343,7 +343,7 @@ class TestOvercloudUpgradeRun(fakes.TestOvercloudUpgradeRun):
|
|||
upgrade_ansible.assert_any_call(
|
||||
self.app.client_manager,
|
||||
nodes='swift-1',
|
||||
inventory_file=mock_open().read(),
|
||||
inventory_file=mock_open().__enter__().read(),
|
||||
playbook=book,
|
||||
node_user='tripleo-admin',
|
||||
tags='',
|
||||
|
|
|
@ -488,6 +488,10 @@ def wait_for_stack_ready(orchestration_client, stack_name, marker=None,
|
|||
continue
|
||||
log.error("Error occured while waiting for stack to be ready.")
|
||||
raise e
|
||||
finally:
|
||||
if not verbose:
|
||||
out.close()
|
||||
|
||||
raise RuntimeError(
|
||||
"wait_for_stack_ready: Max retries {} reached".format(max_retries))
|
||||
|
||||
|
@ -1157,7 +1161,8 @@ def get_tripleo_ansible_inventory(inventory_file='',
|
|||
message = _("Failed to generate inventory: %s") % str(e)
|
||||
raise exceptions.InvalidConfiguration(message)
|
||||
if os.path.exists(inventory_file):
|
||||
inventory = open(inventory_file, 'r').read()
|
||||
with open(inventory_file, "r") as f:
|
||||
inventory = f.read()
|
||||
return inventory
|
||||
else:
|
||||
raise exceptions.InvalidConfiguration(_(
|
||||
|
@ -1916,7 +1921,8 @@ def check_file_for_enabled_service(env_file):
|
|||
# ODL is enabled.
|
||||
|
||||
if os.path.exists(env_file):
|
||||
content = yaml.load(open(env_file))
|
||||
with open(env_file, "r") as f:
|
||||
content = yaml.load(f)
|
||||
deprecated_services_enabled = []
|
||||
for service in constants.DEPRECATED_SERVICES.keys():
|
||||
try:
|
||||
|
|
Loading…
Reference in New Issue