zuul/zuul
Code Issues Proposed changes

Fix ResourceWarnings in the executor server

Browse Source 
We have two open() calls in the executor server without matching
close() calls. Fix this by wrapping both in a with context manager.

Change-Id: I0e51c2b22ea1540484851f98749e648728b26406
This commit is contained in:
Clark Boylan 2023-02-07 16:09:08 -08:00
parent 26523d8e56
commit 045bb270c0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zuul/executor/server.py
View File

@ -1888,7 +1888,8 @@ class AnsibleJob(object):
logfile=json_output))
return
try:
output = json.load(open(json_output, 'r'))
with open(json_output, 'r') as f:
output = json.load(f)
last_playbook = output[-1]
# Transform json to yaml - because it's easier to read and given
# the size of the data it'll be extra-hard to read this as an
@ -2332,7 +2333,8 @@ class AnsibleJob(object):
def prepareKubeConfig(self, jobdir, data):
kube_cfg_path = jobdir.kubeconfig
if os.path.exists(kube_cfg_path):
kube_cfg = yaml.safe_load(open(kube_cfg_path))
with open(kube_cfg_path) as f:
kube_cfg = yaml.safe_load(f)
else:
kube_cfg = {
'apiVersion': 'v1',