Merge "Add a sleep after delete before purging"
diff --git a/common/config.py b/common/config.py
index 0397953..e0351d5 100644
--- a/common/config.py
+++ b/common/config.py
@@ -68,7 +68,6 @@
default=False,
help="Set to True if using self-signed SSL certificates."),
cfg.StrOpt('ca_file',
- default=None,
help="CA certificate to pass for servers that have "
"https endpoint."),
cfg.IntOpt('build_interval',
diff --git a/functional/test_resource_group.py b/functional/test_resource_group.py
index 1e9edd5..f1ae923 100644
--- a/functional/test_resource_group.py
+++ b/functional/test_resource_group.py
@@ -48,7 +48,7 @@
def test_resource_group_zero_novalidate(self):
# Nested resources should be validated only when size > 0
# This allows features to be disabled via size=0 without
- # triggering validation of nested resource custom contraints
+ # triggering validation of nested resource custom constraints
# e.g images etc in the nested schema.
nested_template_fail = '''
heat_template_version: 2013-05-23
diff --git a/scenario/test_volumes.py b/scenario/test_volumes.py
index 7980d81..603c8f2 100644
--- a/scenario/test_volumes.py
+++ b/scenario/test_volumes.py
@@ -77,9 +77,8 @@
template_name='test_volumes_create_from_backup.yaml',
add_parameters={'backup_id': backup.id})
stack2 = self.client.stacks.get(stack_identifier2)
- except exceptions.StackBuildErrorException as e:
- LOG.error("Halting test due to bug: #1382300")
- LOG.exception(e)
+ except exceptions.StackBuildErrorException:
+ LOG.exception("Halting test due to bug: #1382300")
return
# Verify with cinder that the volume exists, with matching details