diff options
Diffstat (limited to 'heat/engine/resources/openstack/heat/test_resource.py')
| -rw-r--r-- | heat/engine/resources/openstack/heat/test_resource.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/heat/engine/resources/openstack/heat/test_resource.py b/heat/engine/resources/openstack/heat/test_resource.py index 3af8b46b0..dc8b6234b 100644 --- a/heat/engine/resources/openstack/heat/test_resource.py +++ b/heat/engine/resources/openstack/heat/test_resource.py @@ -14,7 +14,6 @@ import datetime import eventlet from oslo_utils import timeutils -import six from heat.common.i18n import _ from heat.engine import attributes @@ -218,12 +217,12 @@ class TestResource(resource.Resource): obj.get(entity_id) except Exception as exc: LOG.debug('%s.%s(%s) %s' % (client_name, self.entity, - entity_id, six.text_type(exc))) + entity_id, str(exc))) else: # just sleep some more eventlet.sleep(1) - if isinstance(started_at, six.string_types): + if isinstance(started_at, str): started_at = timeutils.parse_isotime(started_at) started_at = timeutils.normalize_time(started_at) |