From d5d539da8141ad5557bb32c89a6bbf4d591ec830 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 3 Jun 2015 10:37:17 -0700 Subject: [PATCH] Remove hacking select line Contrary to popular belief, this does not mean "also check this". It means "only check this and don't check anything else". So this was testing _only_ H321. Change-Id: I8ae173e62d57232cec1bf751004fe4213214353b --- shade/__init__.py | 6 +++--- tox.ini | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/shade/__init__.py b/shade/__init__.py index 7e0e05ae5..37e5b305f 100644 --- a/shade/__init__.py +++ b/shade/__init__.py @@ -331,7 +331,7 @@ class OpenStackCloud(object): self.log.debug("keystone auth plugin failure", exc_info=True) raise OpenStackCloudException( "Could not find auth plugin: {plugin}".format( - plugin=self.auth_type)) + plugin=self.auth_type)) try: keystone_auth = auth_plugin(**self.auth) except Exception as e: @@ -1882,7 +1882,7 @@ class OpenStackCloud(object): self.log.debug( "swift object up to date: {container}/{name}".format( - container=container, name=name)) + container=container, name=name)) return False def create_object( @@ -2336,7 +2336,7 @@ class OperatorCloud(OpenStackCloud): _tasks.MachinePortDelete( port_id=( self.ironic_client.port.get_by_address(nic['mac']) - ))) + ))) except Exception as e: self.log.debug( diff --git a/tox.ini b/tox.ini index d473d9ffa..a01094d13 100644 --- a/tox.ini +++ b/tox.ini @@ -33,7 +33,6 @@ commands = python setup.py testr --coverage --testr-args='{posargs}' [flake8] # Infra does not follow hacking, nor the broken E12* things ignore = E123,E125,H -select = H231 show-source = True builtins = _ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build