Enable functional tests for bionic-train

This patch also updates the smoke test to run bionic-train.

Also fix some comment typos in other function tests.

Change-Id: I3152cd6159a55a128be0ece8130e208da24dec6f

src/tests/gate-basic-bionic-rocky

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Amulet tests on a basic Keystone LDAP Charm deployment on bionic-mitaka."""
+"""Amulet tests on a basic Keystone LDAP Charm deployment on bionic-rocky."""
 
 from basic_deployment import KeystoneLDAPCharmDeployment
 

src/tests/gate-basic-bionic-stein

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Amulet tests on a basic Keystone LDAP Charm deployment on bionic-mitaka."""
+"""Amulet tests on a basic Keystone LDAP Charm deployment on bionic-stein."""
 
 from basic_deployment import KeystoneLDAPCharmDeployment
 

src/tests/gate-basic-bionic-train

@@ -0,0 +1,24 @@
+#!/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 bionic-train."""
+
+from basic_deployment import KeystoneLDAPCharmDeployment
+
+if __name__ == '__main__':
+    deployment = KeystoneLDAPCharmDeployment(series='bionic',
+                                             openstack='cloud:bionic-train')
+    deployment.run_tests()

src/tests/gate-basic-xenial-ocata

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Amulet tests on a basic Keystone LDAP Charm deployment on xenial-mitaka."""
+"""Amulet tests on a basic Keystone LDAP Charm deployment on xenial-ocata."""
 
 from basic_deployment import KeystoneLDAPCharmDeployment
 

src/tests/gate-basic-xenial-pike

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Amulet tests on a basic Keystone LDAP Charm deployment on xenial-mitaka."""
+"""Amulet tests on a basic Keystone LDAP Charm deployment on xenial-pike."""
 
 from basic_deployment import KeystoneLDAPCharmDeployment
 

src/tests/gate-basic-xenial-queens

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Amulet tests on a basic Keystone LDAP Charm deployment on xenial-mitaka."""
+"""Amulet tests on a basic Keystone LDAP Charm deployment on xenial-queens."""
 
 from basic_deployment import KeystoneLDAPCharmDeployment
 

src/tox.ini

@@ -43,7 +43,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-stein --no-destroy
+    bundletester -vl DEBUG -r json -o func-results.json gate-basic-bionic-train --no-destroy
 
 [testenv:func-dev]
 # Run all development test targets which are +x (may not always pass!)