Merge "Replace wait with communicate to avoid potential deadlock"
diff --git a/tempest/api/baremetal/admin/base.py b/tempest/api/baremetal/admin/base.py
index 8efddcb..3b12b8e 100644
--- a/tempest/api/baremetal/admin/base.py
+++ b/tempest/api/baremetal/admin/base.py
@@ -53,8 +53,8 @@
"""Base class for Baremetal API tests."""
@classmethod
- def setUpClass(cls):
- super(BaseBaremetalTest, cls).setUpClass()
+ def resource_setup(cls):
+ super(BaseBaremetalTest, cls).resource_setup()
if not CONF.service_available.ironic:
skip_msg = ('%s skipped as Ironic is not available' % cls.__name__)
@@ -75,7 +75,7 @@
cls.created_objects[resource] = set()
@classmethod
- def tearDownClass(cls):
+ def resource_cleanup(cls):
"""Ensure that all created objects get destroyed."""
try:
@@ -85,7 +85,7 @@
for u in uuids:
delete_method(u, ignore_errors=exc.NotFound)
finally:
- super(BaseBaremetalTest, cls).tearDownClass()
+ super(BaseBaremetalTest, cls).resource_cleanup()
@classmethod
@creates('chassis')
diff --git a/tempest/api/baremetal/admin/test_chassis.py b/tempest/api/baremetal/admin/test_chassis.py
index 2131e78..6f83412 100644
--- a/tempest/api/baremetal/admin/test_chassis.py
+++ b/tempest/api/baremetal/admin/test_chassis.py
@@ -21,8 +21,8 @@
"""Tests for chassis."""
@classmethod
- def setUpClass(cls):
- super(TestChassis, cls).setUpClass()
+ def resource_setup(cls):
+ super(TestChassis, cls).resource_setup()
_, cls.chassis = cls.create_chassis()
def _assertExpected(self, expected, actual):
diff --git a/tempest/api/baremetal/admin/test_drivers.py b/tempest/api/baremetal/admin/test_drivers.py
index 9e215dc..9d99295 100644
--- a/tempest/api/baremetal/admin/test_drivers.py
+++ b/tempest/api/baremetal/admin/test_drivers.py
@@ -22,9 +22,8 @@
class TestDrivers(base.BaseBaremetalTest):
"""Tests for drivers."""
@classmethod
- @test.safe_setup
- def setUpClass(cls):
- super(TestDrivers, cls).setUpClass()
+ def resource_setup(cls):
+ super(TestDrivers, cls).resource_setup()
cls.driver_name = CONF.baremetal.driver
@test.attr(type="smoke")
diff --git a/tempest/api/baremetal/admin/test_nodestates.py b/tempest/api/baremetal/admin/test_nodestates.py
index 76f47f9..f4f8054 100644
--- a/tempest/api/baremetal/admin/test_nodestates.py
+++ b/tempest/api/baremetal/admin/test_nodestates.py
@@ -22,8 +22,8 @@
"""Tests for baremetal NodeStates."""
@classmethod
- def setUpClass(cls):
- super(TestNodeStates, cls).setUpClass()
+ def resource_setup(cls):
+ super(TestNodeStates, cls).resource_setup()
_, cls.chassis = cls.create_chassis()
_, cls.node = cls.create_node(cls.chassis['uuid'])
diff --git a/tempest/api/compute/images/test_images_oneserver_negative.py b/tempest/api/compute/images/test_images_oneserver_negative.py
index a15cf41..dc3d6bc 100644
--- a/tempest/api/compute/images/test_images_oneserver_negative.py
+++ b/tempest/api/compute/images/test_images_oneserver_negative.py
@@ -72,19 +72,6 @@
cls.image_ids = []
- @test.skip_because(bug="1006725")
- @test.attr(type=['negative', 'gate'])
- def test_create_image_specify_multibyte_character_image_name(self):
- if self.__class__._interface == "xml":
- raise self.skipException("Not testable in XML")
- # invalid multibyte sequence from:
- # http://stackoverflow.com/questions/1301402/
- # example-invalid-utf8-string
- invalid_name = data_utils.rand_name(u'\xc3\x28')
- self.assertRaises(exceptions.BadRequest,
- self.client.create_image, self.server_id,
- invalid_name)
-
@test.attr(type=['negative', 'gate'])
def test_create_image_specify_invalid_metadata(self):
# Return an error when creating image with invalid metadata