openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Address python3 string issues with subprocess"

This commit is contained in:
Zuul 2019-01-29 12:31:01 +00:00 committed by Gerrit Code Review
parent 7966041442 b7c58aa97f
commit 607a9604a2
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tripleo_common/image/image_uploader.py
View File

@ -1219,7 +1219,8 @@ class PythonImageUploader(BaseImageUploader):
cmd.append(pull_source)
LOG.info('Running %s' % ' '.join(cmd))
env = os.environ.copy()
process = subprocess.Popen(cmd, env=env, stdout=subprocess.PIPE)
process = subprocess.Popen(cmd, env=env, stdout=subprocess.PIPE,
universal_newlines=True)
out, err = process.communicate()
LOG.info(out)
@ -1507,7 +1508,8 @@ class PythonImageUploader(BaseImageUploader):
cmd = ['podman', 'rmi', image_url.path]
LOG.info('Running %s' % ' '.join(cmd))
env = os.environ.copy()
process = subprocess.Popen(cmd, env=env, stdout=subprocess.PIPE)
process = subprocess.Popen(cmd, env=env, stdout=subprocess.PIPE,
universal_newlines=True)
out, err = process.communicate()
LOG.info(out)

3
tripleo_common/tests/image/test_image_uploader.py
View File

@ -2075,7 +2075,8 @@ class TestPythonImageUploader(base.TestCase):
'podman',
'rmi',
'/t/nova-api:latest'],
env={}, stdout=-1
env={}, stdout=-1,
universal_newlines=True
)
@mock.patch('tripleo_common.image.image_uploader.'