Update functional test definitions

Change-Id: I05558975572ec4f0f1ef99c8955009f7985f4d29

src/tests/basic_deployment.py

@@ -50,7 +50,7 @@ class KeystoneLDAPCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
         this_service = {'name': 'keystone-ldap'}
         other_services = [
             {'name': 'keystone'},
-            {'name': 'percona-cluster'},
+            self.get_percona_service_entry(),
             {'name': 'ldap-server',
              'location': 'cs:~openstack-charmers/ldap-test-fixture'},
         ]

src/tests/dev-basic-cosmic-rocky

@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2017 Canonical Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Amulet tests on a basic Keystone LDAP Charm deployment on cosmic-rocky."""
-
-from basic_deployment import KeystoneLDAPCharmDeployment
-
-if __name__ == '__main__':
-    deployment = KeystoneLDAPCharmDeployment(series='cosmic')
-    deployment.run_tests()

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-bionic-rocky --no-destroy
+    bundletester -vl DEBUG -r json -o func-results.json gate-basic-bionic-stein --no-destroy
 
 [testenv:func27-dfs]
 # Run all deploy-from-source tests which are +x (may not always pass!)