diff --git a/.testr.conf b/.testr.conf index 95245a5b..18c725e4 100644 --- a/.testr.conf +++ b/.testr.conf @@ -2,6 +2,8 @@ test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \ + OS_DEBUG=${OS_DEBUG:-1} \ + OS_LOG_CAPTURE=${OS_LOG_CAPTURE:-1} \ ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list diff --git a/fuel_ccp/cleanup.py b/fuel_ccp/cleanup.py index f911992e..84fee144 100644 --- a/fuel_ccp/cleanup.py +++ b/fuel_ccp/cleanup.py @@ -59,8 +59,7 @@ def _cleanup_servers(session): if server_list: LOG.warning("Some instances were not removed, trying to force delete") for server in server_list: - LOG.info('Force deleting instance %s (%s)', - (server.name, server.id)) + LOG.info('Force deleting instance %s (%s)', server.name, server.id) nova.servers.force_delete(server.id) server_list = _wait_until_empty( 60, None, nova.servers.list, search_opts={"all_tenants": True})