From 64a87fdd2e72e93ccc21f1f24316442041f15d5b Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 13 Dec 2024 16:34:45 +0100 Subject: [PATCH] Revert "Backport fix ups for Zed" This reverts commit 1ae4324749595c66f7f0ca836618c7e7c6b5e77b. --- glance/tests/unit/common/test_format_inspector.py | 2 +- glance/tests/unit/v2/test_tasks_resource.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/glance/tests/unit/common/test_format_inspector.py b/glance/tests/unit/common/test_format_inspector.py index fce9a1a973..f2e49037d1 100644 --- a/glance/tests/unit/common/test_format_inspector.py +++ b/glance/tests/unit/common/test_format_inspector.py @@ -77,7 +77,7 @@ def _create_img(self, fmt, size, subformat=None, options=None, suffix='.%s' % fmt) self._created_files.append(fn) subprocess.check_output( - 'qemu-img create -f %s %s %s %i' % (fmt, opt, fn, size), + 'qemu-img create -f %s %s %i' % (fmt, fn, size), shell=True) return fn diff --git a/glance/tests/unit/v2/test_tasks_resource.py b/glance/tests/unit/v2/test_tasks_resource.py index 15562724b7..754612b11f 100644 --- a/glance/tests/unit/v2/test_tasks_resource.py +++ b/glance/tests/unit/v2/test_tasks_resource.py @@ -415,8 +415,8 @@ def test_create_with_wrong_import_form(self): "non-local source of image data.") else: supported = ['http', ] - msg = ("The given URI is not valid. Please specify a " - "valid URI from the following list of supported URI " + msg = ("The given uri is not valid. Please specify a " + "valid uri from the following list of supported uri " "%(supported)s") % {'supported': supported} self.assertEqual(msg, final_task.message)