From 15668b98591bc3f8f58c4e5553aa09af358f5b94 Mon Sep 17 00:00:00 2001 From: Andrew McLeod Date: Thu, 16 Nov 2017 11:36:31 +1300 Subject: [PATCH] Make default func27-smoke xenial-pike Fix bare except for pep8 Change-Id: I79fec4d6c02e5614aa49bcc2439b82767d1283c4 --- src/lib/charm/openstack/tempest.py | 2 +- src/tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/charm/openstack/tempest.py b/src/lib/charm/openstack/tempest.py index 7c1a9db..ebae0cb 100644 --- a/src/lib/charm/openstack/tempest.py +++ b/src/lib/charm/openstack/tempest.py @@ -328,7 +328,7 @@ class TempestAdminAdapter(adapters.OpenStackRelationAdapter): # If not running in an action context asssume auto mode try: action_args = hookenv.action_get() - except: + except Exception as e: action_args = {'service-whitelist': 'auto'} if action_args['service-whitelist'] == 'auto': white_list = [] diff --git a/src/tox.ini b/src/tox.ini index 276db2f..f201a20 100644 --- a/src/tox.ini +++ b/src/tox.ini @@ -35,7 +35,7 @@ commands = # Run a specific test as an Amulet smoke test (expected to always pass) basepython = python2.7 commands = - bundletester -vl DEBUG -r json -o func-results.json gate-basic-xenial-mitaka --no-destroy + bundletester -vl DEBUG -r json -o func-results.json gate-basic-xenial-pike --no-destroy [testenv:func27-dfs] # Run all deploy-from-source tests which are +x (may not always pass!)