Backport fix ups for Zed

Author: markgoddard

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 %i' % (fmt, fn, size),
+            'qemu-img create -f %s %s %s %i' % (fmt, opt, fn, size),
             shell=True)
         return fn
 

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)