From 9e24be435e567f92bb0266c9734b5fd5fdb6ee55 Mon Sep 17 00:00:00 2001 From: David Ames Date: Tue, 11 Sep 2018 07:51:24 -0700 Subject: [PATCH] Fix launch_small_instance in charm_tests --- zaza/charm_tests/nova/tests.py | 6 +++--- zaza/charm_tests/series_upgrade/tests.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zaza/charm_tests/nova/tests.py b/zaza/charm_tests/nova/tests.py index 2038a60..f7ef1ff 100644 --- a/zaza/charm_tests/nova/tests.py +++ b/zaza/charm_tests/nova/tests.py @@ -112,7 +112,7 @@ class BaseGuestCreateTest(unittest.TestCase): class CirrosGuestCreateTest(BaseGuestCreateTest): """Tests to launch a cirros image.""" - def test_launch_small_cirros_instance(self): + def test_launch_small_instance(self): """Launch a cirros instance and test connectivity.""" self.launch_instance(glance_setup.CIRROS_IMAGE_NAME) @@ -120,6 +120,6 @@ class CirrosGuestCreateTest(BaseGuestCreateTest): class LTSGuestCreateTest(BaseGuestCreateTest): """Tests to launch a LTS image.""" - def test_launch_small_cirros_instance(self): - """Launch a cirros instance and test connectivity.""" + def test_launch_small_instance(self): + """Launch a Bionic instance and test connectivity.""" self.launch_instance(glance_setup.LTS_IMAGE_NAME) diff --git a/zaza/charm_tests/series_upgrade/tests.py b/zaza/charm_tests/series_upgrade/tests.py index 79d652e..c61d48a 100644 --- a/zaza/charm_tests/series_upgrade/tests.py +++ b/zaza/charm_tests/series_upgrade/tests.py @@ -40,7 +40,7 @@ class SeriesUpgradeTest(unittest.TestCase): def validate_pre_series_upgrade_cloud(self): """Validate pre series upgrade.""" logging.info("Validate pre-series-upgrade: Spin up LTS instance") - self.lts.test_launch_small_cirros_instance() + self.lts.test_launch_small_instance() def test_200_run_series_upgrade(self): """Run series upgrade.""" @@ -92,7 +92,7 @@ class SeriesUpgradeTest(unittest.TestCase): def validate_series_upgraded_cloud(self): """Validate post series upgrade.""" logging.info("Validate post-series-upgrade: Spin up LTS instance") - self.lts.test_launch_small_cirros_instance() + self.lts.test_launch_small_instance() if __name__ == "__main__":