update tests to enable pike

Also move gate to xenial-pike

Change-Id: Ib2a1b2a203d1e0393f44543c12924a6e0d427599

src/lib/charm/openstack/softhsm.py

@@ -188,7 +188,7 @@ def read_pins_from_store():
         pin = o['pin']
         so_pin = o['so_pin']
         return pin, so_pin
-    except:
+    except Exception:
         return None, None
 
 

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!)