Merge "Add a hacking rule for string interpolation at logging"
This commit is contained in:
commit
f30473a4ea
|
@ -46,9 +46,11 @@ class ActionExecutionTestsV2(base.TestCase):
|
||||||
try:
|
try:
|
||||||
cls.client.delete_obj('action_executions', action_ex)
|
cls.client.delete_obj('action_executions', action_ex)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.exception('Exception raised when deleting '
|
LOG.exception(
|
||||||
'action_executions %s, error message: %s.'
|
'Exception raised when deleting '
|
||||||
% (action_ex, six.text_type(e)))
|
'action_executions %s, error message: %s.',
|
||||||
|
action_ex, six.text_type(e)
|
||||||
|
)
|
||||||
|
|
||||||
cls.client.action_executions = []
|
cls.client.action_executions = []
|
||||||
|
|
||||||
|
|
|
@ -100,7 +100,7 @@ class SSHActionsTestsV2(base.TestCaseAdvanced):
|
||||||
def _wait_until_server_up(cls, server_ip, timeout=120, delay=2):
|
def _wait_until_server_up(cls, server_ip, timeout=120, delay=2):
|
||||||
seconds_remain = timeout
|
seconds_remain = timeout
|
||||||
|
|
||||||
LOG.info("Waiting server SSH [IP=%s]..." % server_ip)
|
LOG.info("Waiting server SSH [IP=%s]...", server_ip)
|
||||||
|
|
||||||
while seconds_remain > 0:
|
while seconds_remain > 0:
|
||||||
try:
|
try:
|
||||||
|
@ -123,7 +123,7 @@ class SSHActionsTestsV2(base.TestCaseAdvanced):
|
||||||
def _wait_until_server_active(cls, server_id, timeout=60, delay=2):
|
def _wait_until_server_active(cls, server_id, timeout=60, delay=2):
|
||||||
seconds_remain = timeout
|
seconds_remain = timeout
|
||||||
|
|
||||||
LOG.info("Waiting server [id=%s]..." % server_id)
|
LOG.info("Waiting server [id=%s]...", server_id)
|
||||||
|
|
||||||
while seconds_remain > 0:
|
while seconds_remain > 0:
|
||||||
server_info = cls.mgr.servers_client.show_server(server_id)
|
server_info = cls.mgr.servers_client.show_server(server_id)
|
||||||
|
@ -141,7 +141,7 @@ class SSHActionsTestsV2(base.TestCaseAdvanced):
|
||||||
def _wait_until_server_delete(cls, server_id, timeout=60, delay=2):
|
def _wait_until_server_delete(cls, server_id, timeout=60, delay=2):
|
||||||
seconds_remain = timeout
|
seconds_remain = timeout
|
||||||
|
|
||||||
LOG.info("Deleting server [id=%s]..." % server_id)
|
LOG.info("Deleting server [id=%s]...", server_id)
|
||||||
|
|
||||||
while seconds_remain > 0:
|
while seconds_remain > 0:
|
||||||
try:
|
try:
|
||||||
|
@ -181,9 +181,7 @@ class SSHActionsTestsV2(base.TestCaseAdvanced):
|
||||||
overwrite=True
|
overwrite=True
|
||||||
)
|
)
|
||||||
|
|
||||||
LOG.info(
|
LOG.info("Private key saved to %s", cls.key_dir + cls.key_name)
|
||||||
"Private key saved to %s" % cls.key_dir + cls.key_name
|
|
||||||
)
|
|
||||||
|
|
||||||
# Create keypair in nova.
|
# Create keypair in nova.
|
||||||
cls.mgr.keypairs_client.create_keypair(
|
cls.mgr.keypairs_client.create_keypair(
|
||||||
|
|
Loading…
Reference in New Issue