Rename test classes for consistency

Change-Id: I42f8664eaca5f025a87212d9455df15db7fce032

17 files changed, 37 insertions, 37 deletions

diff --git a/heat/tests/clients/test_ceilometer_client.py b/heat/tests/clients/test_ceilometer_client.py
index 4be63ba61..4ab98d99c 100644
--- a/heat/tests/clients/test_ceilometer_client.py
+++ b/heat/tests/clients/test_ceilometer_client.py
@@ -17,7 +17,7 @@ from heat.tests import common
 from heat.tests import utils
 
 
-class CeilometerClientPluginTests(common.HeatTestCase):
+class CeilometerClientPluginTest(common.HeatTestCase):
 
     def test_create(self):
         self.patchobject(cc.HTTPClient, 'client_request')
diff --git a/heat/tests/clients/test_cinder_client.py b/heat/tests/clients/test_cinder_client.py
index 98c089395..9d90a2376 100644
--- a/heat/tests/clients/test_cinder_client.py
+++ b/heat/tests/clients/test_cinder_client.py
@@ -22,11 +22,11 @@ from heat.tests import common
 from heat.tests import utils
 
 
-class CinderClientPluginTests(common.HeatTestCase):
+class CinderClientPluginTest(common.HeatTestCase):
     """Basic tests for :module:'heat.engine.clients.os.cinder'."""
 
     def setUp(self):
-        super(CinderClientPluginTests, self).setUp()
+        super(CinderClientPluginTest, self).setUp()
         self.cinder_client = mock.MagicMock()
         con = utils.dummy_context()
         c = con.clients
diff --git a/heat/tests/clients/test_glance_client.py b/heat/tests/clients/test_glance_client.py
index 964a0f94c..36443e7fa 100644
--- a/heat/tests/clients/test_glance_client.py
+++ b/heat/tests/clients/test_glance_client.py
@@ -22,11 +22,11 @@ from heat.tests import common
 from heat.tests import utils
 
 
-class GlanceUtilsTests(common.HeatTestCase):
+class GlanceUtilsTest(common.HeatTestCase):
     """Basic tests for :module:'heat.engine.resources.clients.os.glance'."""
 
     def setUp(self):
-        super(GlanceUtilsTests, self).setUp()
+        super(GlanceUtilsTest, self).setUp()
         self.glance_client = mock.MagicMock()
         con = utils.dummy_context()
         c = con.clients
diff --git a/heat/tests/clients/test_magnum_client.py b/heat/tests/clients/test_magnum_client.py
index 8f07d4b9f..9eac08358 100644
--- a/heat/tests/clients/test_magnum_client.py
+++ b/heat/tests/clients/test_magnum_client.py
@@ -20,7 +20,7 @@ from heat.tests import utils
 magnum_client = importutils.try_import('magnumclient.v1.client')
 
 
-class MagnumClientPluginTests(common.HeatTestCase):
+class MagnumClientPluginTest(common.HeatTestCase):
 
     @testtools.skipIf(magnum_client is None, 'Tests the magnum client')
     def test_create(self):
diff --git a/heat/tests/clients/test_manila_client.py b/heat/tests/clients/test_manila_client.py
index ca1f52e09..d18179ae0 100644
--- a/heat/tests/clients/test_manila_client.py
+++ b/heat/tests/clients/test_manila_client.py
@@ -20,7 +20,7 @@ from heat.tests import common
 from heat.tests import utils
 
 
