From 187d2b06bc474abdd9b0215760cec6bad31ef431 Mon Sep 17 00:00:00 2001 From: Andrey Kurilin Date: Wed, 2 Sep 2015 16:02:32 +0300 Subject: [PATCH] [Bug-Fix]: Remove ability to put incorrect kwargs for an exception Also, this patch simplify `format_message` method of base Rally exception class Change-Id: Ia6ccd68bb7740ea43402e633017684d4df8c07fe Closes-Bug: #1491388 --- etc/rally/rally.conf.sample | 8 +++----- tests/unit/plugins/openstack/wrappers/test_network.py | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/etc/rally/rally.conf.sample b/etc/rally/rally.conf.sample index 5ed7edb2..95cd83df 100644 --- a/etc/rally/rally.conf.sample +++ b/etc/rally/rally.conf.sample @@ -47,8 +47,9 @@ # (Optional) Enables or disables syslog rfc5424 format for logging. If # enabled, prefixes the MSG part of the syslog message with APP-NAME -# (RFC5424). The format without the APP-NAME is deprecated in K, and -# will be removed in M, along with this option. (boolean value) +# (RFC5424). The format without the APP-NAME is deprecated in Kilo, +# and will be removed in Mitaka, along with this option. (boolean +# value) # This option is deprecated for removal. # Its value may be silently ignored in the future. #use_syslog_rfc_format = true @@ -98,9 +99,6 @@ # quiet. (boolean value) #rally_debug = false -# make exception message format errors fatal (boolean value) -#fatal_exception_format_errors = false - # HTTP timeout for any of OpenStack service in seconds (floating point # value) #openstack_client_http_timeout = 180.0 diff --git a/tests/unit/plugins/openstack/wrappers/test_network.py b/tests/unit/plugins/openstack/wrappers/test_network.py index 8cda76c4..da5c21a5 100644 --- a/tests/unit/plugins/openstack/wrappers/test_network.py +++ b/tests/unit/plugins/openstack/wrappers/test_network.py @@ -141,7 +141,7 @@ class NovaNetworkWrapperTestCase(test.TestCase): def get_fip(*args, **kwargs): for i in fip_found: return "fip_id" - raise exceptions.GetResourceNotFound + raise exceptions.GetResourceNotFound(resource="") wrap._get_floating_ip = mock.Mock(side_effect=get_fip) wrap.delete_floating_ip("fip_id")