From a24600385d76d06f27eeb38c75561f55b30b9b52 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Wed, 21 Jan 2015 22:41:24 -0500 Subject: [PATCH] Fix errors in string formatting operations Format specifier character "%s" missing in 2 places Format requires a mapping as the string has "%(path)" Change-Id: I4133649bb079013613cdfe7b6a1771ff7256532d --- nova/tests/unit/matchers.py | 2 +- nova/tests/unit/virt/libvirt/test_driver.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nova/tests/unit/matchers.py b/nova/tests/unit/matchers.py index a8842a9708..6db091178a 100644 --- a/nova/tests/unit/matchers.py +++ b/nova/tests/unit/matchers.py @@ -225,7 +225,7 @@ class XMLMismatch(object): self.actual = state.actual def describe(self): - return "%(path)s: XML does not match" % self.path + return "%(path)s: XML does not match" % {'path': self.path} def get_details(self): return { diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index 4ddab805fb..77815d83c2 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -10023,7 +10023,7 @@ Active: 8381604 kB elif method_name == "detach_interface": fake_image_meta = None else: - raise ValueError("Unhandled method %" % method_name) + raise ValueError("Unhandled method %s" % method_name) if method_name == "attach_interface": self.mox.StubOutWithMock(conn.firewall_driver, @@ -10049,7 +10049,7 @@ Active: 8381604 kB elif method_name == "detach_interface": conn.detach_interface(instance, network_info[0]) else: - raise ValueError("Unhandled method %" % method_name) + raise ValueError("Unhandled method %s" % method_name) @mock.patch.object(lockutils, "external_lock") def test_attach_interface_get_config(self, mock_lock):