From cde19f23b140ce8c2e54ee4a538bd4b1da4bdd12 Mon Sep 17 00:00:00 2001 From: Andrea Frittoli Date: Mon, 15 Sep 2014 13:31:14 +0100 Subject: [PATCH] Migrate cli tests to resource_* fixtures Partially-implements bp resource-cleanup Change-Id: Id1d516948508018e4fa5b36ae7c109a04ee33dcc --- tempest/cli/__init__.py | 4 ++-- tempest/cli/simple_read_only/compute/test_nova.py | 4 ++-- tempest/cli/simple_read_only/compute/test_nova_manage.py | 4 ++-- tempest/cli/simple_read_only/data_processing/test_sahara.py | 4 ++-- tempest/cli/simple_read_only/image/test_glance.py | 4 ++-- tempest/cli/simple_read_only/network/test_neutron.py | 4 ++-- tempest/cli/simple_read_only/object_storage/test_swift.py | 4 ++-- tempest/cli/simple_read_only/orchestration/test_heat.py | 4 ++-- tempest/cli/simple_read_only/telemetry/test_ceilometer.py | 4 ++-- tempest/cli/simple_read_only/volume/test_cinder.py | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tempest/cli/__init__.py b/tempest/cli/__init__.py index c33589a0c7..ca6d7fe6f5 100644 --- a/tempest/cli/__init__.py +++ b/tempest/cli/__init__.py @@ -94,11 +94,11 @@ def min_client_version(*args, **kwargs): class ClientTestBase(tempest.test.BaseTestCase): @classmethod - def setUpClass(cls): + def resource_setup(cls): if not CONF.cli.enabled: msg = "cli testing disabled" raise cls.skipException(msg) - super(ClientTestBase, cls).setUpClass() + super(ClientTestBase, cls).resource_setup() def __init__(self, *args, **kwargs): self.parser = tempest.cli.output_parser diff --git a/tempest/cli/simple_read_only/compute/test_nova.py b/tempest/cli/simple_read_only/compute/test_nova.py index 9bac7a6668..6e5e077328 100644 --- a/tempest/cli/simple_read_only/compute/test_nova.py +++ b/tempest/cli/simple_read_only/compute/test_nova.py @@ -41,11 +41,11 @@ class SimpleReadOnlyNovaClientTest(cli.ClientTestBase): """ @classmethod - def setUpClass(cls): + def resource_setup(cls): if not CONF.service_available.nova: msg = ("%s skipped as Nova is not available" % cls.__name__) raise cls.skipException(msg) - super(SimpleReadOnlyNovaClientTest, cls).setUpClass() + super(SimpleReadOnlyNovaClientTest, cls).resource_setup() def test_admin_fake_action(self): self.assertRaises(exceptions.CommandFailed, diff --git a/tempest/cli/simple_read_only/compute/test_nova_manage.py b/tempest/cli/simple_read_only/compute/test_nova_manage.py index c27b12e30b..a415d04e89 100644 --- a/tempest/cli/simple_read_only/compute/test_nova_manage.py +++ b/tempest/cli/simple_read_only/compute/test_nova_manage.py @@ -36,7 +36,7 @@ class SimpleReadOnlyNovaManageTest(cli.ClientTestBase): """ @classmethod - def setUpClass(cls): + def resource_setup(cls): if not CONF.service_available.nova: msg = ("%s skipped as Nova is not available" % cls.__name__) raise cls.skipException(msg) @@ -44,7 +44,7 @@ class SimpleReadOnlyNovaManageTest(cli.ClientTestBase): msg = ("%s skipped as *-manage commands not available" % cls.__name__) raise cls.skipException(msg) - super(SimpleReadOnlyNovaManageTest, cls).setUpClass() + super(SimpleReadOnlyNovaManageTest, cls).resource_setup() def test_admin_fake_action(self): self.assertRaises(exceptions.CommandFailed, diff --git a/tempest/cli/simple_read_only/data_processing/test_sahara.py b/tempest/cli/simple_read_only/data_processing/test_sahara.py index 2c6e0e21bf..751a4ad13e 100644 --- a/tempest/cli/simple_read_only/data_processing/test_sahara.py +++ b/tempest/cli/simple_read_only/data_processing/test_sahara.py @@ -34,11 +34,11 @@ class SimpleReadOnlySaharaClientTest(cli.ClientTestBase): """ @classmethod - def setUpClass(cls): + def resource_setup(cls): if not CONF.service_available.sahara: msg = "Skipping all Sahara cli tests because it is not available" raise cls.skipException(msg) - super(SimpleReadOnlySaharaClientTest, cls).setUpClass() + super(SimpleReadOnlySaharaClientTest, cls).resource_setup() @test.attr(type='negative') def test_sahara_fake_action(self): diff --git a/tempest/cli/simple_read_only/image/test_glance.py b/tempest/cli/simple_read_only/image/test_glance.py index 2fd8212011..a9cbadb8ad 100644 --- a/tempest/cli/simple_read_only/image/test_glance.py +++ b/tempest/cli/simple_read_only/image/test_glance.py @@ -34,11 +34,11 @@ class SimpleReadOnlyGlanceClientTest(cli.ClientTestBase): """ @classmethod - def setUpClass(cls): + def resource_setup(cls): if not CONF.service_available.glance: msg = ("%s skipped as Glance is not available" % cls.__name__) raise cls.skipException(msg) - super(SimpleReadOnlyGlanceClientTest, cls).setUpClass() + super(SimpleReadOnlyGlanceClientTest, cls).resource_setup() def test_glance_fake_action(self): self.assertRaises(exceptions.CommandFailed, diff --git a/tempest/cli/simple_read_only/network/test_neutron.py b/tempest/cli/simple_read_only/network/test_neutron.py index 87f6b67f9a..f9f890632f 100644 --- a/tempest/cli/simple_read_only/network/test_neutron.py +++ b/tempest/cli/simple_read_only/network/test_neutron.py @@ -35,11 +35,11 @@ class SimpleReadOnlyNeutronClientTest(cli.ClientTestBase): """ @classmethod - def setUpClass(cls): + def resource_setup(cls): if (not CONF.service_available.neutron): msg = "Skipping all Neutron cli tests because it is not available" raise cls.skipException(msg) - super(SimpleReadOnlyNeutronClientTest, cls).setUpClass() + super(SimpleReadOnlyNeutronClientTest, cls).resource_setup() @test.attr(type='smoke') def test_neutron_fake_action(self): diff --git a/tempest/cli/simple_read_only/object_storage/test_swift.py b/tempest/cli/simple_read_only/object_storage/test_swift.py index 069a38413c..a1626607b6 100644 --- a/tempest/cli/simple_read_only/object_storage/test_swift.py +++ b/tempest/cli/simple_read_only/object_storage/test_swift.py @@ -31,11 +31,11 @@ class SimpleReadOnlySwiftClientTest(cli.ClientTestBase): """ @classmethod - def setUpClass(cls): + def resource_setup(cls): if not CONF.service_available.swift: msg = ("%s skipped as Swift is not available" % cls.__name__) raise cls.skipException(msg) - super(SimpleReadOnlySwiftClientTest, cls).setUpClass() + super(SimpleReadOnlySwiftClientTest, cls).resource_setup() def test_swift_fake_action(self): self.assertRaises(exceptions.CommandFailed, diff --git a/tempest/cli/simple_read_only/orchestration/test_heat.py b/tempest/cli/simple_read_only/orchestration/test_heat.py index 430cdf1ec0..7d7f8c9890 100644 --- a/tempest/cli/simple_read_only/orchestration/test_heat.py +++ b/tempest/cli/simple_read_only/orchestration/test_heat.py @@ -32,12 +32,12 @@ class SimpleReadOnlyHeatClientTest(tempest.cli.ClientTestBase): """ @classmethod - def setUpClass(cls): + def resource_setup(cls): if (not CONF.service_available.heat): msg = ("Skipping all Heat cli tests because it is " "not available") raise cls.skipException(msg) - super(SimpleReadOnlyHeatClientTest, cls).setUpClass() + super(SimpleReadOnlyHeatClientTest, cls).resource_setup() cls.heat_template_path = os.path.join(os.path.dirname( os.path.dirname(os.path.realpath(__file__))), 'heat_templates/heat_minimal.yaml') diff --git a/tempest/cli/simple_read_only/telemetry/test_ceilometer.py b/tempest/cli/simple_read_only/telemetry/test_ceilometer.py index 1d2822db9e..45b793b589 100644 --- a/tempest/cli/simple_read_only/telemetry/test_ceilometer.py +++ b/tempest/cli/simple_read_only/telemetry/test_ceilometer.py @@ -32,12 +32,12 @@ class SimpleReadOnlyCeilometerClientTest(cli.ClientTestBase): """ @classmethod - def setUpClass(cls): + def resource_setup(cls): if (not CONF.service_available.ceilometer): msg = ("Skipping all Ceilometer cli tests because it is " "not available") raise cls.skipException(msg) - super(SimpleReadOnlyCeilometerClientTest, cls).setUpClass() + super(SimpleReadOnlyCeilometerClientTest, cls).resource_setup() def test_ceilometer_meter_list(self): self.ceilometer('meter-list') diff --git a/tempest/cli/simple_read_only/volume/test_cinder.py b/tempest/cli/simple_read_only/volume/test_cinder.py index e44a577148..45f6c41a0d 100644 --- a/tempest/cli/simple_read_only/volume/test_cinder.py +++ b/tempest/cli/simple_read_only/volume/test_cinder.py @@ -35,11 +35,11 @@ class SimpleReadOnlyCinderClientTest(cli.ClientTestBase): """ @classmethod - def setUpClass(cls): + def resource_setup(cls): if not CONF.service_available.cinder: msg = ("%s skipped as Cinder is not available" % cls.__name__) raise cls.skipException(msg) - super(SimpleReadOnlyCinderClientTest, cls).setUpClass() + super(SimpleReadOnlyCinderClientTest, cls).resource_setup() def test_cinder_fake_action(self): self.assertRaises(exceptions.CommandFailed,