-class ManilaClientPluginTests(common.HeatTestCase):
+class ManilaClientPluginTest(common.HeatTestCase):
     scenarios = [
         ('share_type',
             dict(manager_name="share_types",
@@ -37,7 +37,7 @@ class ManilaClientPluginTests(common.HeatTestCase):
     ]
 
     def setUp(self):
-        super(ManilaClientPluginTests, self).setUp()
+        super(ManilaClientPluginTest, self).setUp()
         # mock client and plugin
         self.manila_client = mock.MagicMock()
         con = utils.dummy_context()
diff --git a/heat/tests/clients/test_mistral_client.py b/heat/tests/clients/test_mistral_client.py
index 615906228..890851c09 100644
--- a/heat/tests/clients/test_mistral_client.py
+++ b/heat/tests/clients/test_mistral_client.py
@@ -15,7 +15,7 @@ from heat.tests import common
 from heat.tests import utils
 
 
-class MistralClientPluginTests(common.HeatTestCase):
+class MistralClientPluginTest(common.HeatTestCase):
 
     def test_create(self):
         context = utils.dummy_context()
diff --git a/heat/tests/clients/test_neutron_client.py b/heat/tests/clients/test_neutron_client.py
index 69463e248..2dc6b01ba 100644
--- a/heat/tests/clients/test_neutron_client.py
+++ b/heat/tests/clients/test_neutron_client.py
@@ -35,9 +35,9 @@ class NeutronClientPluginTestCase(common.HeatTestCase):
         self.neutron_plugin._client = self.neutron_client
 
 
-class NeutronClientPluginTests(NeutronClientPluginTestCase):
+class NeutronClientPluginTest(NeutronClientPluginTestCase):
     def setUp(self):
-        super(NeutronClientPluginTests, self).setUp()
+        super(NeutronClientPluginTest, self).setUp()
         self.mock_find = self.patchobject(neutron.neutronV20,
                                           'find_resourceid_by_name_or_id')
         self.mock_find.return_value = 42
@@ -258,7 +258,7 @@ class NeutronProviderConstraintsValidate(common.HeatTestCase):
         self.assertFalse(constraint.validate("bar", ctx))
 
 
-class NeutronClientPluginExtensionsTests(NeutronClientPluginTestCase):
+class NeutronClientPluginExtensionsTest(NeutronClientPluginTestCase):
     """Tests for extensions in neutronclient."""
 
     def test_has_no_extension(self):
diff --git a/heat/tests/clients/test_nova_client.py b/heat/tests/clients/test_nova_client.py
index 84e1485f2..ecbe1c930 100644
--- a/heat/tests/clients/test_nova_client.py
+++ b/heat/tests/clients/test_nova_client.py
@@ -41,7 +41,7 @@ class NovaClientPluginTestCase(common.HeatTestCase):
         self.nova_plugin._client = self.nova_client
 
 
-class NovaClientPluginTests(NovaClientPluginTestCase):
+class NovaClientPluginTest(NovaClientPluginTestCase):
     """Basic tests for :module:'heat.engine.clients.os.nova'."""
 
     def test_create(self):
@@ -255,7 +255,7 @@ class NovaClientPluginTests(NovaClientPluginTestCase):
                           self.nova_plugin.absolute_limits)
 
 
-class NovaClientPluginRefreshServerTests(NovaClientPluginTestCase):
+class NovaClientPluginRefreshServerTest(NovaClientPluginTestCase):
     msg = ("ClientException: The server has either erred or is "
            "incapable of performing the requested operation.")
 
@@ -288,7 +288,7 @@ class NovaClientPluginRefreshServerTests(NovaClientPluginTestCase):
         server.get.assert_called_once_with()
 
 
-class NovaClientPluginFetchServerTests(NovaClientPluginTestCase):
+class NovaClientPluginFetchServerTest(NovaClientPluginTestCase):
 
     server = mock.Mock()
     # set explicitly as id and name has internal meaning in mock.Mock
@@ -328,7 +328,7 @@ class NovaClientPluginFetchServerTests(NovaClientPluginTestCase):
         self.nova_client.servers.get.assert_called_once_with(self.server.id)
 
 
-class NovaClientPluginCheckActiveTests(NovaClientPluginTestCase):
+class NovaClientPluginCheckActiveTest(NovaClientPluginTestCase):
 
     scenarios = [
         ('active', dict(
@@ -346,7 +346,7 @@ class NovaClientPluginCheckActiveTests(NovaClientPluginTestCase):
     ]
 
     def setUp(self):
-        super(NovaClientPluginCheckActiveTests, self).setUp()
+        super(NovaClientPluginCheckActiveTest, self).setUp()
         self.server = mock.Mock()
         self.server.id = '1234'
         self.server.status = self.status
@@ -387,7 +387,7 @@ class NovaClientPluginCheckActiveTests(NovaClientPluginTestCase):
         self.assertEqual(0, self.r_mock.call_count)
 
 
-class NovaClientPluginUserdataTests(NovaClientPluginTestCase):
+class NovaClientPluginUserdataTest(NovaClientPluginTestCase):
 
     def test_build_userdata(self):
         """Tests the build_userdata function."""
@@ -432,7 +432,7 @@ class NovaClientPluginUserdataTests(NovaClientPluginTestCase):
         self.assertIn('ec2-user', data)
 
 
-class NovaClientPluginMetadataTests(NovaClientPluginTestCase):
+class NovaClientPluginMetadataTest(NovaClientPluginTestCase):
 
     def test_serialize_string(self):
         original = {'test_key': 'simple string value'}
@@ -677,7 +677,7 @@ class ConsoleUrlsTest(common.HeatTestCase):
         self.console_method.assert_called_once_with(self.console_type)
 
 
-class NovaClientPluginExtensionsTests(NovaClientPluginTestCase):
+class NovaClientPluginExtensionsTest(NovaClientPluginTestCase):
     """Tests for extensions in novaclient."""
 
     def test_has_no_extensions(self):
diff --git a/heat/tests/clients/test_progress.py b/heat/tests/clients/test_progress.py
index 3237e785d..b1d0ef88c 100644
--- a/heat/tests/clients/test_progress.py
+++ b/heat/tests/clients/test_progress.py
@@ -15,10 +15,10 @@ from heat.engine.clients import progress
 from heat.tests import common
 
 
-class ServerUpdateProgressObjectTests(common.HeatTestCase):
+class ServerUpdateProgressObjectTest(common.HeatTestCase):
 
     def setUp(self):
-        super(ServerUpdateProgressObjectTests, self).setUp()
+        super(ServerUpdateProgressObjectTest, self).setUp()
         self.server_id = '1234'
         self.handler = 'test'
 
diff --git a/heat/tests/clients/test_sahara_client.py b/heat/tests/clients/test_sahara_client.py
index 5e0cf9b54..fbde71e2c 100644
--- a/heat/tests/clients/test_sahara_client.py
+++ b/heat/tests/clients/test_sahara_client.py
@@ -23,11 +23,11 @@ from heat.tests import common
 from heat.tests import utils
 
 
-class SaharaUtilsTests(common.HeatTestCase):
+class SaharaUtilsTest(common.HeatTestCase):
     """Basic tests :module:'heat.engine.resources.clients.os.sahara'."""
 
     def setUp(self):
-        super(SaharaUtilsTests, self).setUp()
+        super(SaharaUtilsTest, self).setUp()
         self.sahara_client = mock.MagicMock()
         con = utils.dummy_context()
         c = con.clients
diff --git a/heat/tests/clients/test_senlin_client.py b/heat/tests/clients/test_senlin_client.py
index e241e7169..cd9393cbc 100644
--- a/heat/tests/clients/test_senlin_client.py
+++ b/heat/tests/clients/test_senlin_client.py
@@ -19,7 +19,7 @@ from heat.tests import utils
 from senlinclient.common import exc
 
 
-class SenlinClientPluginTests(common.HeatTestCase):
+class SenlinClientPluginTest(common.HeatTestCase):
 
     def test_cluster_get(self):
         context = utils.dummy_context()
diff --git a/heat/tests/clients/test_swift_client.py b/heat/tests/clients/test_swift_client.py
index ba5177e33..2e587e12b 100644
--- a/heat/tests/clients/test_swift_client.py
+++ b/heat/tests/clients/test_swift_client.py
@@ -33,7 +33,7 @@ class SwiftClientPluginTestCase(common.HeatTestCase):
         self.swift_plugin._client = self.swift_client
 
 
-class SwiftUtilsTests(SwiftClientPluginTestCase):
+class SwiftUtilsTest(SwiftClientPluginTestCase):
 
     def test_is_valid_temp_url_path(self):
 
diff --git a/heat/tests/clients/test_zaqar_client.py b/heat/tests/clients/test_zaqar_client.py
index 3122e2153..794d96a70 100644
--- a/heat/tests/clients/test_zaqar_client.py
+++ b/heat/tests/clients/test_zaqar_client.py
@@ -19,7 +19,7 @@ from heat.tests import common
 from heat.tests import utils
 
 
-class ZaqarClientPluginTests(common.HeatTestCase):
+class ZaqarClientPluginTest(common.HeatTestCase):
 
     def test_create(self):
         context = utils.dummy_context()
diff --git a/heat/tests/openstack/heat/test_resource_chain.py b/heat/tests/openstack/heat/test_resource_chain.py
index 7d9046ea1..616027d6f 100644
--- a/heat/tests/openstack/heat/test_resource_chain.py
+++ b/heat/tests/openstack/heat/test_resource_chain.py
@@ -40,10 +40,10 @@ TEMPLATE = {
 }
 
 
-class ResourceChainTests(common.HeatTestCase):
+class ResourceChainTest(common.HeatTestCase):
 
     def setUp(self):
-        super(ResourceChainTests, self).setUp()
+        super(ResourceChainTest, self).setUp()
 
         self.stack = None  # hold on to stack to prevent weakref cleanup
 
diff --git a/heat/tests/test_crypt.py b/heat/tests/test_crypt.py
index 165c6a853..22de431ab 100644
--- a/heat/tests/test_crypt.py
+++ b/heat/tests/test_crypt.py
@@ -20,7 +20,7 @@ from heat.common import exception
 from heat.tests import common
 
 
-class CryptTests(common.HeatTestCase):
+class CryptTest(common.HeatTestCase):
 
     def test_fernet_key(self):
         key = 'x' * 16
diff --git a/heat/tests/test_lifecycle_plugin_utils.py b/heat/tests/test_lifecycle_plugin_utils.py
index 2d17933e4..cf8c267db 100644
--- a/heat/tests/test_lifecycle_plugin_utils.py
+++ b/heat/tests/test_lifecycle_plugin_utils.py
@@ -26,7 +26,7 @@ resources:
 '''
 
 
-class LifecyclePluginUtilsTests(common.HeatTestCase):
+class LifecyclePluginUtilsTest(common.HeatTestCase):
     """Basic tests for :module:'heat.common.lifecycle_plugin_utils'.
 
     Basic tests for the helper methods in
@@ -34,10 +34,10 @@ class LifecyclePluginUtilsTests(common.HeatTestCase):
     """
 
     def setUp(self):
-        super(LifecyclePluginUtilsTests, self).setUp()
+        super(LifecyclePluginUtilsTest, self).setUp()
 
     def tearDown(self):
-        super(LifecyclePluginUtilsTests, self).tearDown()
+        super(LifecyclePluginUtilsTest, self).tearDown()
         lifecycle_plugin_utils.pp_class_instances = None
 
     def mock_lcp_class_map(self, lcp_mappings):
diff --git a/heat/tests/test_metadata_refresh.py b/heat/tests/test_metadata_refresh.py
index 3f9893250..a18383618 100644
--- a/heat/tests/test_metadata_refresh.py
+++ b/heat/tests/test_metadata_refresh.py
@@ -142,7 +142,7 @@ resources:
 '''
 
 
-class MetadataRefreshTests(common.HeatTestCase):
+class MetadataRefreshTest(common.HeatTestCase):
 
     @mock.patch.object(instance.Instance, 'handle_create')
     @mock.patch.object(instance.Instance, 'check_create_complete')
@@ -201,10 +201,10 @@ class MetadataRefreshTests(common.HeatTestCase):
         return tmp['/tmp/random_file']['content']
 
 
-class WaitConditionMetadataUpdateTests(common.HeatTestCase):
+class WaitConditionMetadataUpdateTest(common.HeatTestCase):
 
     def setUp(self):
-        super(WaitConditionMetadataUpdateTests, self).setUp()
+        super(WaitConditionMetadataUpdateTest, self).setUp()
         self.man = service.EngineService('a-host', 'a-topic')
         self.man.create_periodic_tasks()
 
@@ -286,7 +286,7 @@ class WaitConditionMetadataUpdateTests(common.HeatTestCase):
         self.assertEqual(2, mock_check.call_count)
 
 
-class MetadataRefreshServerTests(common.HeatTestCase):
+class MetadataRefreshServerTest(common.HeatTestCase):
 
     @mock.patch.object(Server, 'handle_create')
     @mock.patch.object(Server, 'check_create_complete')